[ros-diffs] [gvg] 14088: Sync to Wine-20050310:

[gvg at svn.reactos.com]

Sync to Wine-20050310:
Alex Villacis Lasso <a_villacis at palosanto.com>
- Change SUBLANG_DEFAULT to SUBLANG_NEUTRAL for LANG_SPANISH in all
  resources, so that Spanish locales other than Spain also use Spanish
  resources.
- eol-style stuff
Modified: trunk/reactos/lib/oledlg/oledlg_Es.rc
Deleted: trunk/reactos/lib/oledlg/oledlg_Fr.rc
Added: trunk/reactos/lib/oledlg/oledlg_Fr.rc
  _____  

Modified: trunk/reactos/lib/oledlg/oledlg_Es.rc
--- trunk/reactos/lib/oledlg/oledlg_Es.rc	2005-03-15 03:51:11 UTC
(rev 14087)
+++ trunk/reactos/lib/oledlg/oledlg_Es.rc	2005-03-15 08:10:52 UTC
(rev 14088)
@@ -16,7 +16,7 @@

  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
USA
  */
 
-LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 UIINSERTOBJECT DIALOG DISCARDABLE  0, 0, 294, 151
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  _____  

Deleted: trunk/reactos/lib/oledlg/oledlg_Fr.rc
--- trunk/reactos/lib/oledlg/oledlg_Fr.rc	2005-03-15 03:51:11 UTC
(rev 14087)
+++ trunk/reactos/lib/oledlg/oledlg_Fr.rc	2005-03-15 08:10:52 UTC
(rev 14088)
@@ -1,59 +0,0 @@

-/*
- * oledlg dll resources
- * French language support
- *
- * Copyright (C) 2005 Jonathan Ernst
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
USA
- */
-
-
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-
-UIINSERTOBJECT DIALOG DISCARDABLE  0, 0, 294, 151
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "InsÚrer Objet"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LISTBOX         IDC_OBJTYPELIST,82,19,131,66,LBS_SORT |
-                    LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL |
-                    WS_TABSTOP
-    LTEXT           "Type d'objet:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE
-    DEFPUSHBUTTON   "OK",IDOK,221,7,66,14
-    PUSHBUTTON      "Annuler",IDCANCEL,221,24,66,14
-    GROUPBOX        "RÚsultat",IDC_RESULT,7,103,208,41
-    CONTROL         "CrÚer
Nouveau",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | 
-                    WS_GROUP,7,20,62,10
-    CONTROL         "CrÚer Contr¶le",IDC_CREATECONTROL,"Button",
-                    BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10
-    CONTROL         "CrÚer Depuis Fichier",IDC_CREATEFROMFILE,"Button",
-                    BS_AUTORADIOBUTTON,7,37,67,10
-    LTEXT           "",IDC_RESULTDESC,49,112,159,23
-    PUSHBUTTON      "&Ajoute
Contr¶le...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE
-    CONTROL         "Afficher Comme
Ic¶ne",IDC_ASICON,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10
-    PUSHBUTTON      "Parcourir...",IDC_BROWSE,83,53,50,14,NOT
WS_VISIBLE
-    LTEXT           "Fichier:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE
-    EDITTEXT        IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT
WS_VISIBLE
-END
-
-STRINGTABLE DISCARDABLE
-{
-  IDS_RESULTOBJDESC	"InsÚrer un nouvel object %s dans votre
document"
-  IDS_RESULTFILEOBJDESC	"InsÞre le contenu du fichier comme un
objet dans votre document afin que vous puissiez l'activer en utilisant
le programme avec lequel vous l'avez crÚÚ."
-  IDS_BROWSE            "Parcourir"
-  IDS_NOTOLEMOD         "Le fichier ne semble pas Ûtre un module OLE
valide. Impossible d'enregistrer le contr¶le OLE."
-  IDS_NOTOLEMODCAPTION  "Ajouter Contr¶le"
-}
  _____  

Copied: trunk/reactos/lib/oledlg/oledlg_Fr.rc (from rev 14087,
vendor/wine/dlls/oledlg/current/oledlg_Fr.rc)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20050315/e49b3d9e/attachment.html