|
From: <ki...@us...> - 2006-09-26 16:05:19
|
Revision: 3644
http://svn.sourceforge.net/winmerge/?rev=3644&view=rev
Author: kimmov
Date: 2006-09-26 09:05:05 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
PATCH: [ 1563171 ] Catalan translation update (Open-dialog)
- submitted by Jordi Vilar
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-09-26 15:18:40 UTC (rev 3643)
+++ branches/R2_6/Src/Changes.txt 2006-09-26 16:05:05 UTC (rev 3644)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-09-26 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: branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2006-09-26 15:18:40 UTC (rev 3643)
+++ branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2006-09-26 16:05:05 UTC (rev 3644)
@@ -177,9 +177,9 @@
MENUITEM SEPARATOR
MENUITEM "&Recarrega els connectors", ID_RELOAD_PLUGINS
END
- POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
+ POPUP "&Depuraci\xF3" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
- MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Carrega la configuraci\xF3...", ID_DEBUG_LOADCONFIG
END
POPUP "Fi&nestra"
BEGIN
@@ -230,7 +230,7 @@
MENUITEM "&Opcions...", ID_OPTIONS
MENUITEM SEPARATOR
MENUITEM "Actualit&za\tF5", ID_REFRESH
- MENUITEM "&Refresh Selected\tCtrl+F5", ID_DIR_RESCAN
+ MENUITEM "Actualitza &seleccionats\tCtrl+F5", ID_DIR_RESCAN
END
POPUP "&Visualitzaci\xF3"
BEGIN
@@ -284,9 +284,9 @@
MENUITEM SEPARATOR
MENUITEM "&Recarrega els connectors", ID_RELOAD_PLUGINS
END
- POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
+ POPUP "&Depuraci\xF3" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
- MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Carrega la configuraci\xF3...", ID_DEBUG_LOADCONFIG
END
POPUP "Fi&nestra"
BEGIN
@@ -341,7 +341,7 @@
MENUITEM "Fes l'es&querra nom\xE9s de lectura", ID_FILE_LEFT_READONLY
MENUITEM "Fes la dre&ta nom\xE9s de lectura", ID_FILE_RIGHT_READONLY
MENUITEM SEPARATOR
- POPUP "&Convert Line Endings to"
+ POPUP "&Converteix retorns de l\xEDnia a"
BEGIN
MENUITEM "&DOS (CRLF)", ID_EOL_TO_DOS
MENUITEM "&UNIX (LF)", ID_EOL_TO_UNIX
@@ -446,9 +446,9 @@
MENUITEM SEPARATOR
MENUITEM "&Recarrega els connectors", ID_RELOAD_PLUGINS
END
- POPUP "&Debug" // NOTE: NOT visible in releases, only in DEBUG builds
+ POPUP "&Depuraci\xF3" // NOTE: NOT visible in releases, only in DEBUG builds
BEGIN
- MENUITEM "&Load Config...", ID_DEBUG_LOADCONFIG
+ MENUITEM "&Carrega la configuraci\xF3...", ID_DEBUG_LOADCONFIG
END
POPUP "Fi&nestra"
BEGIN
@@ -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
@@ -783,7 +783,7 @@
BS_AUTOCHECKBOX | WS_TABSTOP,7,37,140,10
CONTROL "&Expressi\xF3 regular",IDC_EDIT_REGEXP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10
- CONTROL "D&on't wrap end of file",IDC_FINDDLG_DONTWRAP,"Button",
+ CONTROL "No facis la &volta al final del fitxer",IDC_FINDDLG_DONTWRAP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,7,57,135,10
GROUPBOX "Direcci\xF3",IDC_STATIC,148,23,70,36,WS_GROUP
CONTROL "A&munt",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON |
@@ -953,12 +953,12 @@
CONTROL "Ignora difer\xE8ncies en l'&hora inferiors a 3 segons",
IDC_IGNORE_SMALLTIMEDIFF,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,7,17,222,10
- GROUPBOX "Integration",IDC_STATIC,7,30,218,46
+ GROUPBOX "Integraci\xF3",IDC_STATIC,7,30,218,46
CONTROL "&Afegeix un men\xFA contextual a l'explorador del Windows",IDC_EXPLORER_CONTEXT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,41,200,10
CONTROL "Habilita el &men\xFA avan\xE7at",IDC_EXPLORER_ADVANCED,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,17,51,200,10
- CONTROL "In&clude subfolders by default",IDC_EXPLORER_SUBFOLDERS,
+ CONTROL "In&clou subcarpetes de forma predeterminada",IDC_EXPLORER_SUBFOLDERS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,61,200,10
LTEXT "&Editor extern:",IDC_STATIC,7,83,222,8
EDITTEXT IDC_EXT_EDITOR_PATH,7,93,167,14,ES_AUTOHSCROLL
@@ -1080,7 +1080,7 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "&Atura",IDC_COMPARISON_STOP,167,15,83,14
- CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,8,
+ CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,9,
44,241,9
RTEXT "0",IDC_ITEMSCOMPARED,95,29,30,8
RTEXT "0",IDC_ITEMSTOTAL,95,19,30,8
@@ -1190,7 +1190,7 @@
LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER |
WS_BORDER | WS_TABSTOP,7,7,342,100
PUSHBUTTON "&Prova",IDC_FILTERFILE_TEST_BTN,7,114,50,14
- PUSHBUTTON "Install...",IDC_FILTERFILE_INSTALL,137,114,50,14
+ PUSHBUTTON "&Instal\xB7la...",IDC_FILTERFILE_INSTALL,137,114,50,14
PUSHBUTTON "&Nou...",IDC_FILTERFILE_NEWBTN,192,114,50,14
PUSHBUTTON "&Edita...",IDC_FILTERFILE_EDITBTN,246,114,50,14
PUSHBUTTON "&Suprimeix...",IDC_FILTERFILE_DELETEBTN,300,114,50,14
@@ -1384,7 +1384,7 @@
LTEXT "&Estil:",IDC_STATIC,7,37,35,8
COMBOBOX IDC_REPORT_STYLECOMBO,46,35,158,70,CBS_DROPDOWNLIST |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "&Copy to Clipboard",IDC_REPORT_COPYCLIPBOARD,"Button",
+ CONTROL "&Copia al Porta-retalls",IDC_REPORT_COPYCLIPBOARD,"Button",
BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,53,133,10
DEFPUSHBUTTON "D'acord",IDOK,157,60,50,14
PUSHBUTTON "Cancel\xB7la",IDCANCEL,211,60,50,14
@@ -1426,7 +1426,7 @@
END
IDD_COMPARE_STATISTICS DIALOGEX 0, 0, 257, 161
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU
CAPTION "Estad\xEDstiques de comparaci\xF3"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -1951,7 +1951,7 @@
// WINMERGE COMMAND LINE HELP#1
STRINGTABLE
BEGIN
- IDS_CMDLINE_SYNTAX "Syntax : WinMerge [/r] [/e] [/x] [/s]"
+ IDS_CMDLINE_SYNTAX "Sintaxi : WinMerge [/r] [/e] [/x] [/s]"
IDS_CMDLINE_SYNTAX_ARGS "camiesq camidreta [camisortida]"
IDS_CMDLINE_SYNTAX_ARG_FILTER "m\xE0scara/nom"
IDS_CMDLINE_SYNTAX_LEFTDESC "descesq"
@@ -1966,12 +1966,12 @@
STRINGTABLE
BEGIN
IDS_CMDLINE_FILEMASK "/f o -f especifica la m\xE0scara de fitxers o el nom del filtre per a comparar"
- IDS_CMDLINE_FASTCLOSE "/x or -x closes WinMerge if result is identical"
- IDS_CMDLINE_SINGLE_INST "/s or -s opens paths to existing WinMerge instance"
+ IDS_CMDLINE_FASTCLOSE "/x or -x tanca el WinMerge si el resultat \xE9s id\xE8ntic"
+ IDS_CMDLINE_SINGLE_INST "/s or -s obre els camins a una inst\xE0ncia existent del WinMerge"
IDS_CMDLINE_LEFTPATH "camiesq \xE9s el directori o nom de fitxer per a \xE9sser obert a la banda esquerra"
IDS_CMDLINE_RIGHTPATH "camidreta \xE9s el directori o nom de fitxer per a \xE9sser obert a la banda dreta"
IDS_CMDLINE_OUTPUTPATH "camisortida \xE9s un directori de sortida opcional on voleu que siguin desats els fitxers fusionats"
- IDS_CMDLINE_SEEMANUAL "See manual for complete commandline reference."
+ IDS_CMDLINE_SEEMANUAL "Veieu el manual per a una refer\xE8ncia completa de la l\xEDnia de comandes."
END
// VARIOUS OPTIONS
@@ -2011,7 +2011,7 @@
IDS_COMPMETHOD_QUICK_CONTENTS "Contingut en un cop d'ull"
IDS_COMPMETHOD_MODDATE "Data de modificaci\xF3"
IDS_COMPMETHOD_DATESIZE "Data de modificaci\xF3 i mida"
- IDS_COMPMETHOD_SIZE "Size"
+ IDS_COMPMETHOD_SIZE "Mida
END
// FILTER OPTIONS
@@ -2029,14 +2029,14 @@
IDS_FILEFILTER_TMPL_COPY
"No es pot copiar el fitxer de plantilla de filtre a la carpeta de filtres:\n%1\n\nVerifiqueu que la carpeta existeix i s'hi pot escriure."
IDS_FILEFILTER_NO_USERFOLDER
- "User's filter file folder is not defined!\n\nPlease select filter folder in options/System."
+ "La carpeta de fitxers de filtre d'usuari no est\xE0 definida!\n\nSeleccioneu la carpeta de filtres a opcions/sistema."
IDS_FILEFILTER_DELETE_FAIL
- "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
- IDS_FILEFILTER_INSTALL "Locate filter file to install"
+ "No s'ha pogut esborrar el fitxer de filtre:\n%1\n\nPotser el fitxer \xE9s nom\xE9s de lectura?"
+ IDS_FILEFILTER_INSTALL "Localitza el fitxer de filtre a instal\xB7lar"
IDS_FILEFILTER_INSTALLFAIL
- "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
+ "No es pot instal\xB7lar el fitxer de filtre.\n\nNo s'ha pogut copiar el nou fitxer de filtre a la carpeta de filtres."
IDS_FILEFILTER_OVERWRITE
- "Filter file already exists. Overwrite existing filter?"
+ "El fitxer de filtre ja existeix. Voleu sobreescriure el filtre existent?"
END
// VERSION CONTROL OPTIONS
@@ -2285,8 +2285,8 @@
BEGIN
IDS_COLHDR_LENCODING "Codificaci\xF3 esquerra"
IDS_COLHDR_RENCODING "Codificaci\xF3 dreta"
- IDS_COLHDR_NIDIFFS "Ignored Diff."
- IDS_COLHDR_NSDIFFS "Differences"
+ IDS_COLHDR_NIDIFFS "Difer\xE8ncies ignorades"
+ IDS_COLHDR_NSDIFFS "Difer\xE8ncies"
IDS_COLHDR_BINARY "Binari"
END
@@ -2350,8 +2350,8 @@
BEGIN
IDS_COLDESC_LENCODING "Codificaci\xF3 del costat esquerre."
IDS_COLDESC_RENCODING "Codificaci\xF3 del costat dret."
- IDS_COLDESC_NIDIFFS "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
- IDS_COLDESC_NSDIFFS "Number of differences in file. This number does not include ignored differences."
+ IDS_COLDESC_NIDIFFS "Nombre de difer\xE8ncies ignorades al fitxer. Aquestes difer\xE8ncies s\xF3n ignorades pel WinMerge i no es poden combinar."
+ IDS_COLDESC_NSDIFFS "Nombre de difer\xE8ncies al fitxer. Aquest nombre no inclou les difer\xE8ncies ignorades.."
IDS_COLDESC_BINARY "Mostra un asterisc (*) si el fitxer \xE9s binari."
END
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
