|
From: <ki...@us...> - 2006-09-25 22:05:53
|
Revision: 3642
http://svn.sourceforge.net/winmerge/?rev=3642&view=rev
Author: kimmov
Date: 2006-09-25 15:05:46 -0700 (Mon, 25 Sep 2006)
Log Message:
-----------
PATCH: [ 1563171 ] Catalan translation update (Open-dialog)
- submitted by Jordi Vilar
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Languages/Catalan/MergeCatalan.rc
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-25 21:55:18 UTC (rev 3641)
+++ trunk/Src/Changes.txt 2006-09-25 22:05:46 UTC (rev 3642)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-09-25 Kimmo
+ PATCH: [ 1563171 ] Catalan translation update (Open-dialog)
+ Submitted by Jordi Vilar
+ Src/Languages/Catalan: MergeCatalan.rc
+
2006-09-24 Gal
BUG: [ 1564283 ] Parameter -x causes files to be closed after merging
Src: MergeDoc.cpp
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-09-25 21:55:18 UTC (rev 3641)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-09-25 22:05:46 UTC (rev 3642)
@@ -647,38 +647,38 @@
PUSHBUTTON "Col\xB7laboradors",IDC_OPEN_CONTRIBUTORS,7,103,65,14
END
-IDD_OPEN DIALOGEX 0, 0, 376, 126
+IDD_OPEN DIALOGEX 0, 0, 374, 126
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU | WS_THICKFRAME
CAPTION "Tria de fitxers o directoris..."
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
RTEXT "&Esquerra:",IDC_STATIC,13,24,65,8
- COMBOBOX IDC_LEFT_COMBO,81,22,162,94,CBS_DROPDOWN |
+ COMBOBOX IDC_LEFT_COMBO,81,22,167,94,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,
WS_EX_ACCEPTFILES
- PUSHBUTTON "&Navega...",IDC_LEFT_BUTTON,242,22,50,14
+ PUSHBUTTON "&Navega...",IDC_LEFT_BUTTON,252,22,50,14
RTEXT "&Dreta:",IDC_STATIC,13,40,65,8
- COMBOBOX IDC_RIGHT_COMBO,81,38,162,95,CBS_DROPDOWN |
+ COMBOBOX IDC_RIGHT_COMBO,81,38,167,95,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,
WS_EX_ACCEPTFILES
- PUSHBUTTON "N&avega...",IDC_RIGHT_BUTTON,242,38,50,14
+ PUSHBUTTON "N&avega...",IDC_RIGHT_BUTTON,252,38,50,14
RTEXT "&Filtre:",IDC_STATIC,13,56,65,8
- COMBOBOX IDC_EXT_COMBO,81,54,162,95,CBS_DROPDOWN |
+ COMBOBOX IDC_EXT_COMBO,81,54,167,95,CBS_DROPDOWN |
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- PUSHBUTTON "&Tria...",IDC_SELECT_FILTER,242,54,50,14
- RTEXT "Desem&paquetador:",IDC_STATIC,9,72,65,8
- EDITTEXT IDC_UNPACKER_EDIT,81,70,162,12,ES_AUTOHSCROLL |
+ PUSHBUTTON "&Tria...",IDC_SELECT_FILTER,252,54,50,14
+ RTEXT "Desem&paquetador:",IDC_STATIC,13,72,65,8
+ EDITTEXT IDC_UNPACKER_EDIT,81,70,167,12,ES_AUTOHSCROLL |
ES_READONLY
- PUSHBUTTON "T&ria...",IDC_SELECT_UNPACKER,242,70,50,14
+ PUSHBUTTON "T&ria...",IDC_SELECT_UNPACKER,252,70,50,14
CONTROL "&Inclou-hi les subcarpetes",IDC_RECURS_CHECK,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,81,86,161,10
- LTEXT "Estat:",IDC_OPEN_STATUS,15,102,182,8
- DEFPUSHBUTTON "D'acord",IDOK,306,11,62,14
- PUSHBUTTON "Cancel\xB7la",IDCANCEL,306,28,62,14
- PUSHBUTTON "Ajuda",ID_HELP,306,45,50,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,81,86,167,10
+ LTEXT "Estat:",IDC_OPEN_STATUS,15,102,192,8
+ DEFPUSHBUTTON "D'acord",IDOK,316,11,50,14
+ PUSHBUTTON "Cancel\xB7la",IDCANCEL,316,28,50,14
+ PUSHBUTTON "Ajuda",ID_HELP,316,45,50,14
GROUPBOX "Fitxers o directoris a comparar",IDC_FILES_DIRS_GROUP,7,
- 7,292,111
+ 7,302,111
END
IDD_VSS DIALOGEX 0, 0, 257, 166
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
