From 62460aa78dc86748e8cd2cd394cd45410138d76f Mon Sep 17 00:00:00 2001 From: Perry Rapp Date: Wed, 14 Dec 2005 05:47:32 +0000 Subject: [PATCH] Update & synchronize translations: French German Hungarian Italian Japanese Src/Languages: French: MergeFrench.rc German: MergeGerman.rc Hungarian: MergeHungarian.rc Italian: MergeItalian.rc Japanese: MergeJapanese.rc --- Src/Changes.txt | 7 ++ Src/Languages/French/MergeFrench.rc | 85 ++++++++----- Src/Languages/German/MergeGerman.rc | 200 ++++++++---------------------- Src/Languages/Hungarian/MergeHungarian.rc | 36 +++++- Src/Languages/Italian/MergeItalian.rc | 174 +++++++------------------- Src/Languages/Japanese/MergeJapanese.rc | 44 +++++-- Src/Merge.rc | 2 +- 7 files changed, 224 insertions(+), 324 deletions(-) diff --git a/Src/Changes.txt b/Src/Changes.txt index 5c911e5d5..be4d7ec51 100644 --- a/Src/Changes.txt +++ b/Src/Changes.txt @@ -5,6 +5,13 @@ Czech: MergeCzech.rc Danish: MergeDanish.rc Dutch: MergeDutch.rc + Update & synchronize translations: French German Hungarian Italian Japanese + Src/Languages: + French: MergeFrench.rc + German: MergeGerman.rc + Hungarian: MergeHungarian.rc + Italian: MergeItalian.rc + Japanese: MergeJapanese.rc 2005-12-13 Perry PATCH: [ 1379894 ] Fix handling of unknown encoding diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc index 4f3ec6358..60b2ed578 100644 --- a/Src/Languages/French/MergeFrench.rc +++ b/Src/Languages/French/MergeFrench.rc @@ -138,6 +138,10 @@ BEGIN BEGIN MENUITEM "&Filtrer...", ID_TOOLS_FILTERS MENUITEM "&Générer des retouches...", ID_TOOLS_GENERATEPATCH + POPUP "&Advanced" + BEGIN + MENUITEM "&Load Config...", ID_TOOLS_LOADCONFIG + END END POPUP "&Plugiciels" BEGIN @@ -237,6 +241,10 @@ BEGIN MENUITEM "&Filtrer...", ID_TOOLS_FILTERS MENUITEM "&Générer des retouches...", ID_TOOLS_GENERATEPATCH MENUITEM "Générer un &rapport...", ID_TOOLS_GENERATEREPORT + POPUP "&Advanced" + BEGIN + MENUITEM "&Load Config...", ID_TOOLS_LOADCONFIG + END END POPUP "&Plugiciels" BEGIN @@ -380,6 +388,10 @@ BEGIN BEGIN MENUITEM "&Filtrer...", ID_TOOLS_FILTERS MENUITEM "&Générer des retouches...", ID_TOOLS_GENERATEPATCH + POPUP "&Advanced" + BEGIN + MENUITEM "&Load Config...", ID_TOOLS_LOADCONFIG + END END POPUP "&Plugiciels" BEGIN @@ -580,8 +592,7 @@ BEGIN LTEXT "Version 1.0",IDC_VERSION,63,23,153,8,SS_NOPREFIX LTEXT "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8 LTEXT "Tous droits réservés.",IDC_STATIC,7,60,170,8 - LTEXT "Découvrez la page d'accueil de WinMerge !",IDC_WWW,7, - 79,209,8 + LTEXT "Découvrez la page d'accueil de WinMerge !",IDC_WWW,7,79,209,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,95,209,1 LTEXT "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8 DEFPUSHBUTTON "OK",IDOK,166,103,50,14 @@ -617,8 +628,8 @@ BEGIN LTEXT "Statut:",IDC_OPEN_STATUS,15,102,182,8 DEFPUSHBUTTON "OK",IDOK,306,11,50,14 PUSHBUTTON "Ann&uler",IDCANCEL,306,28,50,14 - GROUPBOX "Fichiers ou répertoires à comparer :",IDC_FILES_DIRS_GROUP,7,7, - 292,111 + GROUPBOX "Fichiers ou répertoires à comparer :",IDC_FILES_DIRS_GROUP,7, + 7,292,111 PUSHBUTTON "&Enreg. projet",IDC_SAVEPROJECT,306,56,50,14 END @@ -667,12 +678,11 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Général" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Crée un &backup des fichiers originaux", - IDC_BACKUP_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 7,7,145,10 + CONTROL "Crée un &backup des fichiers originaux",IDC_BACKUP_CHECK,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,7,145,10 CONTROL "&Atteindre automatiquement la première différence", - IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 7,17,183,10 + IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7, + 17,183,10 CONTROL "&Sans page de garde",IDC_DISABLE_SPLASH,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,27,80,10 CONTROL "Fermer les fenêtres avec la &touche ESC",IDC_ESC_CLOSES_WINDOW,"Button", @@ -722,8 +732,8 @@ BEGIN CONTROL "E&xpressions régulières",IDC_EDIT_REGEXP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10 GROUPBOX "Direction",IDC_STATIC,148,23,70,36,WS_GROUP - CONTROL "Vers le &Haut",IDC_EDIT_DIRECTION_UP,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,154,34,57,10 + CONTROL "Vers le &Haut",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,154,34,57,10 CONTROL "Vers le &Bas",IDC_EDIT_DIRECTION_DOWN,"Button", BS_AUTORADIOBUTTON,154,44,57,10 DEFPUSHBUTTON "&Suivant",IDOK,226,7,50,14,WS_GROUP @@ -787,7 +797,8 @@ BEGIN CONTROL "Ignorer les lignes avec les modèles suivants :", IDC_IGNOREREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7, 7,221,15 - LTEXT "Expressions régulières (une par ligne)",IDC_STATIC,7,28,221,8 + LTEXT "Expressions régulières (une par ligne)",IDC_STATIC,7,28, + 221,8 EDITTEXT IDC_EDITPATTERN,7,39,221,72,ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN END @@ -1046,12 +1057,12 @@ CAPTION "Comparaison" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Caractères d'espacement",IDC_STATIC,7,7,221,50 - CONTROL "C&omparer",IDC_WHITESPACE,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,14,19,206,10 + CONTROL "C&omparer",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,14,19,206,10 CONTROL "Ignorer les chan&gements",IDC_WHITE_CHANGE,"Button", BS_AUTORADIOBUTTON,14,30,206,10 - CONTROL "&Tout ignorer",IDC_ALL_WHITE,"Button", - BS_AUTORADIOBUTTON,14,41,206,10 + CONTROL "&Tout ignorer",IDC_ALL_WHITE,"Button",BS_AUTORADIOBUTTON, + 14,41,206,10 CONTROL "Ignorer les lignes &vides",IDC_IGNBLANKS_CHECK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,60,221,10 CONTROL "Ignorer la ca&sse",IDC_IGNCASE_CHECK,"Button", @@ -1123,7 +1134,7 @@ END IDD_SAVECLOSING DIALOGEX 0, 0, 262, 154 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU + WS_SYSMENU | WS_THICKFRAME CAPTION "Enregister les fichiers modifiés ?" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1341,8 +1352,7 @@ BEGIN CONTROL "&Utiliser le mode autonome de 7-Zip si disponible", IDC_ARCHIVE_INSTALSTANDALONE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,19,48,209,10 - CONTROL "U&tiliser les composants locaux de 7-Zip (répertoire WinMerge)", - IDC_ARCHIVE_INSTALLOCAL,"Button", + CONTROL "U&tiliser les composants locaux de 7-Zip (répertoire WinMerge)",IDC_ARCHIVE_INSTALLOCAL,"Button", BS_AUTORADIOBUTTON,19,58,209,10 CONTROL "&Detecter le type d'archives avec un fichier de signature", IDC_ARCHIVE_DETECTTYPE,"Button",BS_AUTOCHECKBOX | @@ -1425,17 +1435,14 @@ BEGIN BLOCK "040c04e4" BEGIN VALUE "Comments", "Translated by Gil Andre, continued by Laurent Ganier\0" - VALUE "CompanyName", "\0" VALUE "FileDescription", "WinMerge Application\0" VALUE "FileVersion", "000.000.000.000\0" VALUE "InternalName", "WinMerge\0" VALUE "LegalCopyright", "© 1996-2005 Dean P. Grimm / Thingamahoochie Software\0" - VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "WinMerge.EXE\0" VALUE "PrivateBuild", "" VALUE "ProductName", "WinMerge\0" VALUE "ProductVersion", "000.000.000.000\0" - VALUE "SpecialBuild", "\0" END END BLOCK "VarFileInfo" @@ -1684,7 +1691,7 @@ BEGIN IDC_STATIC_TITLE_RIGHT "Click droit pour copier le chemin" END -// IDS_MESSAGEBOX_OK SYNCHRO +// "DO NOT SHOW AGAIN" MESSAGEBOXES STRINGTABLE BEGIN IDS_MESSAGEBOX_OK "&Ok" @@ -1870,7 +1877,8 @@ BEGIN IDS_SAVEREADONLY_FMT "%1 est en lecture seule. Voulez-vous outrepasser ? (Choisissez Non pour enregistrer avec un nouveau nom.)" IDS_ERROR_FILE_WRITEABLE "Erreur en vérifiant les droits en écriture de la destination" IDS_ERROR_BACKUP "Erreur lors du backup du fichier" - IDS_BACKUP_FAILED_PROMPT "Ne peut effectuer le backup du fichier d'origine:\n%1\n\nContinuer quand même ?" + IDS_BACKUP_FAILED_PROMPT + "Ne peut effectuer le backup du fichier d'origine:\n%1\n\nContinuer quand même ?" IDS_FILESAVE_FAILED "Erreur lors de l'enregistrement.\n%1\n%2\nVoulez-vous:\n\t-utiliser un nom autre nom de fichier (Ok)\n\t-avorter l'opération en cours (Annuler)?" IDS_FILEPACK_FAILED_LEFT "Le plugiciel '%2' ne peut compressé le fichier modifié de gauche dans '%1'.\n\nLe fichier original est conservé.\n\nVoulez-vous enregistrer la version décompressée sous un autre nom ?" IDS_FILEPACK_FAILED_RIGHT "Le plugiciel '%2' ne peut compressé le fichier modifié de droite dans '%1'.\n\nLe fichier original est conservé.\n\nVoulez-vous enregistrer la version décompressée sous un autre nom ?" @@ -1987,11 +1995,13 @@ BEGIN ID_DIR_ZIP_RIGHT "Ajouter les éléments du côté droit au fichier d'archives" ID_DIR_ZIP_BOTH "Ajouter les éléments des deux côté au fichier d'archives" ID_DIR_ZIP_BOTH_DIFFS_ONLY "Ajouter les éléments distincts des deux côté au fichier d'archives" - ID_DIR_MOVE_LEFT_TO_BROWSE "Déplacer le fichier sélectionné de gauche vers un répertoire à indentifer" - ID_DIR_MOVE_RIGHT_TO_BROWSE "Déplacer le fichier sélectionné de droite vers un répertoire à indentifer" + ID_DIR_MOVE_LEFT_TO_BROWSE + "Déplacer le fichier sélectionné de gauche vers un répertoire à indentifer" + ID_DIR_MOVE_RIGHT_TO_BROWSE + "Déplacer le fichier sélectionné de droite vers un répertoire à indentifer" END -// DIRECTORY DIFFING : COLUMN TITLES +// DIRECTORY DIFFING : COLUMN TITLES #1 STRINGTABLE BEGIN IDS_COLHDR_FILENAME "Nom du fichier" @@ -2002,6 +2012,13 @@ BEGIN IDS_COLHDR_EXTENSION "Extension" IDS_COLHDR_LSIZE "Taille gauche" IDS_COLHDR_RSIZE "Taille droite" + IDS_COLHDR_RSIZE_SHORT "Right Size (Short)" + IDS_COLHDR_LSIZE_SHORT "Left Size (Short)" +END + +// DIRECTORY DIFFING : COLUMN TITLES #2 +STRINGTABLE +BEGIN IDS_COLHDR_LTIMEC "Date cré. gauche" IDS_COLHDR_RTIMEC "Date cré. droit" IDS_COLHDR_NEWER "Plus récent" @@ -2012,7 +2029,7 @@ BEGIN IDS_COLHDR_RATTRIBUTES "Attributs droits" END -// DIRECTORY DIFFING : COLUMN TITLES (2) +// DIRECTORY DIFFING : COLUMN TITLES #3 STRINGTABLE BEGIN IDS_COLHDR_LENCODING "Page de code gauche" @@ -2047,7 +2064,7 @@ BEGIN IDS_STATUS_SELITEMS "%1 éléments sélectionnés" END -// DIRECTORY DIFFING : COLUMN DESCRIPTIONS +// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#1 STRINGTABLE BEGIN IDS_COLDESC_FILENAME "Nom de fichier ou de répertoire." @@ -2058,6 +2075,13 @@ BEGIN IDS_COLDESC_EXTENSION "Extension du fichier." IDS_COLDESC_LSIZE "Taille du fichier du côté gauche en octets." IDS_COLDESC_RSIZE "Taille du fichier du côté droit en octets." + IDS_COLDESC_LSIZE_SHORT "Left file size abbreviated." + IDS_COLDESC_RSIZE_SHORT "Right file size abbreviated." +END + +// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#2 +STRINGTABLE +BEGIN IDS_COLDESC_LTIMEC "Temps de creation du côté gauche." IDS_COLDESC_RTIMEC "Temps de creation du côté droit." IDS_COLDESC_NEWER "Indique le côté ayant la date de modification la plus récente." @@ -2085,7 +2109,8 @@ BEGIN IDS_REPORT_COMMALIST "Liste délimitée par des virgules" IDS_REPORT_TABLIST "Liste délimitée par des tabulations" IDS_REPORT_SIMPLEHTML "Format HTML" - IDS_REPORT_FILEOVERWRITE "Le rapport existe déjà. Voulez-vous écraser le fichier existant?" + IDS_REPORT_FILEOVERWRITE + "Le rapport existe déjà. Voulez-vous écraser le fichier existant?" IDS_REPORT_ERROR "Erreur à la création du rapport:\n%1" IDS_REPORT_SUCCESS "Le rapport a été créé avec succès." END diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc index 32c7a6dc6..f8ab0024f 100644 --- a/Src/Languages/German/MergeGerman.rc +++ b/Src/Languages/German/MergeGerman.rc @@ -138,6 +138,10 @@ BEGIN BEGIN MENUITEM "&Filter...", ID_TOOLS_FILTERS MENUITEM "&Patch generieren...", ID_TOOLS_GENERATEPATCH + POPUP "&Advanced" + BEGIN + MENUITEM "&Load Config...", ID_TOOLS_LOADCONFIG + END END POPUP "&Plugins" BEGIN @@ -195,15 +199,11 @@ BEGIN POPUP "&Ansicht" BEGIN MENUITEM "&Identische Dateien anzeigen", ID_OPTIONS_SHOWIDENTICAL - MENUITEM "&Unterschiedliche Dateien anzeigen", - ID_OPTIONS_SHOWDIFFERENT - MENUITEM "Eindeutige Dateien &links anzeigen", - ID_OPTIONS_SHOWUNIQUELEFT - MENUITEM "Eindeutige Dateien &rechts anzeigen", - ID_OPTIONS_SHOWUNIQUERIGHT + MENUITEM "&Unterschiedliche Dateien anzeigen", ID_OPTIONS_SHOWDIFFERENT + MENUITEM "Eindeutige Dateien &links anzeigen", ID_OPTIONS_SHOWUNIQUELEFT + MENUITEM "Eindeutige Dateien &rechts anzeigen", ID_OPTIONS_SHOWUNIQUERIGHT MENUITEM "Binär&dateien anzeigen", ID_OPTIONS_SHOWBINARIES - MENUITEM "Übersprun&gene Dateien anzeigen", - ID_OPTIONS_SHOWSKIPPED + MENUITEM "Übersprun&gene Dateien anzeigen", ID_OPTIONS_SHOWSKIPPED MENUITEM SEPARATOR MENUITEM "Verstec&kte Objekte anzeigen",ID_VIEW_SHOWHIDDENITEMS MENUITEM SEPARATOR @@ -241,6 +241,10 @@ BEGIN MENUITEM "&Filter...", ID_TOOLS_FILTERS MENUITEM "&Patch generieren...", ID_TOOLS_GENERATEPATCH MENUITEM "&Bericht generieren...", ID_TOOLS_GENERATEREPORT + POPUP "&Advanced" + BEGIN + MENUITEM "&Load Config...", ID_TOOLS_LOADCONFIG + END END POPUP "&Plugins" BEGIN @@ -384,6 +388,10 @@ BEGIN BEGIN MENUITEM "&Filter...", ID_TOOLS_FILTERS MENUITEM "&Patch generieren...", ID_TOOLS_GENERATEPATCH + POPUP "&Advanced" + BEGIN + MENUITEM "&Load Config...", ID_TOOLS_LOADCONFIG + END END POPUP "&Plugins" BEGIN @@ -620,8 +628,8 @@ BEGIN LTEXT "Status:",IDC_OPEN_STATUS,15,102,182,8 DEFPUSHBUTTON "OK",IDOK,312,11,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,312,28,50,14 - GROUPBOX "Zu vergleichende Dateien oder Verzeichnisse",IDC_FILES_DIRS_GROUP, - 7,7,298,111 + GROUPBOX "Zu vergleichende Dateien oder Verzeichnisse",IDC_FILES_DIRS_GROUP,7, + 7,298,111 PUSHBUTTON "Projekt speich.",IDC_SAVEPROJECT,312,56,50,14 END @@ -670,8 +678,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "&Sicherheitskopie der Originaldatei",IDC_BACKUP_CHECK, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10 + CONTROL "&Sicherheitskopie der Originaldatei",IDC_BACKUP_CHECK,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10 CONTROL "Anzeige automatisch auf den ersten Unterschied &positionieren", IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7, 17,210,10 @@ -719,13 +727,13 @@ BEGIN CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "&Nur ganze Wörter",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,27,135,10 - CONTROL "&Groß-/Kleinschreibung beachten",IDC_EDIT_MATCH_CASE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10 + CONTROL "&Groß-/Kleinschreibung beachten",IDC_EDIT_MATCH_CASE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,37,135,10 CONTROL "&Reguläre Ausdrücke",IDC_EDIT_REGEXP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10 GROUPBOX "Richtung",IDC_STATIC,148,23,70,36,WS_GROUP - CONTROL "nach &oben",IDC_EDIT_DIRECTION_UP,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,154,34,57,10 + CONTROL "nach &oben",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,154,34,57,10 CONTROL "nach &unten",IDC_EDIT_DIRECTION_DOWN,"Button", BS_AUTORADIOBUTTON,154,44,57,10 DEFPUSHBUTTON "&Weitersuchen",IDOK,226,7,50,14,WS_GROUP @@ -746,8 +754,8 @@ BEGIN CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP CONTROL "&Nur ganze Wörter",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,44,135,10 - CONTROL "&Groß-/Kleinschreibung beachten",IDC_EDIT_MATCH_CASE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,54,135,10 + CONTROL "&Groß-/Kleinschreibung beachten",IDC_EDIT_MATCH_CASE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,54,135,10 CONTROL "&Reguläre Ausdrücke",IDC_EDIT_REGEXP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,64,135,10 CONTROL "Nicht das Dateiende umbrechen",IDC_EDIT_SCOPE_DONT_WRAP,"Button", @@ -1032,8 +1040,8 @@ BEGIN GROUPBOX "Datei",IDC_STATIC,7,27,57,35 CONTROL "&Links",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,38,48,10 - CONTROL "&Rechts",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON, - 13,48,47,10 + CONTROL "&Rechts",IDC_WMGOTO_FILERIGHT,"Button", + BS_AUTORADIOBUTTON,13,48,47,10 GROUPBOX "Ziel",IDC_STATIC,69,27,78,35 CONTROL "&Zeile",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,76,38,68,10 @@ -1049,16 +1057,16 @@ CAPTION "Vergleichen" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Leerzeichen",IDC_STATIC,7,7,221,50 - CONTROL "&Vergleichen",IDC_WHITESPACE,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,14,19,206,10 - CONTROL "Änderung &ignorieren",IDC_WHITE_CHANGE, - "Button",BS_AUTORADIOBUTTON,14,30,206,10 - CONTROL "&Alle ignorieren",IDC_ALL_WHITE,"Button", - BS_AUTORADIOBUTTON,14,41,206,10 + CONTROL "&Vergleichen",IDC_WHITESPACE,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,14,19,206,10 + CONTROL "Änderung &ignorieren",IDC_WHITE_CHANGE,"Button", + BS_AUTORADIOBUTTON,14,30,206,10 + CONTROL "&Alle ignorieren",IDC_ALL_WHITE,"Button",BS_AUTORADIOBUTTON, + 14,41,206,10 CONTROL "&Leerzeilen ignorieren",IDC_IGNBLANKS_CHECK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,60,221,10 - CONTROL "&Groß-/Kleinschreibung ignorieren",IDC_IGNCASE_CHECK, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,70,221,10 + CONTROL "&Groß-/Kleinschreibung ignorieren",IDC_IGNCASE_CHECK,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,70,221,10 CONTROL "&Zeilenumbruchunterschiede (DOS/UNIX/MAC) ignorieren", IDC_EOL_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 7,80,221,10 @@ -1126,7 +1134,7 @@ END IDD_SAVECLOSING DIALOGEX 0, 0, 262, 154 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU + WS_SYSMENU | WS_THICKFRAME CAPTION "Geänderte Dateien speichern?" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1448,118 +1456,6 @@ END ///////////////////////////////////////////////////////////////////////////// // -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_ABOUTBOX, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 216 - TOPMARGIN, 7 - BOTTOMMARGIN, 115 - END - - IDD_OPEN, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 349 - TOPMARGIN, 7 - BOTTOMMARGIN, 108 - END - - IDD_VSS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 251 - TOPMARGIN, 7 - BOTTOMMARGIN, 141 - END - - IDD_PROP_VSS, DIALOG - BEGIN - LEFTMARGIN, 7 - VERTGUIDE, 85 - TOPMARGIN, 7 - BOTTOMMARGIN, 150 - END - - IDD_PROPPAGE_LARGE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 252 - VERTGUIDE, 125 - TOPMARGIN, 7 - BOTTOMMARGIN, 149 - END - - IDD_CLEARCASE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 272 - VERTGUIDE, 18 - VERTGUIDE, 35 - VERTGUIDE, 244 - VERTGUIDE, 261 - TOPMARGIN, 7 - BOTTOMMARGIN, 104 - END - - IDD_PROPSYNTAX, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 228 - TOPMARGIN, 7 - BOTTOMMARGIN, 149 - END - - IDD_PROPPAGE_FILTER, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 228 - TOPMARGIN, 7 - BOTTOMMARGIN, 149 - END - - IDD_PROPPAGE_COLORS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 228 - TOPMARGIN, 7 - BOTTOMMARGIN, 149 - END - - IDD_EDITOR_HEADERBAR, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 366 - TOPMARGIN, 7 - BOTTOMMARGIN, 4 - END - - IDD_DIRCOLS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 266 - TOPMARGIN, 7 - BOTTOMMARGIN, 155 - END - - IDD_GENERATE_PATCH, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 333 - TOPMARGIN, 7 - BOTTOMMARGIN, 173 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// // Toolbar // @@ -1939,7 +1835,7 @@ BEGIN IDS_DIFF_NUMBER_STATUS_FMT "Unterschied %1 von %2" IDS_NO_DIFF_SEL_FMT "%1 Unterschiede gefunden" IDS_1_DIFF_FOUND "1 Unterschied gefunden" - IDS_STATUSBAR_READONLY "RO" + IDS_STATUSBAR_READONLY "RO" // Read Only END // MORE STATUS PANES @@ -2105,7 +2001,7 @@ BEGIN "Verschiebt die ausgewählte Datei in ein beliebiges Verzeichnis." END -// DIRECTORY DIFFING : COLUMN TITLES +// DIRECTORY DIFFING : COLUMN TITLES #1 STRINGTABLE BEGIN IDS_COLHDR_FILENAME "Dateiname" @@ -2116,6 +2012,13 @@ BEGIN IDS_COLHDR_EXTENSION "Erweiterung" IDS_COLHDR_LSIZE "Linke Größe" IDS_COLHDR_RSIZE "Rechte Größe" + IDS_COLHDR_RSIZE_SHORT "Right Size (Short)" + IDS_COLHDR_LSIZE_SHORT "Left Size (Short)" +END + +// DIRECTORY DIFFING : COLUMN TITLES #2 +STRINGTABLE +BEGIN IDS_COLHDR_LTIMEC "Linkes Erstellungsdatum" IDS_COLHDR_RTIMEC "Rechtes Erstellungsdatum" IDS_COLHDR_NEWER "Neuere Datei" @@ -2126,7 +2029,7 @@ BEGIN IDS_COLHDR_RATTRIBUTES "Rechte Attribute" END -// DIRECTORY DIFFING : COLUMN TITLES (2) +// DIRECTORY DIFFING : COLUMN TITLES #3 STRINGTABLE BEGIN IDS_COLHDR_LENCODING "Linke Kodierung" @@ -2161,7 +2064,7 @@ BEGIN IDS_STATUS_SELITEMS "%1 Objekte ausgewählt" END -// DIRECTORY DIFFING : COLUMN DESCRIPTIONS +// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#1 STRINGTABLE BEGIN IDS_COLDESC_FILENAME "Dateiname oder Verzeichnisname." @@ -2172,6 +2075,13 @@ BEGIN IDS_COLDESC_EXTENSION "Dateierweiterung." IDS_COLDESC_LSIZE "Linke Dateigröße in Byte." IDS_COLDESC_RSIZE "Rechte Dateigröße in Byte." + IDS_COLDESC_LSIZE_SHORT "Left file size abbreviated." + IDS_COLDESC_RSIZE_SHORT "Right file size abbreviated." +END + +// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#2 +STRINGTABLE +BEGIN IDS_COLDESC_LTIMEC "Linkes Erstellungsdatum." IDS_COLDESC_RTIMEC "Rechtes Erstellungsdatum." IDS_COLDESC_NEWER "Zeigt, welche Seite ein neueres Änderungsdatum hat." diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc index e166df509..e9e4a9ef6 100644 --- a/Src/Languages/Hungarian/MergeHungarian.rc +++ b/Src/Languages/Hungarian/MergeHungarian.rc @@ -138,6 +138,10 @@ BEGIN BEGIN MENUITEM "&Szûrõk...", ID_TOOLS_FILTERS MENUITEM "&Patch generálása...", ID_TOOLS_GENERATEPATCH + POPUP "&Advanced" + BEGIN + MENUITEM "&Load Config...", ID_TOOLS_LOADCONFIG + END END POPUP "&Bõvítmények" BEGIN @@ -237,6 +241,10 @@ BEGIN MENUITEM "&Szûrõk...", ID_TOOLS_FILTERS MENUITEM "&Patch generálása...", ID_TOOLS_GENERATEPATCH MENUITEM "&Jelentés generálása...", ID_TOOLS_GENERATEREPORT + POPUP "&Advanced" + BEGIN + MENUITEM "&Load Config...", ID_TOOLS_LOADCONFIG + END END POPUP "&Bõvítmények" BEGIN @@ -380,6 +388,10 @@ BEGIN BEGIN MENUITEM "&Szûrõk...", ID_TOOLS_FILTERS MENUITEM "&Patch generálása...", ID_TOOLS_GENERATEPATCH + POPUP "&Advanced" + BEGIN + MENUITEM "&Load Config...", ID_TOOLS_LOADCONFIG + END END POPUP "&Bõvítmények" BEGIN @@ -1122,7 +1134,7 @@ END IDD_SAVECLOSING DIALOGEX 0, 0, 262, 154 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU + WS_SYSMENU | WS_THICKFRAME CAPTION "Módosított fájlok mentése?" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1823,7 +1835,7 @@ BEGIN IDS_DIFF_NUMBER_STATUS_FMT "Ennyi különség: %1 ennyibõl: %2" IDS_NO_DIFF_SEL_FMT "%1 különbséget találtam" IDS_1_DIFF_FOUND "1 különbséget találtam" - IDS_STATUSBAR_READONLY "RO" + IDS_STATUSBAR_READONLY "RO" // Read Only END // MORE STATUS PANES @@ -1989,7 +2001,7 @@ BEGIN "A kijelölt jobb oldali fájlok áthelyezése tetszõleges könyvtárba" END -// DIRECTORY DIFFING : COLUMN TITLES +// DIRECTORY DIFFING : COLUMN TITLES #1 STRINGTABLE BEGIN IDS_COLHDR_FILENAME "Fájlnév" @@ -2000,6 +2012,13 @@ BEGIN IDS_COLHDR_EXTENSION "Kiterjesztés" IDS_COLHDR_LSIZE "Bal oldali méret" IDS_COLHDR_RSIZE "Jobb oldali méret" + IDS_COLHDR_RSIZE_SHORT "Right Size (Short)" + IDS_COLHDR_LSIZE_SHORT "Left Size (Short)" +END + +// DIRECTORY DIFFING : COLUMN TITLES #2 +STRINGTABLE +BEGIN IDS_COLHDR_LTIMEC "Bal oldali létrehozási idõ" IDS_COLHDR_RTIMEC "Jobb oldali létrehozási idõ" IDS_COLHDR_NEWER "Újabb fájl" @@ -2010,7 +2029,7 @@ BEGIN IDS_COLHDR_RATTRIBUTES "Jobb oldali attribútumok" END -// DIRECTORY DIFFING : COLUMN TITLES (2) +// DIRECTORY DIFFING : COLUMN TITLES #3 STRINGTABLE BEGIN IDS_COLHDR_LENCODING "Bal oldali kódolás" @@ -2045,7 +2064,7 @@ BEGIN IDS_STATUS_SELITEMS "%1 elem kiválasztva" END -// DIRECTORY DIFFING : COLUMN DESCRIPTIONS +// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#1 STRINGTABLE BEGIN IDS_COLDESC_FILENAME "fájlnév vagy könyvtárnév." @@ -2056,6 +2075,13 @@ BEGIN IDS_COLDESC_EXTENSION "Fájlok kiterjesztése." IDS_COLDESC_LSIZE "Bal oldali fájl mérete bájtokban." IDS_COLDESC_RSIZE "Jobb oldali fájl mérete bájtokban." + IDS_COLDESC_LSIZE_SHORT "Left file size abbreviated." + IDS_COLDESC_RSIZE_SHORT "Right file size abbreviated." +END + +// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#2 +STRINGTABLE +BEGIN IDS_COLDESC_LTIMEC "Bal oldal létrehozási ideje." IDS_COLDESC_RTIMEC "Jobb oldal létrehozási ideje." IDS_COLDESC_NEWER "Megmutatja, melyik oldalnak újabb a létrehozási dátuma." diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc index 10d070af6..4e87a7400 100644 --- a/Src/Languages/Italian/MergeItalian.rc +++ b/Src/Languages/Italian/MergeItalian.rc @@ -138,6 +138,10 @@ BEGIN BEGIN MENUITEM "&Filtri...", ID_TOOLS_FILTERS MENUITEM "&Crea patch...", ID_TOOLS_GENERATEPATCH + POPUP "&Advanced" + BEGIN + MENUITEM "&Load Config...", ID_TOOLS_LOADCONFIG + END END POPUP "&Plugin" BEGIN @@ -237,6 +241,10 @@ BEGIN MENUITEM "&Filtri...", ID_TOOLS_FILTERS MENUITEM "&Crea patch...", ID_TOOLS_GENERATEPATCH MENUITEM "Genera &rapporto...", ID_TOOLS_GENERATEREPORT + POPUP "&Advanced" + BEGIN + MENUITEM "&Load Config...", ID_TOOLS_LOADCONFIG + END END POPUP "&Plugin" BEGIN @@ -380,6 +388,10 @@ BEGIN BEGIN MENUITEM "&Filtri...", ID_TOOLS_FILTERS MENUITEM "&Crea patch...", ID_TOOLS_GENERATEPATCH + POPUP "&Advanced" + BEGIN + MENUITEM "&Load Config...", ID_TOOLS_LOADCONFIG + END END POPUP "&Plugin" BEGIN @@ -666,11 +678,11 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Generale" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Salva copia di bac&kup del file originale",IDC_BACKUP_CHECK, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10 + CONTROL "Salva copia di bac&kup del file originale",IDC_BACKUP_CHECK,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,7,206,10 CONTROL "&Visualizza automaticamente la prima differenza", - IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 7,17,211,10 + IDC_SCROLL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7, + 17,211,10 CONTROL "&Disattiva la schermata iniziale",IDC_DISABLE_SPLASH,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,27,206,10 CONTROL "C&hiudi finestra con ESC",IDC_ESC_CLOSES_WINDOW,"Button", @@ -711,8 +723,8 @@ CAPTION "Trova" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN LTEXT "Tro&va:",IDC_STATIC,7,9,50,8 - COMBOBOX IDC_EDIT_FINDTEXT,59,7,160,65,CBS_DROPDOWN | WS_VSCROLL | - CBS_AUTOHSCROLL | WS_TABSTOP + COMBOBOX IDC_EDIT_FINDTEXT,59,7,160,65,CBS_DROPDOWN | + CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Solo &parole intere",IDC_EDIT_WHOLE_WORD,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,27,135,10 CONTROL "&Maiuscolo/Minuscolo",IDC_EDIT_MATCH_CASE,"Button", @@ -1028,8 +1040,8 @@ BEGIN GROUPBOX "File",IDC_STATIC,7,27,57,35 CONTROL "&Sinistra",IDC_WMGOTO_FILELEFT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,38,48,10 - CONTROL "&Destra",IDC_WMGOTO_FILERIGHT,"Button",BS_AUTORADIOBUTTON, - 13,48,47,10 + CONTROL "&Destra",IDC_WMGOTO_FILERIGHT,"Button", + BS_AUTORADIOBUTTON,13,48,47,10 GROUPBOX "Vai a ...",IDC_STATIC,69,27,78,35 CONTROL "Li&nea",IDC_WMGOTO_TOLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,76,38,68,10 @@ -1053,9 +1065,8 @@ BEGIN 14,41,206,10 CONTROL "Ign&ora le linee vuote",IDC_IGNBLANKS_CHECK,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,60,221,10 - CONTROL "Ig&nora le differenze tra maiuscole e minuscole", - IDC_IGNCASE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 7,70,221,10 + CONTROL "Ig&nora le differenze tra maiuscole e minuscole",IDC_IGNCASE_CHECK,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,70,221,10 CONTROL "Igno&ra le differenze di carriage return (DOS/UNIX/MAC)", IDC_EOL_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 7,80,221,10 @@ -1123,7 +1134,7 @@ END IDD_SAVECLOSING DIALOGEX 0, 0, 262, 154 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU + WS_SYSMENU | WS_THICKFRAME CAPTION "Salvare i file modificati?" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -1424,7 +1435,6 @@ BEGIN BLOCK "041004e4" BEGIN VALUE "Comments", "Translated by Andrea Decorte(aka Klenje), previously by Michele Merega\0" - VALUE "CompanyName", "\0" VALUE "FileDescription", "Applicazione di WinMerge\0" VALUE "FileVersion", "000.000.000.000\0" VALUE "InternalName", "WinMerge\0" @@ -1433,7 +1443,6 @@ BEGIN VALUE "PrivateBuild", "" VALUE "ProductName", "WinMerge\0" VALUE "ProductVersion", "000.000.000.000\0" - VALUE "SpecialBuild", "\0" END END BLOCK "VarFileInfo" @@ -1447,119 +1456,6 @@ END ///////////////////////////////////////////////////////////////////////////// // -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_ABOUTBOX, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 216 - TOPMARGIN, 7 - BOTTOMMARGIN, 115 - END - - IDD_OPEN, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 349 - TOPMARGIN, 7 - BOTTOMMARGIN, 108 - END - - IDD_VSS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 251 - TOPMARGIN, 7 - BOTTOMMARGIN, 141 - END - - IDD_PROP_VSS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 252 - VERTGUIDE, 85 - TOPMARGIN, 7 - BOTTOMMARGIN, 150 - END - - IDD_PROPPAGE_LARGE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 252 - VERTGUIDE, 128 - TOPMARGIN, 7 - BOTTOMMARGIN, 149 - END - - IDD_CLEARCASE, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 272 - VERTGUIDE, 18 - VERTGUIDE, 35 - VERTGUIDE, 244 - VERTGUIDE, 261 - TOPMARGIN, 7 - BOTTOMMARGIN, 104 - END - - IDD_PROPSYNTAX, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 228 - TOPMARGIN, 7 - BOTTOMMARGIN, 149 - END - - IDD_PROPPAGE_FILTER, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 228 - TOPMARGIN, 7 - BOTTOMMARGIN, 149 - END - - IDD_PROPPAGE_COLORS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 228 - TOPMARGIN, 7 - BOTTOMMARGIN, 149 - END - - IDD_EDITOR_HEADERBAR, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 366 - TOPMARGIN, 7 - BOTTOMMARGIN, 4 - END - - IDD_DIRCOLS, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 266 - TOPMARGIN, 7 - BOTTOMMARGIN, 155 - END - - IDD_GENERATE_PATCH, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 333 - TOPMARGIN, 7 - BOTTOMMARGIN, 173 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// // Toolbar // @@ -1795,7 +1691,7 @@ BEGIN IDC_STATIC_TITLE_RIGHT "Clicca con il tasto destro sul percorso per copiare" END -// IDS_MESSAGEBOX_OK SYNCHRO +// "DO NOT SHOW AGAIN" MESSAGEBOXES STRINGTABLE BEGIN IDS_MESSAGEBOX_OK "&OK" @@ -1939,7 +1835,7 @@ BEGIN IDS_DIFF_NUMBER_STATUS_FMT "Differenza %1 su %2" IDS_NO_DIFF_SEL_FMT "%1 differenze trovate" IDS_1_DIFF_FOUND "1 differenza trovata" - IDS_STATUSBAR_READONLY "SL" + IDS_STATUSBAR_READONLY "SL" // Sola lettura END // MORE STATUS PANES @@ -2105,7 +2001,7 @@ BEGIN "Sposta il file selezionato sulla destra in una cartella personalizzata" END -// DIRECTORY DIFFING : COLUMN TITLES +// DIRECTORY DIFFING : COLUMN TITLES #1 STRINGTABLE BEGIN IDS_COLHDR_FILENAME "Nome del file" @@ -2116,6 +2012,13 @@ BEGIN IDS_COLHDR_EXTENSION "Estensione" IDS_COLHDR_LSIZE "Dimensioni file di sinistra" IDS_COLHDR_RSIZE "Dimensioni file di destra" + IDS_COLHDR_RSIZE_SHORT "Right Size (Short)" + IDS_COLHDR_LSIZE_SHORT "Left Size (Short)" +END + +// DIRECTORY DIFFING : COLUMN TITLES #2 +STRINGTABLE +BEGIN IDS_COLHDR_LTIMEC "Data creazione file sinistra" IDS_COLHDR_RTIMEC "Data creazione file destra" IDS_COLHDR_NEWER "File più recente" @@ -2126,7 +2029,7 @@ BEGIN IDS_COLHDR_RATTRIBUTES "Attributi destra" END -// DIRECTORY DIFFING : COLUMN TITLES (2) +// DIRECTORY DIFFING : COLUMN TITLES #3 STRINGTABLE BEGIN IDS_COLHDR_LENCODING "Codifica di sinistra" @@ -2161,7 +2064,7 @@ BEGIN IDS_STATUS_SELITEMS "%1 elementi selezionati" END -// DIRECTORY DIFFING : COLUMN DESCRIPTIONS +// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#1 STRINGTABLE BEGIN IDS_COLDESC_FILENAME "Nome del file o della cartella." @@ -2172,6 +2075,13 @@ BEGIN IDS_COLDESC_EXTENSION "Estensione del file." IDS_COLDESC_LSIZE "Dimensioni del file di sinistra in byte." IDS_COLDESC_RSIZE "Dimensioni del file di destra in byte." + IDS_COLDESC_LSIZE_SHORT "Left file size abbreviated." + IDS_COLDESC_RSIZE_SHORT "Right file size abbreviated." +END + +// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#2 +STRINGTABLE +BEGIN IDS_COLDESC_LTIMEC "Data e ora di creazione del file di sinistra." IDS_COLDESC_RTIMEC "Data e ora di creazione del file di destra." IDS_COLDESC_NEWER "Mostra quale file ha la data dell'ultima modifica più recente." diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc index 7659a85b6..8c24621fa 100644 --- a/Src/Languages/Japanese/MergeJapanese.rc +++ b/Src/Languages/Japanese/MergeJapanese.rc @@ -138,6 +138,10 @@ BEGIN BEGIN MENUITEM "ƒtƒBƒ‹ƒ^(&F)...", ID_TOOLS_FILTERS MENUITEM "ƒpƒbƒ`‚̐¶¬(&G)...", ID_TOOLS_GENERATEPATCH + POPUP "&Advanced" + BEGIN + MENUITEM "&Load Config...", ID_TOOLS_LOADCONFIG + END END POPUP "ƒvƒ‰ƒOƒCƒ“(&P)" BEGIN @@ -237,6 +241,10 @@ BEGIN MENUITEM "ƒtƒBƒ‹ƒ^(&F)...", ID_TOOLS_FILTERS MENUITEM "ƒpƒbƒ`‚̐¶¬(&G)...", ID_TOOLS_GENERATEPATCH MENUITEM "ƒŒƒ|[ƒg‚̐¶¬(&R)...", ID_TOOLS_GENERATEREPORT + POPUP "&Advanced" + BEGIN + MENUITEM "&Load Config...", ID_TOOLS_LOADCONFIG + END END POPUP "ƒvƒ‰ƒOƒCƒ“(&P)" BEGIN @@ -370,8 +378,8 @@ BEGIN MENUITEM "‰E‚ɃRƒs[(&R)\tAlt+Right", ID_L2R MENUITEM "¶‚ɃRƒs[(&E)\tAlt+Left", ID_R2L MENUITEM SEPARATOR - MENUITEM "‰E‚ɃRƒs[‚µ‚ÄŽŸ‚ɐi‚Þ(&O)\tAlt+Ctrl+Right", ID_R2LNEXT MENUITEM "¶‚ɃRƒs[‚µ‚ÄŽŸ‚ɐi‚Þ(&T)\tAlt+Ctrl+Left", ID_L2RNEXT + MENUITEM "‰E‚ɃRƒs[‚µ‚ÄŽŸ‚ɐi‚Þ(&O)\tAlt+Ctrl+Right", ID_R2LNEXT MENUITEM SEPARATOR MENUITEM "‘S‚Ä‚ð‰E‚ɃRƒs[(&A)", ID_ALL_RIGHT MENUITEM "‘S‚Ä‚ð¶‚ÉƒRƒs[(&Y)", ID_ALL_LEFT @@ -380,6 +388,10 @@ BEGIN BEGIN MENUITEM "ƒtƒBƒ‹ƒ^(&F)...", ID_TOOLS_FILTERS MENUITEM "ƒpƒbƒ`‚̐¶¬(&G)...", ID_TOOLS_GENERATEPATCH + POPUP "&Advanced" + BEGIN + MENUITEM "&Load Config...", ID_TOOLS_LOADCONFIG + END END POPUP "ƒvƒ‰ƒOƒCƒ“(&P)" BEGIN @@ -454,7 +466,6 @@ BEGIN BEGIN MENUITEM "“o˜^‚³‚ꂽƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚Å(&R)", ID_DIR_OPEN_RIGHT MENUITEM "ŠO•”ƒGƒfƒBƒ^‚Å(&E)", ID_DIR_OPEN_RIGHT_WITHEDITOR - MENUITEM "ƒvƒƒOƒ‰ƒ€‚Ì‘I‘ð(&W)...", ID_DIR_OPEN_RIGHT_WITH END MENUITEM SEPARATOR @@ -721,8 +732,8 @@ BEGIN CONTROL "³‹K•\Œ»(&E)",IDC_EDIT_REGEXP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,47,135,10 GROUPBOX "ŒŸõ‚·‚é•ûŒü",IDC_STATIC,148,23,70,36,WS_GROUP - CONTROL "ã‚Ö(&U)",IDC_EDIT_DIRECTION_UP,"Button", - BS_AUTORADIOBUTTON | WS_GROUP,154,34,57,10 + CONTROL "ã‚Ö(&U)",IDC_EDIT_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,154,34,57,10 CONTROL "‰º‚Ö(&D)",IDC_EDIT_DIRECTION_DOWN,"Button", BS_AUTORADIOBUTTON,154,44,57,10 DEFPUSHBUTTON "ŽŸ‚ðŒŸõ(&F)",IDOK,226,7,50,14,WS_GROUP @@ -1424,17 +1435,14 @@ BEGIN BLOCK "041103a4" BEGIN VALUE "Comments", "Translated by sawanaka@d1.dion.ne.jp\0" - VALUE "CompanyName", "\0" VALUE "FileDescription", "WinMerge Application\0" VALUE "FileVersion", "000.000.000.000\0" VALUE "InternalName", "WinMerge\0" VALUE "LegalCopyright", "(C) 1996-2005 Dean P. Grimm / Thingamahoochie Software\0" - VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "WinMerge.EXE\0" VALUE "PrivateBuild", "" VALUE "ProductName", "WinMerge\0" VALUE "ProductVersion", "000.000.000.000\0" - VALUE "SpecialBuild", "\0" END END BLOCK "VarFileInfo" @@ -1827,7 +1835,7 @@ BEGIN IDS_DIFF_NUMBER_STATUS_FMT "·ˆÙ %1/%2" IDS_NO_DIFF_SEL_FMT "%1ŒÂ‚̍·ˆÙ‚ªŒ©‚‚©‚è‚Ü‚µ‚½" IDS_1_DIFF_FOUND "1ŒÂ‚̍·ˆÙ‚ªŒ©‚‚©‚è‚Ü‚µ‚½" - IDS_STATUSBAR_READONLY "RO" + IDS_STATUSBAR_READONLY "RO" // Read Only END // MORE STATUS PANES @@ -1993,7 +2001,7 @@ BEGIN "‰E‘¤‚Ì‘I‘ð‚³‚ê‚½ƒtƒ@ƒCƒ‹‚ðŽw’肵‚½ƒtƒHƒ‹ƒ_‚Ɉړ®‚µ‚Ü‚·" END -// DIRECTORY DIFFING : COLUMN TITLES +// DIRECTORY DIFFING : COLUMN TITLES #1 STRINGTABLE BEGIN IDS_COLHDR_FILENAME "ƒtƒ@ƒCƒ‹–¼" @@ -2004,6 +2012,13 @@ BEGIN IDS_COLHDR_EXTENSION "Šg’£Žq" IDS_COLHDR_LSIZE "¶ƒTƒCƒY" IDS_COLHDR_RSIZE "‰EƒTƒCƒY" + IDS_COLHDR_RSIZE_SHORT "Right Size (Short)" + IDS_COLHDR_LSIZE_SHORT "Left Size (Short)" +END + +// DIRECTORY DIFFING : COLUMN TITLES #2 +STRINGTABLE +BEGIN IDS_COLHDR_LTIMEC "¶ì¬“úŽž" IDS_COLHDR_RTIMEC "‰Eì¬“úŽž" IDS_COLHDR_NEWER "V‚µ‚¢ƒtƒ@ƒCƒ‹" @@ -2014,7 +2029,7 @@ BEGIN IDS_COLHDR_RATTRIBUTES "‰E‘®«" END -// DIRECTORY DIFFING : COLUMN TITLES (2) +// DIRECTORY DIFFING : COLUMN TITLES #3 STRINGTABLE BEGIN IDS_COLHDR_LENCODING "¶ƒGƒ“ƒR[ƒfƒBƒ“ƒO" @@ -2049,7 +2064,7 @@ BEGIN IDS_STATUS_SELITEMS "%1ŒÂ‚̍€–Ú‚ð‘I‘ð" END -// DIRECTORY DIFFING : COLUMN DESCRIPTIONS +// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#1 STRINGTABLE BEGIN IDS_COLDESC_FILENAME "ƒtƒ@ƒCƒ‹–¼‚Ü‚½‚́AƒtƒHƒ‹ƒ_–¼" @@ -2060,6 +2075,13 @@ BEGIN IDS_COLDESC_EXTENSION "ƒtƒ@ƒCƒ‹Šg’£Žq" IDS_COLDESC_LSIZE "¶‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”" IDS_COLDESC_RSIZE "‰E‘¤ƒtƒ@ƒCƒ‹‚̃oƒCƒg”" + IDS_COLDESC_LSIZE_SHORT "Left file size abbreviated." + IDS_COLDESC_RSIZE_SHORT "Right file size abbreviated." +END + +// DIRECTORY DIFFING : COLUMN DESCRIPTIONS#2 +STRINGTABLE +BEGIN IDS_COLDESC_LTIMEC "¶‘¤‚̍쐬Žž" IDS_COLDESC_RTIMEC "‰E‘¤‚̍쐬Žž" IDS_COLDESC_NEWER "‚Ç‚¿‚炪ÅV‚̕ύX“ú•t‚©‚ðŽ¦‚µ‚Ü‚·B" diff --git a/Src/Merge.rc b/Src/Merge.rc index 6372d2167..559d8757a 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -1832,7 +1832,7 @@ BEGIN IDS_DIFF_NUMBER_STATUS_FMT "Difference %1 of %2" IDS_NO_DIFF_SEL_FMT "%1 Differences Found" IDS_1_DIFF_FOUND "1 Difference Found" - IDS_STATUSBAR_READONLY "RO" + IDS_STATUSBAR_READONLY "RO" // Read Only END // MORE STATUS PANES -- 2.11.0