IDS_FILEBINARY "Arquivos binários não podem ser comparados visualmente."
IDS_TEMP_FILEERROR "Temporary files could not be created. Check your temporary path settings."
IDS_FILEISDIR "Os arquivos deste diretório, não podem ser comparados visualmente."
- IDS_SUGGEST_IGNOREEOL "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
IDS_PREDIFFER_ERROR "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
IDS_SUGGEST_IGNORECODEPAGE "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to force both into the default codepage (recommended)?"
IDS_FILEBINARY "Áèíàðíèòå ôàéëîâå íå ìîãàò äà ñå ñðàâíÿâàò âèäèìî."
IDS_TEMP_FILEERROR "Temporary files could not be created. Check your temporary path settings."
IDS_FILEISDIR "Äèðåêòîðèèòå íå ìîãàò äà áúäàò ñðàâíÿâàíè âèäèìî."
- IDS_SUGGEST_IGNOREEOL "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
IDS_PREDIFFER_ERROR "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
IDS_SUGGEST_IGNORECODEPAGE "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to force both into the default codepage (recommended)?"
IDS_FILEBINARY "Els fitxers binaris no es poden comparar visualment."
IDS_TEMP_FILEERROR "No s'han pogut obrir els fitxers temporals. Comproveu els ajustos de camí temporal."
IDS_FILEISDIR "Els fitxers de directori no es poden comparar visualment."
- IDS_SUGGEST_IGNOREEOL "Els fitxers tenen salts de línia de diferent mena.\nAmb les opcions actuals, les línies diferiran.\nVoleu que s'ignorin en aquests fitxers?\n\nUsuari avançat: Si els salts de línia no estan unificats als fitxers,\naltrament podeu especificar l'opció '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "Els salts de línia són de diferent mena (DOS/UNIX/MAC) al fitxer '%1'.\nAmb les opcions actual, s'unificaran al tipus principal.\nVoleu canviar les opcions i preservar les diferents menes de salt de línia?"
IDS_PREDIFFER_ERROR "Hi ha hagut un error prediferenciant el fitxer '%1' amb el connector '%2'. No es tornarà a aplicar la prediferenciació."
IDS_SUGGEST_IGNORECODEPAGE "Els fitxers de l'esquerra (cp%d) i de la dreta (cp%d) no tenen la mateixa pàgina de codis.\nEn mostrar cada fitxer en la seva pròpia pàgina de codis millora la seva visualització però fa perillosa la combinació/còpia.\nVoleu ignorar la informació de pàgina de codis?"
IDS_FILEBINARY "¶þ½øÖÆÎļþÎÞ·¨×÷ÊÓ¾õµÄ±È¶Ô¡£"
IDS_TEMP_FILEERROR "Temporary files could not be created. Check your temporary path settings."
IDS_FILEISDIR "Îļþ¼ÐÎļþÎÞ·¨×öÊÓ¾õµÄ±È¶Ô¡£"
- IDS_SUGGEST_IGNOREEOL "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
IDS_PREDIFFER_ERROR "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
IDS_SUGGEST_IGNORECODEPAGE "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to force both into the default codepage (recommended)?"
IDS_FILEBINARY "¤G¶i¨îÀÉ®×µLªk§@µøıªº¤ñ¹ï¡C"
IDS_TEMP_FILEERROR "Temporary files could not be created. Check your temporary path settings."
IDS_FILEISDIR "¸ê®Æ§¨ÀÉ®×µLªk°µµøıªº¤ñ¹ï¡C"
- IDS_SUGGEST_IGNOREEOL "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
IDS_PREDIFFER_ERROR "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
IDS_SUGGEST_IGNORECODEPAGE "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to force both into the default codepage (recommended)?"
IDS_FILEBINARY "Binární soubory nelze porovnat."
IDS_TEMP_FILEERROR "Temporary files could not be created. Check your temporary path settings."
IDS_FILEISDIR "Directory files cannot be visually compared."
- IDS_SUGGEST_IGNOREEOL "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
IDS_PREDIFFER_ERROR "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
IDS_SUGGEST_IGNORECODEPAGE "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to force both into the default codepage (recommended)?"
IDS_FILEBINARY "Binære filer kan ikke sammenlignes visuelt."
IDS_TEMP_FILEERROR "Midlertidige filer kunne ikke oprettes. Tjek dine indstillinger for midlertidig (temp) mappe."
IDS_FILEISDIR "Mapper kan ikke sammenlignes visuelt."
- IDS_SUGGEST_IGNOREEOL "Filerne har forskellig EOL type.\nMed de nuværende indstillinger, vil alle linjer være forskellige.\nVil du ignorerer EOL forskelle for disse filer ?\n\nAvancerede brugere : hvis EOL ikke er ens hele vejen gennem dine filer,\n kan det være en ide at sætte indstillingen '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "Filernes EOL er forskellige typer (DOS/UNIX/MAC) i filen '%1'.\n Med de nuværende indstillinger, vil de blive omdannet til hovedtypen.\n Vil du ændrer indstilingerne og bevare de forskellige EOL ?"
IDS_PREDIFFER_ERROR "Der skete en fejl under prediffing af filen '%1' med plugin '%2'. Denne prediffing er ikke brugt mere."
IDS_SUGGEST_IGNORECODEPAGE "Venstre (cp%d) og højre (cp%d) filer har ikke den samme codepage. \nVisning af hver fil i sin egen codepage vil give et bedre visuelt resultat men fletning/kopiering vil være farligt.\nVil du tvinge begge to til standard codepage (anbefalet)?"
IDS_FILEBINARY "Binaire bestanden kunnen niet zichtbaar vergeleken worden."
IDS_TEMP_FILEERROR "Temporary files could not be created. Check your temporary path settings."
IDS_FILEISDIR "Directory files cannot be visually compared."
- IDS_SUGGEST_IGNOREEOL "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
IDS_PREDIFFER_ERROR "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
IDS_SUGGEST_IGNORECODEPAGE "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to force both into the default codepage (recommended)?"
IDS_FILEBINARY "Les fichiers binaires ne peuvent pas être comparés de manière visuelle."
IDS_TEMP_FILEERROR "Temporary files could not be created. Check your temporary path settings."
IDS_FILEISDIR "Les répertoires ne peuvent pas être comparés de manière visuelle."
- IDS_SUGGEST_IGNOREEOL "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
IDS_PREDIFFER_ERROR "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
IDS_SUGGEST_IGNORECODEPAGE "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to force both into the default codepage (recommended)?"
IDS_FILEBINARY "Binärdateien können nicht visuell verglichen werden."
IDS_TEMP_FILEERROR "Temporäre Dateien konnten nicht erzeugt werden. Überprüfen Sie Ihre Einstellungen für temporäre Dateien."
IDS_FILEISDIR "Verzeichnisse können nicht visuell verglichen werden."
- IDS_SUGGEST_IGNOREEOL "Die Dateien haben ein unterschiedliches Zeilenumbruch-Format.\nMit den aktuellen Einstellungen werden alle Zeilen unterschiedlich sein.\nMöchten Sie die Zeilenumbruch-Unterschiede für diese Dateien ignorieren?\n\nFür fortgeschrittene Anwender: Wenn die Zeilenumbrüche in Ihren Dateien nicht einheitlich sind,\n können Sie eher die Option '%1' einstellen."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "Die Zeilenumbrüche in der Datei '%1' sind von unterschiedlichen Formaten (DOS/UNIX/MAC).\nMit den aktuellen Einstellungen werden sie zum Hauptformat vereinheitlicht.\nMöchten Sie die Einstellungen ändern und das Mischen der Zeilenumbruch-Formate erlauben?"
IDS_PREDIFFER_ERROR "Ein Fehler trat beim Prediffing der Datei '%1' mit dem Plugin '%2' auf. Das Prediffing wird daher nicht mehr angewendet."
IDS_SUGGEST_IGNORECODEPAGE "Die linke (cp%d) und rechte (cp%d) Datei haben nicht den gleichen Zeichensatz.\nDas Anzeigen jeder Datei im eigenen Zeichensatz erlaubt eine bessere Darstellung, aber das Mischen/Kopieren ist gefährlich.\nMöchten Sie für Beide den Standard-Zeichensatz erzwingen (empfohlen)?"
IDS_FILEBINARY "Bináris fájlok nem hasonlíthatóak össze vizuálisan."
IDS_TEMP_FILEERROR "Nem lehetett létrehozni az ideiglenes fájlokat. Ellenõrizd az ideiglenes könyvtár beállításait."
IDS_FILEISDIR "Könyvtárak nem hasonlíthatóak össze vizuálisan."
- IDS_SUGGEST_IGNOREEOL "A fájloknak különbözõ újsor-karakter formátumuk van.\nA jelenlegi beállításokkal minden egyes sor eltérõ lesz.\nSzeretnéd figyelmen kívül hagyni az újsor-karakter eltéréseket?\n\nTapasztaltabbaknak: amennyiben nem egyezõek az újsor-karakterek a fájlokban,\nérdemes a '%1' opciót beállítani."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "Az újsor-karakterek különbözõ formátumúak (DOS/UNIX/MAC) ebben a fájlban: '%1'.\n A jelenlegi beállításokkal a leginkább jellemzõ lesz az alapértelmezett.\n Szeretnéd, ha mégis figyelembe venné az eltérõ újsor-karaktereket?"
IDS_PREDIFFER_ERROR "Hiba történt ennek a fájlnak az elõvizsgálata közben: '%1' ebben a bõvítményben: '%2'. Az elõvizsgálat ezután nem fog mûködni."
IDS_SUGGEST_IGNORECODEPAGE "A bal (cp%d) és jobb (cp%d) oldali fájlok nem ugyanazt a kódolást használják. \nA különbözõ kódlapokkal történõ kijelzés könnyebben áttekinthetõ de az olvasztás/törlés kockázatos lehet.\nSzeretnéd mindkét fájlt az alapértelmezett kódlappal megjeleníteni (javasolt)?"
IDS_FILEBINARY "I file di tipo binario non possono essere confrontati visualmente."
IDS_TEMP_FILEERROR "Impossibile creare file temporanei. Controlla le impostazioni del percorso per i file temporanei."
IDS_FILEISDIR "I file di cartelle non possono essere confrontate visivamente."
- IDS_SUGGEST_IGNOREEOL "I file hanno un diverso tipo di EOL.\nCon le opzioni correnti, tutte le linee saranno diverse.\nDesideri ignorare le differenze di EOL per questi file ?\n\nUtenti avanzati : se le EOL non sono unificate nei tuoi file,\npuoi piuttosto impostare l'opzione '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "Gli EOL sono di tipi diversi (DOS/UNIX/MAC) nel file '%1'.\nCon le opzioni correnti, essi verranno unificati nel tipo principale.\nDesideri cambiare le opzioni e conservare gli EOL diversi ?"
IDS_PREDIFFER_ERROR "C'è stato un errore nel prediffing del file '%1' con il plugin '%2'. Il prediffing non verrà più applicato."
IDS_SUGGEST_IGNORECODEPAGE "Il file sinistro (cp%d) e destro (cp%d) non hanno lo stesso codice di pagina.\nLa visualizzazione di ciascun file con il proprio codice di pagina fornirà una migliore visualizzazione ma l'unione/copia sarà pericolosa.\nNoi suggeriamo di lasciare da parte le informazioni sul codice di pagina. Sei d'accordo ?"
IDS_FILEBINARY "\83o\83C\83i\83\8a\83t\83@\83C\83\8b\82Í\8e\8b\8ao\93I\82É\94ä\8ar\82Å\82«\82Ü\82¹\82ñ\81B"
IDS_TEMP_FILEERROR "\83e\83\93\83|\83\89\83\8a\83t\83@\83C\83\8b\82ª\8dì\90¬\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½\81B\83e\83\93\83|\83\89\83\8a\83p\83X\90Ý\92è\82ð\8am\94F\82µ\82Ä\82\82¾\82³\82¢\81B"
IDS_FILEISDIR "\83f\83B\83\8c\83N\83g\83\8a\82Í\81A\83r\83W\83\85\83A\83\8b\82É\94ä\8ar\82Å\82«\82Ü\82¹\82ñ\81B"
- IDS_SUGGEST_IGNOREEOL "\83t\83@\83C\83\8b\93à\82É\88Ù\82È\82éEOL\83^\83C\83v\82ª\91¶\8dÝ\82µ\82Ä\82¢\82Ü\82·\81B\n\8c»\8dÝ\82Ì\83I\83v\83V\83\87\83\93\90Ý\92è\82Å\82Í\81A\82·\82×\82Ä\82Ì\8ds\82Í\81A\88Ù\82È\82Á\82½\82Ü\82Ü\82Å\82·\81B\n\83t\83@\83C\83\8b\93à\82É\91¶\8dÝ\82·\82éEOL\82Ì\88á\82¢\82ð\96³\8e\8b\82µ\82Ü\82·\82©?\n\n\8fã\8b\89\8eÒ : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "\83t\83@\83C\83\8b'%1'\93à\82É\88Ù\82È\82é\83^\83C\83v(DOS/UNIX/MAC)\82ÌEOL\82ª\91¶\8dÝ\82µ\82Ä\82¢\82Ü\82·\81B\n \8c»\8dÝ\82Ì\83I\83v\83V\83\87\83\93\90Ý\92è\82Å\82Í\81A\8eå\82ÈEOL\82É\93\9d\88ê\82³\82ê\82Ü\82·\81B\n \83I\83v\83V\83\87\83\93\82ð\95Ï\8dX\82µ\82Ä\81A\88Ù\82È\82éEOL\82ð\95Û\8e\9d\82·\82é\82æ\82¤\82É\82µ\82Ü\82·\82©?"
IDS_PREDIFFER_ERROR "\83v\83\89\83O\83C\83\93'%2'\82Å\83t\83@\83C\83\8b'%1'\82Ì\94ä\8ar\91O\8f\88\97\9d\82Ì\8eÀ\8ds\92\86\82É\83G\83\89\81[\82ª\94\90¶\82µ\82Ü\82µ\82½\81B\94ä\8ar\91O\8f\88\97\9d\82Í\88È\8d~\8ds\82È\82í\82ê\82Ü\82¹\82ñ\81B"
IDS_SUGGEST_IGNORECODEPAGE "\97¼\91¤\82Ì\83t\83@\83C\83\8b\82Í\81A\93¯\82¶\83R\81[\83h\83y\81[\83W\82Å\82Í\82 \82è\82Ü\82¹\82ñ\81B(cp%d vs cp%d)\n\8ae\81X\82Ì\83t\83@\83C\83\8b\82ð\82»\82Ì\83R\81[\83h\83y\81[\83W\82Å\95\\8e¦\82·\82ê\82Î\81A\90³\82µ\82\95\\8e¦\82³\82ê\82Ü\82·\82ª\81A\83}\81[\83W\82â\83R\83s\81[\82ª\8aë\8c¯\82É\82È\82è\82Ü\82·\81B\n\83R\81[\83h\83y\81[\83W\8fî\95ñ\82ð\96³\8e\8b\82µ\82Ü\82·\82ª\81A\82æ\82ë\82µ\82¢\82Å\82·\82©?"
IDS_FILEBINARY "¹ÙÀ̳ʸ® ÆÄÀÏÀº ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù."
IDS_TEMP_FILEERROR "Àӽà ÆÄÀÏÀ» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù. Àӽà ÆÄÀÏ ¼³Á¤À» È®ÀÎÇϼ¼¿ä."
IDS_FILEISDIR "µð·ºÅ丮´Â ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù."
- IDS_SUGGEST_IGNOREEOL "µÎ ÆÄÀÏÀº ´Ù¸¥ EOL·Î ÀÛ¼ºµÇ¾î ÀÖ½À´Ï´Ù.\nÇöÀç ¿É¼ÇÀ¸·Î´Â ¸ðµç ¶óÀÎÀÌ ´Ù¸£°Ô ³ª¿É´Ï´Ù\nÀÌ ÆÄÀϵ鿡 ´ëÇؼ EOL Â÷À̸¦ ¹«½ÃÇϽÀ´Ï±î ?\n\nAdvanced user : EOL ÀÌ ÆÄÀϳ»¿¡¼ µ¿ÀÏÇÏÁö ¾Ê´Ù¸é,\n'%1' ¿É¼ÇÀ» »ç¿ëÇÏ´Â °ÍÀÌ ÁÁ½À´Ï´Ù."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "'%1'Àº ¼·Î ´Ù¸¥ EOL(DOS/UNIX/MAC)·Î ÀÛ¼ºµÇ¾ú½À´Ï´Ù.\n ÇöÀç ¿É¼ÇÀ¸·Î´Â ¸ðµç EOLÀÌ Çϳª·Î ¹Ù²î°Ô µË´Ï´Ù.\n ¿øº» EOLÀ» À¯ÁöÇϱ⠿øÇϽʴϱî ?"
IDS_PREDIFFER_ERROR "'%2' Ç÷¯±×ÀÎÀ¸·Î '%1'À» prediffÇÏ´Â Áß ¿¡·¯°¡ ¹ß»ýÇß½À´Ï´Ù. ´õ ÀÌ»ó prediff°¡ ¼öÇàµÇÁö ¾Ê½À´Ï´Ù."
IDS_SUGGEST_IGNORECODEPAGE
IDS_FILEBINARY "Binære filer kan ikke sammenlignes visuelt."
IDS_TEMP_FILEERROR "Midlertidige filer kan ikke opprettes. Sjekk sti til den TMP/TEMP-mappe."
IDS_FILEISDIR "Mapper kan ikke sammenlignes visuelt."
- IDS_SUGGEST_IGNOREEOL "Filer har forskjellig EOL-type.\nMed gjeldende innstilling vil alle linjer bli forskjellig.\nVil du ignorere forskjellene i EOL for disse filene?\n\nAvansert bruker: hvis EOL ikke entydig i filen din,\n bør du kan kanskje velge '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
IDS_PREDIFFER_ERROR "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
IDS_SUGGEST_IGNORECODEPAGE "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to force both into the default codepage (recommended)?"
IDS_FILEBINARY "Pliki binarne nie moga byc porównywane wizualnie."
IDS_TEMP_FILEERROR "Temporary files could not be created. Check your temporary path settings."
IDS_FILEISDIR "Directory files cannot be visually compared."
- IDS_SUGGEST_IGNOREEOL "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
IDS_PREDIFFER_ERROR "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
IDS_SUGGEST_IGNORECODEPAGE "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to force both into the default codepage (recommended)?"
IDS_FILEBINARY "Áèíàðíûå ôàéëû íå ìîãóò áûòü ñðàâíåíû âèçóàëüíî"
IDS_TEMP_FILEERROR "Temporary files could not be created. Check your temporary path settings."
IDS_FILEISDIR "Ôàéëû êàòàëîãîâ íå ìîãóò áûòü ñðàâíåíû âèçóàëüíî"
- IDS_SUGGEST_IGNOREEOL "Ôàéëû èìåþò ðàçëè÷íûå òèïû EOL.\nÑ òåêóùèìè íàñòðîéêàìè âñå ëèíèè áóäóò èìåòü îòëè÷èÿ.\nÕîòèòå ëè âû ïðîèãíîðèðîâàòü îòëè÷èÿ â EOL äëÿ ýòèõ ôàéëîâ ?\n\nÎïûòíûì ïîëüçîâàòåëÿì : Åñëè âàøè ôàéëû íå èìåþò îäèíàêîâûõ EOL,\n âû, òåì íå ìåíåå, ìîæåòå óñòàíîâèòü îïöèþ '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL " ôàéëå '%1' ñèìâîëû EOL ðàçíûõ òèïîâ (DOS/UNIX/MAC).\nÑ òåêóùèìè íàñòðîéêàìè, îíè áóäóò ïðåîáðàçîâàíû êî ãëàâíîìó òèïó.\n Õîòèòå ëè âû èçìåíèòü âàøè íàñòðîéêè òàê, ÷òîáû ñîõðàíèòü ðàçëè÷íûå EOL ?"
IDS_PREDIFFER_ERROR "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
IDS_SUGGEST_IGNORECODEPAGE "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to force both into the default codepage (recommended)?"
IDS_FILEBINARY "Binárne súbory nemo\9eno porovna\9d."
IDS_TEMP_FILEERROR "Temporary files could not be created. Check your temporary path settings."
IDS_FILEISDIR "Súbory v adresáry nemô\9eu by\9d vizuálne porovnané."
- IDS_SUGGEST_IGNOREEOL "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
IDS_PREDIFFER_ERROR "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
IDS_SUGGEST_IGNORECODEPAGE "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to force both into the default codepage (recommended)?"
IDS_FILEBINARY "Archivos binarios no se puede comparar visualmente."
IDS_TEMP_FILEERROR "Temporary files could not be created. Check your temporary path settings."
IDS_FILEISDIR "Directory files cannot be visually compared."
- IDS_SUGGEST_IGNOREEOL "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
IDS_PREDIFFER_ERROR "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
IDS_SUGGEST_IGNORECODEPAGE "Las codepages no son igual enre el archivo de la izquierda (cp%d) y el de la derecha (cp%d). \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to force both into the default codepage (recommended)?"
IDS_FILEBINARY "Binära filer kan inte jämföras visuellt."
IDS_TEMP_FILEERROR "Temporära filer kunde inte skapas. Kontrollera inställningarna för dina temporära sökvägar."
IDS_FILEISDIR "Mappar kan inte jämföras visuellt."
- IDS_SUGGEST_IGNOREEOL "Filerna har olika radslutstyper.\nMed de aktuella inställningarna , kommer alla rader att vara olika.\nVill du ignorera radslutsskillnader för dessa filer ?\n\nAvancerad användare : om radslut inte är lika i dina filer,\n kan du hellre ställa in inställningen '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "Radsluten är av olika typer (DOS/UNIX/MAC) i filen '%1'.\n Med de aktuella inställningarna, kommer de att ändras till den vanligaste typen.\n Vill du ändra i inställningarna och bevara de olika radsluten ?"
IDS_PREDIFFER_ERROR "Ett fel uppstod vid prediffing av filen '%1' med plugin '%2'. Prediffing används inte mer."
IDS_SUGGEST_IGNORECODEPAGE "Vänster (cp%d) och höger (cp%d) fil har inte samma codepage. \nAtt visa varje fil i dess egen codepage ger en bättre visning men sammanfogning/kopierande blir farligt.\nVi föreslår att du glömmer codepage informationen. Önskar du detta ?"
IDS_FILEBINARY "Binary files cannot be visually compared."
IDS_TEMP_FILEERROR "Temporary files could not be created. Check your temporary path settings."
IDS_FILEISDIR "Directory files cannot be visually compared."
- IDS_SUGGEST_IGNOREEOL "The files have a different EOL type.\nWith the current options, all lines will differ.\nDo you want to ignore EOL differences for these files ?\n\nAdvanced user : if the EOL are not unified in your files,\n you may rather set the option '%1'."
+ IDS_SUGGEST_IGNOREEOL "These files use different carriage return types.\n\n\
+ Do you want to treat all carriage return types as equivalent for this comparison?\n\n\
+ Note: If you always want to treat all carriage return types \
+ as equivalent, set the option 'Ignore carriage return \
+ differences..' in the Compare tab of the options dialog\
+ (available under Edit/Options)."
IDS_SUGGEST_PRESERVEEOL "The EOL are of different types (DOS/UNIX/MAC) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
IDS_PREDIFFER_ERROR "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
IDS_SUGGEST_IGNORECODEPAGE "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to force both into the default codepage (recommended)?"
// Sensitive to EOL on, allow mixing EOL off, and files have a different EOL style.
// All lines will differ, that is not very interesting and probably not wanted.
// Propose to turn off the option 'sensitive to EOL'
- CString sOptionName;
- VERIFY(sOptionName.LoadString(IDC_MIXED_EOL));
- CString s;
- AfxFormatString1(s, IDS_SUGGEST_IGNOREEOL, sOptionName);
+ CString s = LoadResString(IDS_SUGGEST_IGNOREEOL);
if (AfxMessageBox(s, MB_YESNO|MB_ICONQUESTION|MB_DONT_ASK_AGAIN, IDS_SUGGEST_IGNOREEOL) == IDYES)
{
diffOptions.bEolSensitive = FALSE;
+2005-02-28 Perry
+ BUG: [ 1039158 ] Confusing EOL differences messagebox
+ Src: Merge.rc
+ Languages: Merge*.rc
+
2005-02-27 Perry
PATCH: [ 1112636 ] Suggest cosmetic change in DiffFileData::OpenFiles
(new method DiffFileData::Filepath::AssignPath)