[ros-diffs] [jgardou] 48885: merge r48884 from trunk

25 Sep 2010

Author: jgardou
Date: Sat Sep 25 18:48:17 2010
New Revision: 48885

URL: http://svn.reactos.org/svn/reactos?rev=48885&view=rev
Log:
merge r48884 from trunk

Modified:
    branches/cmake-bringup/   (props changed)
    branches/cmake-bringup/base/applications/games/solitaire/lang/bg-BG.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/ca-ES.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/cs-CZ.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/de-DE.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/el-GR.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/en-US.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/es-ES.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/eu-ES.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/fr-FR.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/hu-HU.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/id-ID.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/it-IT.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/ja-JP.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/ko-KR.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/lt-LT.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/nl-NL.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/no-NO.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/pl-PL.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/ro-RO.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/ru-RU.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/sk-SK.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/th-TH.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/uk-UA.rc
    branches/cmake-bringup/base/applications/games/solitaire/lang/zh-CN.rc

Propchange: branches/cmake-bringup/
------------------------------------------------------------------------------

--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 25 18:48:17 2010
@@ -2,4 +2,4 @@
 /branches/reactos-yarotows:46372,46848,46966,47800,48026,48064
 /branches/ros-amd64-bringup:36852

/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882
-/trunk/reactos:48236-48828
+/trunk/reactos:48236-48828,48884

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/bg-BG.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/bg-BG.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -5,8 +5,6 @@
  * PURPOSE:     Bulgarian Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de)
  */
-#include "resource.h"
-
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/ca-ES.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/ca-ES.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/ca-ES.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -5,8 +5,6 @@
  * PURPOSE:     Catalan Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de)
  */
-#include "resource.h"
-
 LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
 
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/cs-CZ.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/cs-CZ.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -3,8 +3,6 @@
  * TRANSLATOR:  Radek Liska aka Black_Fox (radekliska at gmail dot com)
  * UPDATED:     2008-11-30 by Kario
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/de-DE.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/de-DE.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -5,8 +5,6 @@
  * PURPOSE:     German Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de)
  */
-#include "resource.h"
-
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/el-GR.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/el-GR.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -5,8 +5,6 @@
  * PURPOSE:     Greek Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de)
  */
-#include "resource.h"
-
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/en-US.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/en-US.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -5,8 +5,6 @@
  * PURPOSE:     English Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de)
  */
-#include "resource.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/es-ES.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/es-ES.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -6,8 +6,6 @@
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de)
  * ACTUALIZADO: Javier Remacha - 13/01/09
  */
-#include "resource.h"
-
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/eu-ES.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/eu-ES.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/eu-ES.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -5,8 +5,6 @@
  * PURPOSE:     Basque Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de)
  */
-#include "resource.h"
-
 LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT
 
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/fr-FR.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/fr-FR.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -5,8 +5,6 @@
  * PURPOSE:     French Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de)
  */
-#include "resource.h"
-
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/hu-HU.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/hu-HU.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -6,8 +6,6 @@
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de)
  * TRANSLATOR:  Xxxx00
  */
-#include "resource.h"
-
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/id-ID.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/id-ID.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -5,9 +5,6 @@
  * PURPOSE:     Indonesian Language File for Solitaire
  * TRANSLATOR:  Zaenal Mutaqin (ade999(a)gmail.com)
  */
-
-#include "resource.h"
-
 LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
 
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/it-IT.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/it-IT.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -5,9 +5,6 @@
  * PURPOSE:     Italian Language File for Solitaire (gabriel ilardi)
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de)
  */
-
-#include "resource.h"
-
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/ja-JP.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/ja-JP.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -5,8 +5,6 @@
  * PURPOSE:     Japanese Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de)
  */
-#include "resource.h"
-
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/ko-KR.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/ko-KR.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/ko-KR.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -1,8 +1,6 @@
 /*
  *Korean translation of solitaire by Seungju Kim(manatails007) (www.seungjukim.com)
  */
-#include "resource.h"
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/lt-LT.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/lt-LT.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/lt-LT.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -6,8 +6,6 @@
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de)
  * TRANSLATORS: Vytis "CMan" Girdþijauskas (cman(a)cman.us)
  */
-#include "resource.h"
-
 LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
 
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/nl-NL.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/nl-NL.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -5,8 +5,6 @@
  * PURPOSE:     Dutch Language Resource File for Solitaire
  * TRANSLATOR: Wouter De Vlieger
  */
-#include "resource.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/no-NO.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/no-NO.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -5,9 +5,6 @@
  * PURPOSE:     Norwegian Language File for Solitaire
  * TRANSLATOR:  LMH1
  */
-
-#include "resource.h"
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/pl-PL.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/pl-PL.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -4,8 +4,6 @@
  * https://sourceforge.net/projects/reactospl
  * updated by Caemyr (olaf_siejka(a)o2.pl), Nov, 2008
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/ro-RO.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/ro-RO.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -4,8 +4,6 @@
  * FILE:        base/applications/games/solitaire/lang/ro-RO.rc
  * PURPOSE:     Romanian Language File for Solitaire
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/ru-RU.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/ru-RU.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -1,6 +1,4 @@
 // Russian language resource file (Dmitry Chapyshev, 2007-06-10)
-
-#include "resource.h"
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/sk-SK.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/sk-SK.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -7,7 +7,6 @@
  * DATE OF TR.: 13-07-2007
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de)
  */
-#include "resource.h"
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/th-TH.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/th-TH.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/th-TH.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -5,8 +5,6 @@
  * PURPOSE:     Thai Language File for Solitaire
  * TRANSLATOR:  Sumath Aowsakulsutthi
 */
-
-#include "resource.h"
 
 LANGUAGE LANG_THAI, SUBLANG_DEFAULT
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/uk-UA.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/uk-UA.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -5,7 +5,6 @@
  * PURPOSE:     Ukraianian Language File for Solitaire
  * TRANSLATOR:  Artem Reznikov
  */
-#include "resource.h"
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 

Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/lang/zh-CN.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/games/solitaire/lang/zh-CN.rc [iso-8859-1]
Sat Sep 25 18:48:17 2010
@@ -5,8 +5,6 @@
  * PURPOSE:     Simplified Chinese Language resources File for Solitaire
  * TRANSLATOR:  zhangbing &lt;e_zb(a)21cn.comcom, ezb(a)mail.gywb.cn&gt;
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 



    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

[ros-diffs] [jgardou] 48885: merge r48884 from trunk