diff options
83 files changed, 6229 insertions, 6422 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt index c69615c..a7089ff 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,7 +9,11 @@ # ################################################# -cmake_minimum_required( VERSION 3.1 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# diff --git a/CMakeLists.txt b/CMakeLists.txt index 8798ba0..7558622 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,11 @@ ############################################ -cmake_minimum_required( VERSION 3.1 ) +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) #### general package setup @@ -31,11 +35,6 @@ include( CheckCXXSourceCompiles ) include( TDEMacros ) -##### set version number ######################## - -tde_set_project_version( ) - - ##### setup install paths include( TDESetupPaths ) diff --git a/doc/da/index.docbook b/doc/da/index.docbook index 4d87f3a..7dae564 100644 --- a/doc/da/index.docbook +++ b/doc/da/index.docbook @@ -1403,7 +1403,7 @@ Please at least include KDE, the KDE package it is in, the name ></term ><listitem ><para ->Visse sprog skrives fra højre til venstre. Når dette er aktiveret, tegner &kdiff3; tekst fra højre til venstre i sammenligningsvinduerne og i sammenfletningsvinduet. Bemærk at hvis du starter &kdiff3; med kommandolinjeflaget "--reverse" så vises al layout også fra højre til venstre. (Dette er en funktion som &Qt; sørger for.) Denne dokumentation er skrevet under antagelse af at "Sprog som læses fra højre til venstre" eller omvendt layout ikke er aktiverede. Visse referencer til "venstre" eller "højre" skal erstattes af det modsatte hvis du bruger disse valgmuligheder. </para +>Visse sprog skrives fra højre til venstre. Når dette er aktiveret, tegner &kdiff3; tekst fra højre til venstre i sammenligningsvinduerne og i sammenfletningsvinduet. Bemærk at hvis du starter &kdiff3; med kommandolinjeflaget "--reverse" så vises al layout også fra højre til venstre. (Dette er en funktion som &TQt; sørger for.) Denne dokumentation er skrevet under antagelse af at "Sprog som læses fra højre til venstre" eller omvendt layout ikke er aktiverede. Visse referencer til "venstre" eller "højre" skal erstattes af det modsatte hvis du bruger disse valgmuligheder. </para ></listitem ></varlistentry> @@ -2890,7 +2890,7 @@ Please at least include KDE, the KDE package it is in, the name <para >Hvis du ikke bruger KDE, så brug ikke <command >configure</command -> men følg instruktionerne for systemer som kun bruger Qt i filen README.</para> +> men følg instruktionerne for systemer som kun bruger TQt i filen README.</para> <para >Eftersom &kdiff3; bruger <command >autoconf</command diff --git a/doc/de/index.docbook b/doc/de/index.docbook index 12e8bff..5473d33 100644 --- a/doc/de/index.docbook +++ b/doc/de/index.docbook @@ -1038,7 +1038,7 @@ Options: ></term ><listitem ><para ->Einige Sprachen werden von Rechts nach Links geschrieben. Wenn diese Option aktiviert ist, zeigt &kdiff3; den Text in Vergleichs- und Zusammenführen-Fenstern von Rechts nach Links an. Wenn Sie &kdiff3; mit der Option "--reverse" starten, wird das gesamte Layout der Programmoberfläche von Rechts nach Links angezeigt. (Dies ist eine Funktion von Qt.) Diese Dokumentation wurde unter der Annahme geschrieben, dass "Rechts-nach-Links Sprache" und umgedrehtes Layout abgeschaltet sind. Wenn Sie diese Optionen verwenden, müssen Sie also Referenzen auf "Rechts" und "Links" entsprechend umkehren. </para +>Einige Sprachen werden von Rechts nach Links geschrieben. Wenn diese Option aktiviert ist, zeigt &kdiff3; den Text in Vergleichs- und Zusammenführen-Fenstern von Rechts nach Links an. Wenn Sie &kdiff3; mit der Option "--reverse" starten, wird das gesamte Layout der Programmoberfläche von Rechts nach Links angezeigt. (Dies ist eine Funktion von TQt.) Diese Dokumentation wurde unter der Annahme geschrieben, dass "Rechts-nach-Links Sprache" und umgedrehtes Layout abgeschaltet sind. Wenn Sie diese Optionen verwenden, müssen Sie also Referenzen auf "Rechts" und "Links" entsprechend umkehren. </para ></listitem ></varlistentry> diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 5f6120e..652a8cd 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -1000,7 +1000,7 @@ Yet there is one option here that is also relevant for saving single files: </para></listitem></varlistentry> <varlistentry><term><emphasis>File Encoding for Preprocessor Files:</emphasis></term><listitem><para>When you define preprocessors then they might not be able to operate on your codec. (e.g.: Your files are 16-bit-unicode and your preprocessor can only take 8-bit-ascii.) With this option you can define the encoding of preprocessor output. </para></listitem></varlistentry> - <varlistentry><term><emphasis>Right To Left Language:</emphasis></term><listitem><para>Some languages are written right to left. When this option is enabled, &kdiff3; draws the text from right to left in the diff input windows and in the merge output window. Note that if you start &kdiff3; with the command line option "--reverse" then all layouting will be done right to left too. (This is a feature provided by Qt.) This documentation was written assuming that "Right To Left Language" or reverse layout are disabled. So some references to "left" or "right" must be replaced by their respective counterpart if you use these options. + <varlistentry><term><emphasis>Right To Left Language:</emphasis></term><listitem><para>Some languages are written right to left. When this option is enabled, &kdiff3; draws the text from right to left in the diff input windows and in the merge output window. Note that if you start &kdiff3; with the command line option "--reverse" then all layouting will be done right to left too. (This is a feature provided by TQt.) This documentation was written assuming that "Right To Left Language" or reverse layout are disabled. So some references to "left" or "right" must be replaced by their respective counterpart if you use these options. </para></listitem></varlistentry> </variablelist> @@ -2110,7 +2110,7 @@ following in the base directory of the &kdiff3; distribution:</para> <replaceable>kde-dir</replaceable> specifies the directory containing KDE on your system. If you are not sure, read the README-file for details. </para> -<para>If you don't use KDE don't use <command>configure</command> but follow the instructions for Qt-only systems in the README file.</para> +<para>If you don't use KDE don't use <command>configure</command> but follow the instructions for TQt-only systems in the README file.</para> <para>Since &kdiff3; uses <command>autoconf</command> and <command>automake</command> you should have no trouble compiling it. Should you run into problems please report them to the &kde; mailing lists.</para> diff --git a/doc/es/index.docbook b/doc/es/index.docbook index 50b4f7b..0e5afbe 100644 --- a/doc/es/index.docbook +++ b/doc/es/index.docbook @@ -1415,7 +1415,7 @@ Please at least include KDE, the KDE package it is in, the name ></term ><listitem ><para ->Algunos idiomas se escriben de derecha a izquierda. Cuando esta opción está activada, &kdiff3; dibuja el texto de derecha a izquierda en las ventanas de entrada de diff y en la ventana de la salida del fusionado. Tenga en cuenta que si inicia &kdiff3; con la opción de línea de órdenes «--reverse» toda la distribución se hará de derecha a izquierda también (ésta es una característica proporcionada por Qt). Este manual se escribió asumiendo que «Idioma de derecha a izquierda» o invertir distribución están desactivados. Por ello, algunas referencias a «izquierda» o «derecha» se reemplazarán por sus respectivas homólogas si utiliza estas opciones. </para +>Algunos idiomas se escriben de derecha a izquierda. Cuando esta opción está activada, &kdiff3; dibuja el texto de derecha a izquierda en las ventanas de entrada de diff y en la ventana de la salida del fusionado. Tenga en cuenta que si inicia &kdiff3; con la opción de línea de órdenes «--reverse» toda la distribución se hará de derecha a izquierda también (ésta es una característica proporcionada por TQt). Este manual se escribió asumiendo que «Idioma de derecha a izquierda» o invertir distribución están desactivados. Por ello, algunas referencias a «izquierda» o «derecha» se reemplazarán por sus respectivas homólogas si utiliza estas opciones. </para ></listitem ></varlistentry> @@ -2908,7 +2908,7 @@ Please at least include KDE, the KDE package it is in, the name <para >Sino utiliza KDE utilice <command >configure</command -> pero siga las instrucciones para los sistemas que solo tienen Qt en el archivo README.</para> +> pero siga las instrucciones para los sistemas que solo tienen TQt en el archivo README.</para> <para >Puesto que &kdiff3; utiliza <command >autoconf</command diff --git a/doc/et/index.docbook b/doc/et/index.docbook index 0a23805..98e50d2 100644 --- a/doc/et/index.docbook +++ b/doc/et/index.docbook @@ -1038,7 +1038,7 @@ Võtmed: ></term ><listitem ><para ->Mõningaid keeli kirjutatakse paremalt vasakule. Selle valiku sisselülitamisel näitab KDiff3 võrdluse sisendakendes ja ühendamise väljundaknas teksti paremalt vasakule. Pane tähele, et kui käivitad KDiff3 käsurealt võtmega "--reverse", kasutab kogu rakendus paremalt vasakule paigutust (seda võimaldab Qt). Käesolev käsiraamat on kirjutatud eeldusel, et "Paremalt vasakule keeled" ega võti "reverse" ei ole kasutusel. Sestap tuleb nende kasutamisel mõningaid "vasakul" või "paremal" antud kirjeldusi lugeda lihtsalt selle teadmise valguses vastupidi. </para +>Mõningaid keeli kirjutatakse paremalt vasakule. Selle valiku sisselülitamisel näitab KDiff3 võrdluse sisendakendes ja ühendamise väljundaknas teksti paremalt vasakule. Pane tähele, et kui käivitad KDiff3 käsurealt võtmega "--reverse", kasutab kogu rakendus paremalt vasakule paigutust (seda võimaldab TQt). Käesolev käsiraamat on kirjutatud eeldusel, et "Paremalt vasakule keeled" ega võti "reverse" ei ole kasutusel. Sestap tuleb nende kasutamisel mõningaid "vasakul" või "paremal" antud kirjeldusi lugeda lihtsalt selle teadmise valguses vastupidi. </para ></listitem ></varlistentry> diff --git a/doc/html/compilation.html b/doc/html/compilation.html index 7a5e030..b33850d 100644 --- a/doc/html/compilation.html +++ b/doc/html/compilation.html @@ -5,7 +5,7 @@ following in the base directory of the <span class="application">KDiff3</span> d </pre><p> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>kde-dir</code></em></span> specifies the directory containing KDE on your system. If you are not sure, read the README-file for details. -</p><p>If you don't use KDE don't use <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">configure</strong></span></span> but follow the instructions for Qt-only systems in the README file.</p><p>Since <span class="application">KDiff3</span> uses <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">autoconf</strong></span></span> and +</p><p>If you don't use KDE don't use <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">configure</strong></span></span> but follow the instructions for TQt-only systems in the README file.</p><p>Since <span class="application">KDiff3</span> uses <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">autoconf</strong></span></span> and <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">automake</strong></span></span> you should have no trouble compiling it. Should you run into problems please report them to the <span class="acronym">KDE</span> mailing lists.</p></div><div style="background-color: #white; color: black; margin-top: 20px; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="requirements.html">Prev</a></div><div style="position: absolute; right: 20px;"></div><div align="center"><a accesskey="h" href="index.html">Home</a></div></div><div style="background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div class="navLeft">Requirements </div><div class="navRight"> </div><div class="navCenter"><a accesskey="u" href="installation.html">Up</a></div></div><br><br><div class="bannerBottom" style="background-image: url(help:/common/bottom-middle.png); background-repeat: x-repeat; width: 100%; height: 100px; bottom:0px;"><div class="BannerBottomRight"><img src="help:/common/bottom-right.png" style="margin: 0px" alt=""></div><div class="bannerBottomLeft"><img src="help:/common/bottom-left.png" style="margin: 0px;" alt=""></div><div id="comments" style="position:relative; top: 5px; left: 1em; height:85px; width: 50%; color: #cfe1f6"><p>Would you like to make a comment or contribute an update to this page?<br> - Send feedback to the <a href="mailto:kde-docs@kdemail.net" style="background:transparent; color:#cfe1f6; text-decoration: underline;">KDE Docs Team</a></p></div></div></body></html>
\ No newline at end of file + Send feedback to the <a href="mailto:kde-docs@kdemail.net" style="background:transparent; color:#cfe1f6; text-decoration: underline;">KDE Docs Team</a></p></div></div></body></html> diff --git a/doc/html/options.html b/doc/html/options.html index 474af7f..686ac21 100644 --- a/doc/html/options.html +++ b/doc/html/options.html @@ -106,7 +106,7 @@ Yet there is one option here that is also relevant for saving single files: </p></dd><dt><span class="term"><span class="emphasis"><em>File Encoding for A/B/C:</em></span></span></dt><dd><p> Adjust the file encoding for input files. This has an effect on how the special characters are interpreted. Since you can adjust each codec separately you can even compare and merge files that were saved using different codecs. </p></dd><dt><span class="term"><span class="emphasis"><em>File Encoding for Merge Output and Saving:</em></span></span></dt><dd><p> When you have edited a file, then you can adjust which encoding will be used when saving to disk. </p></dd><dt><span class="term"><span class="emphasis"><em>File Encoding for Preprocessor Files:</em></span></span></dt><dd><p>When you define preprocessors then they might not be able to operate on your codec. (e.g.: Your files are 16-bit-unicode and your preprocessor can only take 8-bit-ascii.) With this option you can define the encoding of preprocessor output. - </p></dd><dt><span class="term"><span class="emphasis"><em>Right To Left Language:</em></span></span></dt><dd><p>Some languages are written right to left. When this option is enabled, <span class="application">KDiff3</span> draws the text from right to left in the diff input windows and in the merge output window. Note that if you start <span class="application">KDiff3</span> with the command line option "--reverse" then all layouting will be done right to left too. (This is a feature provided by Qt.) This documentation was written assuming that "Right To Left Language" or reverse layout are disabled. So some references to "left" or "right" must be replaced by their respective counterpart if you use these options. + </p></dd><dt><span class="term"><span class="emphasis"><em>Right To Left Language:</em></span></span></dt><dd><p>Some languages are written right to left. When this option is enabled, <span class="application">KDiff3</span> draws the text from right to left in the diff input windows and in the merge output window. Note that if you start <span class="application">KDiff3</span> with the command line option "--reverse" then all layouting will be done right to left too. (This is a feature provided by TQt.) This documentation was written assuming that "Right To Left Language" or reverse layout are disabled. So some references to "left" or "right" must be replaced by their respective counterpart if you use these options. </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2567171"></a>Miscellaneous</h3></div></div></div><p>(These options and actions are available in menus or the buttonbar.)</p><div class="variablelist"><dl><dt><span class="term"><span class="emphasis"><em>Show line numbers:</em></span></span></dt><dd><p> You can select if line numbers should be shown for the input files.</p></dd><dt><span class="term"><span class="emphasis"><em>Show space and tabulator characters for differences:</em></span></span></dt><dd><p> Sometimes the visible spaces and tabs are disturbing. You can turn this off.</p></dd><dt><span class="term"><span class="emphasis"><em>Show white space:</em></span></span></dt><dd><p> Turn this off to suppress @@ -135,4 +135,4 @@ Yet there is one option here that is also relevant for saving single files: Currently only the KDE-version supports user-configurable keyboard-shortcuts. (Menu Settings->Configure Shortcuts...) </p></div></div><div style="background-color: #white; color: black; margin-top: 20px; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="printing.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="preprocessors.html">Next</a></div><div align="center"><a accesskey="h" href="index.html">Home</a></div></div><div style="background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div class="navLeft">Printing </div><div class="navRight"> Preprocessor Commands</div><div class="navCenter"><a accesskey="u" href="documentation.html">Up</a></div></div><br><br><div class="bannerBottom" style="background-image: url(help:/common/bottom-middle.png); background-repeat: x-repeat; width: 100%; height: 100px; bottom:0px;"><div class="BannerBottomRight"><img src="help:/common/bottom-right.png" style="margin: 0px" alt=""></div><div class="bannerBottomLeft"><img src="help:/common/bottom-left.png" style="margin: 0px;" alt=""></div><div id="comments" style="position:relative; top: 5px; left: 1em; height:85px; width: 50%; color: #cfe1f6"><p>Would you like to make a comment or contribute an update to this page?<br> - Send feedback to the <a href="mailto:kde-docs@kdemail.net" style="background:transparent; color:#cfe1f6; text-decoration: underline;">KDE Docs Team</a></p></div></div></body></html>
\ No newline at end of file + Send feedback to the <a href="mailto:kde-docs@kdemail.net" style="background:transparent; color:#cfe1f6; text-decoration: underline;">KDE Docs Team</a></p></div></div></body></html> diff --git a/doc/it/index.docbook b/doc/it/index.docbook index 45bd922..0733d77 100644 --- a/doc/it/index.docbook +++ b/doc/it/index.docbook @@ -1052,7 +1052,7 @@ Opzioni: ></term ><listitem ><para ->Alcune lingue sono scritte sa destra a sinistra. Quando questa opzione è attivata KDiff3 scrive i testi da destra a sinistra nelle finestre per il confronto e per la fusione. Nota che se avvii KDiff3 da riga di comando con l'opzione "--reverse", anche tutta l'interfaccia grafica sarà scritta da destra a sinistra. Questa è una potenzialità fornita da Qt. Questa documentazione è stata scritta pensando che l'opzione "Lingue scritte da destra a sinistra" e l'aspetto grafico "reverse" non siano attivati. Altrimenti alcuni riferimenti a "destra" e "sinistra" dovranno essere scambiati per utilizzare correttamente queste opzioni. </para +>Alcune lingue sono scritte sa destra a sinistra. Quando questa opzione è attivata KDiff3 scrive i testi da destra a sinistra nelle finestre per il confronto e per la fusione. Nota che se avvii KDiff3 da riga di comando con l'opzione "--reverse", anche tutta l'interfaccia grafica sarà scritta da destra a sinistra. Questa è una potenzialità fornita da TQt. Questa documentazione è stata scritta pensando che l'opzione "Lingue scritte da destra a sinistra" e l'aspetto grafico "reverse" non siano attivati. Altrimenti alcuni riferimenti a "destra" e "sinistra" dovranno essere scambiati per utilizzare correttamente queste opzioni. </para ></listitem ></varlistentry> diff --git a/doc/nl/index.docbook b/doc/nl/index.docbook index bdd5eff..80f1946 100644 --- a/doc/nl/index.docbook +++ b/doc/nl/index.docbook @@ -1024,7 +1024,7 @@ Opties: ></term ><listitem ><para ->Sommige talen worden van rechts naar links geschreven. Als ieze optie is ingeschakeld, tekent KDiff3 de tekst van rechs naar links in de verschillenvensters en in het uitvoervenster. Merk op dat, aals u KDiff3 met de opdrachtregeloptie "--reverse" start, alle schermopmaak ook van rechts naar links gedaan wordt. (Dit is een optie die door Qt aangeboden wordt.) Deze documentatie is geschreven met de aanname dat "Rechts-naar-links-taal" of omgekeerde indeling uitgeschakeld zijn. Sommige verwijzingen naar "links" en "rechts" moeten dus omgedraaid worden als u die opties gebruikt. </para +>Sommige talen worden van rechts naar links geschreven. Als ieze optie is ingeschakeld, tekent KDiff3 de tekst van rechs naar links in de verschillenvensters en in het uitvoervenster. Merk op dat, aals u KDiff3 met de opdrachtregeloptie "--reverse" start, alle schermopmaak ook van rechts naar links gedaan wordt. (Dit is een optie die door TQt aangeboden wordt.) Deze documentatie is geschreven met de aanname dat "Rechts-naar-links-taal" of omgekeerde indeling uitgeschakeld zijn. Sommige verwijzingen naar "links" en "rechts" moeten dus omgedraaid worden als u die opties gebruikt. </para ></listitem ></varlistentry> diff --git a/doc/pt/index.docbook b/doc/pt/index.docbook index bf2da08..f224285 100644 --- a/doc/pt/index.docbook +++ b/doc/pt/index.docbook @@ -1428,7 +1428,7 @@ Opções: ></term ><listitem ><para ->Algumas línguas são escritas da direita para a esquerda. Quando esta opção está activa, o &kdiff3; desenha o texto da direita para a esquerda nas janelas de diferenças dos ficheiros de entrada e na janela do resultado da junção. Repare que, se iniciar o &kdiff3; com a opção da linha de comandos "--reverse", então toda a disposição será feita também da direita para a esquerda. (Esta é uma funcionalidade oferecida pelo Qt.) Esta documentação foi escrita a assumir que a "Língua da direita-para-a-esquerda" ou a disposição inversa estão desactivadas. Por isso, algumas das referências a "esquerda" ou "direita" deverão ser substituídas pela versão inversa, se usar estas opções. </para +>Algumas línguas são escritas da direita para a esquerda. Quando esta opção está activa, o &kdiff3; desenha o texto da direita para a esquerda nas janelas de diferenças dos ficheiros de entrada e na janela do resultado da junção. Repare que, se iniciar o &kdiff3; com a opção da linha de comandos "--reverse", então toda a disposição será feita também da direita para a esquerda. (Esta é uma funcionalidade oferecida pelo TQt.) Esta documentação foi escrita a assumir que a "Língua da direita-para-a-esquerda" ou a disposição inversa estão desactivadas. Por isso, algumas das referências a "esquerda" ou "direita" deverão ser substituídas pela versão inversa, se usar estas opções. </para ></listitem ></varlistentry> @@ -2947,7 +2947,7 @@ Opções: <para >Se não usar o KDE, não use o <command >configure</command ->, mas siga sim as instruções dos sistemas apenas em Qt, no ficheiro README.</para> +>, mas siga sim as instruções dos sistemas apenas em TQt, no ficheiro README.</para> <para >Dado que o &kdiff3; usa o <command >autoconf</command diff --git a/doc/sv/index.docbook b/doc/sv/index.docbook index 4f9823d..ea3ffed 100644 --- a/doc/sv/index.docbook +++ b/doc/sv/index.docbook @@ -1415,7 +1415,7 @@ Please at least include KDE, the KDE package it is in, the name ></term ><listitem ><para ->Vissa språk skrivs från höger till vänster. När alternativet är aktiverat, ritar &kdiff3; text från höger till vänster i jämförelsefönstren och i sammanfogningsfönstret. Observera att om du startar &kdiff3; med kommandoradsväljaren "--reverse" så visas all layout också från höger till vänster. (Det är en funktion som Qt tillhandahåller.) Denna dokumentation är skriven med antagandet att "Språk som läses från höger till vänster" eller omvänd layout inte är aktiverade. Vissa referenser till "vänster" eller "höger" måste ersättas av motsatsen om du använder alternativen. </para +>Vissa språk skrivs från höger till vänster. När alternativet är aktiverat, ritar &kdiff3; text från höger till vänster i jämförelsefönstren och i sammanfogningsfönstret. Observera att om du startar &kdiff3; med kommandoradsväljaren "--reverse" så visas all layout också från höger till vänster. (Det är en funktion som TQt tillhandahåller.) Denna dokumentation är skriven med antagandet att "Språk som läses från höger till vänster" eller omvänd layout inte är aktiverade. Vissa referenser till "vänster" eller "höger" måste ersättas av motsatsen om du använder alternativen. </para ></listitem ></varlistentry> @@ -2910,7 +2910,7 @@ Please at least include KDE, the KDE package it is in, the name <para >Om du inte använder KDE, använd inte <command >configure</command -> utan följ instruktionerna för system som bara använder Qt i filen README.</para> +> utan följ instruktionerna för system som bara använder TQt i filen README.</para> <para >Eftersom &kdiff3; använder <command >autoconf</command diff --git a/kdiff3.tdevelop b/kdiff3.tdevelop deleted file mode 100644 index 5fc04a9..0000000 --- a/kdiff3.tdevelop +++ /dev/null @@ -1,191 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>Joachim Eibl</author> - <email>joachim dot eibl at gmx dot de</email> - <version>0.9.92</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>C++</keyword> - <keyword>Code</keyword> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <ignoreparts/> - <secondaryLanguages/> - </general> - <kdevautoproject> - <general> - <activetarget>src/kdiff3</activetarget> - <useconfiguration>debug</useconfiguration> - </general> - <run> - <mainprogram>/daten/home/joachim/kdiff3-0.9.92a/debug/src/kdiff3</mainprogram> - <directoryradio>custom</directoryradio> - <customdirectory>/daten/home/joachim/kdiff3_testdir/</customdirectory> - <programargs/> - <terminal>true</terminal> - <autocompile>true</autocompile> - <envvars> - <envvar value="/home/joachim/kdiff3-0.9.92a/debug/src/.libs/libkdiff3part.so" name="LD_PRELOAD" /> - </envvars> - </run> - <configurations> - <optimized> - <builddir>optimized</builddir> - <ccompiler>GccOptions</ccompiler> - <cxxcompiler>GppOptions</cxxcompiler> - <f77compiler>G77Options</f77compiler> - <cxxflags>-O2 -g0</cxxflags> - </optimized> - <debug> - <configargs>--enable-debug=full --prefix=/opt/trinity</configargs> - <builddir>debug</builddir> - <ccompiler>kdevgccoptions</ccompiler> - <cxxcompiler>kdevgppoptions</cxxcompiler> - <f77compiler>kdevpgf77options</f77compiler> - <cxxflags>-O0</cxxflags> - <topsourcedir/> - <cppflags/> - <ldflags/> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags/> - <f77flags/> - <envvars/> - </debug> - </configurations> - <make> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - <abortonerror>true</abortonerror> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin/> - <prio>0</prio> - <runmultiplejobs>false</runmultiplejobs> - </make> - </kdevautoproject> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidepatterns></hidepatterns> - <hidenonprojectfiles>false</hidenonprojectfiles> - <showvcsfields>true</showvcsfields> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>gtk</toc> - <toc>gnustep</toc> - <toc>python</toc> - <toc>php</toc> - <toc>perl</toc> - </ignoretocs> - <projectdoc> - <userdocDir>doc/en/</userdocDir> - <apidocDir>debug/</apidocDir> - </projectdoc> - <ignoreqt_xml/> - <ignoredoxygen/> - <ignorekdocs/> - <ignoredevhelp/> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs/> - <gdbpath/> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</outputradix> - </display> - </kdevdebugger> - <kdevfilecreate> - <filetypes/> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevcvs> - <cvsoptions>-f</cvsoptions> - <commitoptions/> - <addoptions/> - <logoptions/> - <updateoptions>-dP</updateoptions> - <removeoptions>-f</removeoptions> - <revertoptions>-C -d -P</revertoptions> - <diffoptions>-u3 -p</diffoptions> - <rshoptions/> - </kdevcvs> - <kdevcppsupport> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - <references/> - <creategettersetter> - <prefixGet/> - <prefixSet>set</prefixSet> - <prefixVariable>m_,_</prefixVariable> - <parameterName>theValue</parameterName> - <inlineGet>true</inlineGet> - <inlineSet>true</inlineSet> - </creategettersetter> - <qt> - <used>true</used> - <version>3</version> - <root>/usr/lib/qt3</root> - </qt> - </kdevcppsupport> - <cppsupportpart> - <filetemplates> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - </filetemplates> - </cppsupportpart> - <kdevdocumentation> - <projectdoc> - <docsystem/> - <docurl/> - <usermanualurl/> - </projectdoc> - </kdevdocumentation> - <ctagspart> - <customArguments/> - <customTagfilePath/> - </ctagspart> -</tdevelop> diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp index a344091..cc7ff36 100644 --- a/kdiff3plugin/kdiff3plugin.cpp +++ b/kdiff3plugin/kdiff3plugin.cpp @@ -102,21 +102,21 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T { int historyCount = s_pHistory ? s_pHistory->count() : 0; s = i18n("Compare with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() ); - pAction = new TDEAction ( s,0, this, TQT_SLOT(slotCompareWith()), actionCollection()); + pAction = new TDEAction ( s,0, this, TQ_SLOT(slotCompareWith()), actionCollection()); pAction->setEnabled( m_list.count()>0 && historyCount>0 ); pActionMenu->insert (pAction); s = i18n("Merge with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() ); - pAction = new TDEAction( s, 0, this, TQT_SLOT(slotMergeWith()), actionCollection()); + pAction = new TDEAction( s, 0, this, TQ_SLOT(slotMergeWith()), actionCollection()); pAction->setEnabled( m_list.count()>0 && historyCount>0 ); pActionMenu->insert (pAction); s = i18n("Save '%1' for later").arg( ( m_list.front() ) ); - pAction = new TDEAction ( s, 0, this, TQT_SLOT(slotSaveForLater()), actionCollection()); + pAction = new TDEAction ( s, 0, this, TQ_SLOT(slotSaveForLater()), actionCollection()); pAction->setEnabled( m_list.count()>0 ); pActionMenu->insert(pAction); - pAction = new TDEAction (i18n("3-way merge with base"), 0, this, TQT_SLOT(slotMergeThreeWay()), actionCollection()); + pAction = new TDEAction (i18n("3-way merge with base"), 0, this, TQ_SLOT(slotMergeThreeWay()), actionCollection()); pAction->setEnabled( m_list.count()>0 && historyCount>=2 ); pActionMenu->insert (pAction); @@ -127,26 +127,26 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T pActionMenu->insert(pHistoryMenu); for (TQStringList::iterator i = s_pHistory->begin(); i!=s_pHistory->end(); ++i) { - pAction = new TDEAction( *i, "History", 0, this, TQT_SLOT(slotCompareWithHistoryItem()), actionCollection()); + pAction = new TDEAction( *i, "History", 0, this, TQ_SLOT(slotCompareWithHistoryItem()), actionCollection()); pHistoryMenu->insert (pAction); } - pAction = new TDEAction (i18n("Clear list"), 0, this, TQT_SLOT(slotClearList()), actionCollection()); + pAction = new TDEAction (i18n("Clear list"), 0, this, TQ_SLOT(slotClearList()), actionCollection()); pActionMenu->insert (pAction); pAction->setEnabled( historyCount>0 ); } } else if(m_list.count() == 2) { - pAction = new TDEAction (i18n("Compare"), 0, this, TQT_SLOT(slotCompareTwoFiles()), actionCollection()); + pAction = new TDEAction (i18n("Compare"), 0, this, TQ_SLOT(slotCompareTwoFiles()), actionCollection()); pActionMenu->insert (pAction); } else if ( m_list.count() == 3 ) { - pAction = new TDEAction (i18n("3 way comparison"), 0, this, TQT_SLOT(slotCompareThreeFiles()), actionCollection()); + pAction = new TDEAction (i18n("3 way comparison"), 0, this, TQ_SLOT(slotCompareThreeFiles()), actionCollection()); pActionMenu->insert (pAction); } - pAction = new TDEAction (i18n("About KDiff3 menu plugin ..."), 0, this, TQT_SLOT(slotAbout()), actionCollection()); + pAction = new TDEAction (i18n("About KDiff3 menu plugin ..."), 0, this, TQ_SLOT(slotAbout()), actionCollection()); pActionMenu->insert (pAction); addSeparator(); diff --git a/kdiff3plugin/kdiff3plugin.h b/kdiff3plugin/kdiff3plugin.h index 352d1ff..0210b59 100644 --- a/kdiff3plugin/kdiff3plugin.h +++ b/kdiff3plugin/kdiff3plugin.h @@ -27,7 +27,7 @@ class TQStringList; class KDiff3Plugin : public KonqPopupMenuPlugin { - Q_OBJECT + TQ_OBJECT public: KDiff3Plugin (KonqPopupMenu *, const char *name, const TQStringList & list); diff --git a/src/diff.cpp b/src/diff.cpp index 9475095..fba2c1a 100644 --- a/src/diff.cpp +++ b/src/diff.cpp @@ -241,7 +241,8 @@ void SourceData::setData( const TQString& data ) } FileAccess f( m_tempInputFileName ); - bool bSuccess = f.writeFile( TQTextCodec::codecForName("UTF-8")->fromUnicode(data), data.length() ); + TQCString cData = TQTextCodec::codecForName("UTF-8")->fromUnicode(data); + bool bSuccess = f.writeFile( cData, cData.length() ); if ( !bSuccess ) { KMessageBox::error( m_pOptionDialog, i18n("Writing clipboard data to temp file failed.") ); @@ -361,7 +362,6 @@ static bool convertFileEncoding( const TQString& fileNameIn, TQTextCodec* pCodec return false; TQTextStream inStream( &in ); inStream.setCodec( pCodecIn ); - //inStream.setAutoDetectUnicode( false ); //not available in TQt3, will always detect UCS2 TQFile out( fileNameOut ); if ( ! out.open( IO_WriteOnly ) ) @@ -379,7 +379,7 @@ static TQTextCodec* detectEncoding( const char* buf, long size, long& skipBytes { if (size>=2) { - skipBytes = 0; // In TQt3 UTF-16LE can only be used if autodetected. + skipBytes = 0; if (buf[0]=='\xFF' && buf[1]=='\xFE' ) return TQTextCodec::codecForName( "ISO-10646-UCS2" );// "UTF-16LE" @@ -376,7 +376,7 @@ class MyPainter : public TQPainter int m_fontWidth; public: MyPainter(const TQPaintDevice* pd, bool bRTL, int width, int fontWidth) - : TQPainter(const_cast<TQPaintDevice*>(TQT_TQPAINTDEVICE_CONST(pd))) + : TQPainter(pd) { if (bRTL) { diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp index ae18a59..a7c18ae 100644 --- a/src/difftextwindow.cpp +++ b/src/difftextwindow.cpp @@ -142,7 +142,7 @@ DiffTextWindow::DiffTextWindow( { d = new DiffTextWindowData(this); d->m_pDiffTextWindowFrame = pParent; - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); setAcceptDrops( true ); d->m_pOptionDialog = pOptionDialog; @@ -398,7 +398,7 @@ void DiffTextWindow::focusInEvent(TQFocusEvent* e) void DiffTextWindow::mousePressEvent ( TQMouseEvent* e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { int line; int pos; @@ -458,7 +458,7 @@ void DiffTextWindow::mouseDoubleClickEvent( TQMouseEvent* e ) { d->m_bSelectionInProgress = false; d->m_lastKnownMousePos = e->pos(); - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { int line; int pos; @@ -847,8 +847,7 @@ void DiffTextWindowData::writeLine( if ( m_pOptionDialog->m_bShowWhiteSpaceCharacters && m_pOptionDialog->m_bShowWhiteSpace) { p.fillRect( xOffset + fontWidth*outPos, yOffset+fontAscent, - fontWidth*spaces-1, fontDescent, c ); // QT3 - //fontWidth*spaces-1, fontDescent, c ); // QT4 + fontWidth*spaces-1, fontDescent, c ); } } else @@ -952,13 +951,13 @@ void DiffTextWindow::paintEvent( TQPaintEvent* e ) int endLine = min2( d->m_firstLine + getNofVisibleLines()+2, getNofLines() ); //if ( invalidRect.size()==size() ) - { // double buffering, obsolete with TQt4 - TQPainter painter(this); // Remove for TQt4 - TQPixmap pixmap( invalidRect.size() );// Remove for TQt4 + { + TQPainter painter(this); + TQPixmap pixmap( invalidRect.size() ); - MyPainter p( TQT_TQPAINTDEVICE(&pixmap), d->m_pOptionDialog->m_bRightToLeftLanguage, width(), fontMetrics().width('W') ); // For TQt4 change pixmap to this + MyPainter p( &pixmap, d->m_pOptionDialog->m_bRightToLeftLanguage, width(), fontMetrics().width('W') ); - p.translate( -invalidRect.x(), -invalidRect.y() );// Remove for TQt4 + p.translate( -invalidRect.x(), -invalidRect.y() ); p.setFont( font() ); p.TQPainter::fillRect( invalidRect, d->m_pOptionDialog->m_bgColor ); @@ -967,7 +966,7 @@ void DiffTextWindow::paintEvent( TQPaintEvent* e ) // p.drawLine( m_invalidRect.x(), m_invalidRect.y(), m_invalidRect.right(), m_invalidRect.bottom() ); // For test only p.end(); - painter.drawPixmap( invalidRect.x(), invalidRect.y(), pixmap );// Remove for TQt4 + painter.drawPixmap( invalidRect.x(), invalidRect.y(), pixmap ); } // else // { // no double buffering @@ -1578,8 +1577,8 @@ DiffTextWindowFrame::DiffTextWindowFrame( TQWidget* pParent, TQStatusBar* pStatu d->m_pFileSelection = new TQLineEdit(d->m_pTopLineWidget); d->m_pBrowseButton = new TQPushButton( "...",d->m_pTopLineWidget ); d->m_pBrowseButton->setFixedWidth( 30 ); - connect(d->m_pBrowseButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBrowseButtonClicked())); - connect(d->m_pFileSelection,TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed())); + connect(d->m_pBrowseButton,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBrowseButtonClicked())); + connect(d->m_pFileSelection,TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotReturnPressed())); d->m_pLabel = new TQLabel("A:",d->m_pTopLineWidget); d->m_pTopLine = new TQLabel(d->m_pTopLineWidget); @@ -1685,7 +1684,7 @@ bool DiffTextWindowFrame::eventFilter( TQObject* o, TQEvent* e ) d->m_pLabel->setPalette( p ); d->m_pTopLine->setPalette( p ); } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->m_pFileSelection) && e->type()==TQEvent::Drop) + if (o == d->m_pFileSelection && e->type()==TQEvent::Drop) { TQDropEvent* d = static_cast<TQDropEvent*>(e); @@ -1696,8 +1695,8 @@ bool DiffTextWindowFrame::eventFilter( TQObject* o, TQEvent* e ) if ( lst.count() > 0 ) { - static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setText( lst[0] ); - static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setFocus(); + static_cast<TQLineEdit*>(o)->setText( lst[0] ); + static_cast<TQLineEdit*>(o)->setFocus(); emit fileNameChanged( lst[0], pDTW->d->m_winIdx ); return true; } diff --git a/src/difftextwindow.h b/src/difftextwindow.h index f5f5d01..f63aa99 100644 --- a/src/difftextwindow.h +++ b/src/difftextwindow.h @@ -29,7 +29,7 @@ class DiffTextWindowFrame; class DiffTextWindow : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DiffTextWindow( @@ -113,7 +113,7 @@ class DiffTextWindowFrameData; class DiffTextWindowFrame : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DiffTextWindowFrame( TQWidget* pParent, TQStatusBar* pStatusBar, OptionDialog* pOptionDialog, int winIdx ); diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp index 57f05aa..b533c59 100644 --- a/src/directorymergewindow.cpp +++ b/src/directorymergewindow.cpp @@ -217,11 +217,7 @@ void DirectoryMergeWindow::fastFileComparison( } pp.setInformation( i18n("Comparing file..."), 0, false ); -#ifdef USE_QT4 - typedef qint64 t_FileSize; -#else // USE_QT4 typedef TQFile::Offset t_FileSize; -#endif // USE_QT4 t_FileSize fullSize = file1.size(); t_FileSize sizeLeft = fullSize; @@ -271,13 +267,13 @@ static int s_WhiteCol = 9; // Nr of white deltas (for 2 input files) DirectoryMergeWindow::DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOptions, TDEIconLoader* pIconLoader ) : TQListView( pParent ) { - connect( TQT_TQOBJECT(this), TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(onDoubleClick(TQListViewItem*))); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(onDoubleClick(TQListViewItem*))); - connect( TQT_TQOBJECT(this), TQT_SIGNAL( mouseButtonPressed(int,TQListViewItem*,const TQPoint&, int)), - TQT_TQOBJECT(this), TQT_SLOT( onClick(int,TQListViewItem*,const TQPoint&, int)) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint &,int)), - TQT_TQOBJECT(this), TQT_SLOT( slotShowContextMenu(TQListViewItem*,const TQPoint &,int))); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(onSelectionChanged(TQListViewItem*))); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(onDoubleClick(TQListViewItem*))); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(onDoubleClick(TQListViewItem*))); + connect( this, TQ_SIGNAL( mouseButtonPressed(int,TQListViewItem*,const TQPoint&, int)), + this, TQ_SLOT( onClick(int,TQListViewItem*,const TQPoint&, int)) ); + connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint &,int)), + this, TQ_SLOT( slotShowContextMenu(TQListViewItem*,const TQPoint &,int))); + connect( this, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(onSelectionChanged(TQListViewItem*))); m_pOptions = pOptions; m_pIconLoader = pIconLoader; m_pDirectoryMergeInfo = 0; @@ -1584,7 +1580,7 @@ void DirectoryMergeWindow::onClick( int button, TQListViewItem* lvi, const TQPoi if (!itemPath.isEmpty()) { - selectItemAndColumn( pDMI, c, button==Qt::RightButton ); + selectItemAndColumn( pDMI, c, button==TQt::RightButton ); } } } @@ -2688,7 +2684,7 @@ DirectoryMergeInfo::DirectoryMergeInfo( TQWidget* pParent ) bool DirectoryMergeInfo::eventFilter(TQObject*o, TQEvent* e) { - if ( e->type()==TQEvent::FocusIn && TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(m_pInfoList) ) + if ( e->type()==TQEvent::FocusIn && o==m_pInfoList ) emit gotFocus(); return false; } @@ -2921,51 +2917,51 @@ void DirectoryMergeWindow::initDirectoryMergeActions( TQObject* pKDiff3App, TDEA #include "xpm/showfilesonlyinc.xpm" DirectoryMergeWindow* p = this; - m_pDirStartOperation = new TDEAction(i18n("Start/Continue Directory Merge"), TQt::Key_F7, TQT_TQOBJECT(p), TQT_SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation"); - m_pDirRunOperationForCurrentItem = new TDEAction(i18n("Run Operation for Current Item"), TQt::Key_F6, TQT_TQOBJECT(p), TQT_SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item"); - m_pDirCompareCurrent = new TDEAction(i18n("Compare Selected File"), 0, TQT_TQOBJECT(p), TQT_SLOT(compareCurrentFile()), ac, "dir_compare_current"); - m_pDirMergeCurrent = new TDEAction(i18n("Merge Current File"), TQIconSet(TQPixmap(startmerge)), 0, TQT_TQOBJECT(pKDiff3App), TQT_SLOT(slotMergeCurrentFile()), ac, "merge_current"); - m_pDirFoldAll = new TDEAction(i18n("Fold All Subdirs"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotFoldAllSubdirs()), ac, "dir_fold_all"); - m_pDirUnfoldAll = new TDEAction(i18n("Unfold All Subdirs"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotUnfoldAllSubdirs()), ac, "dir_unfold_all"); - m_pDirRescan = new TDEAction(i18n("Rescan"), TQt::SHIFT+TQt::Key_F5, TQT_TQOBJECT(p), TQT_SLOT(reload()), ac, "dir_rescan"); - m_pDirSaveMergeState = 0; //new TDEAction(i18n("Save Directory Merge State ..."), 0, TQT_TQOBJECT(p), TQT_SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); - m_pDirLoadMergeState = 0; //new TDEAction(i18n("Load Directory Merge State ..."), 0, TQT_TQOBJECT(p), TQT_SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); - m_pDirChooseAEverywhere = new TDEAction(i18n("Choose A for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere"); - m_pDirChooseBEverywhere = new TDEAction(i18n("Choose B for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere"); - m_pDirChooseCEverywhere = new TDEAction(i18n("Choose C for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere"); - m_pDirAutoChoiceEverywhere = new TDEAction(i18n("Auto-Choose Operation for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere"); - m_pDirDoNothingEverywhere = new TDEAction(i18n("No Operation for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere"); - -// m_pDirSynchronizeDirectories = new TDEToggleAction(i18n("Synchronize Directories"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); -// m_pDirChooseNewerFiles = new TDEToggleAction(i18n("Copy Newer Files Instead of Merging"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); - - m_pDirShowIdenticalFiles = new TDEToggleAction(i18n("Show Identical Files"), TQIconSet(TQPixmap(showequalfiles)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowIdenticalFiles()), ac, "dir_show_identical_files"); - m_pDirShowDifferentFiles = new TDEToggleAction(i18n("Show Different Files"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowDifferentFiles()), ac, "dir_show_different_files"); - m_pDirShowFilesOnlyInA = new TDEToggleAction(i18n("Show Files only in A"), TQIconSet(TQPixmap(showfilesonlyina)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowFilesOnlyInA()), ac, "dir_show_files_only_in_a"); - m_pDirShowFilesOnlyInB = new TDEToggleAction(i18n("Show Files only in B"), TQIconSet(TQPixmap(showfilesonlyinb)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowFilesOnlyInB()), ac, "dir_show_files_only_in_b"); - m_pDirShowFilesOnlyInC = new TDEToggleAction(i18n("Show Files only in C"), TQIconSet(TQPixmap(showfilesonlyinc)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowFilesOnlyInC()), ac, "dir_show_files_only_in_c"); + m_pDirStartOperation = new TDEAction(i18n("Start/Continue Directory Merge"), TQt::Key_F7, p, TQ_SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation"); + m_pDirRunOperationForCurrentItem = new TDEAction(i18n("Run Operation for Current Item"), TQt::Key_F6, p, TQ_SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item"); + m_pDirCompareCurrent = new TDEAction(i18n("Compare Selected File"), 0, p, TQ_SLOT(compareCurrentFile()), ac, "dir_compare_current"); + m_pDirMergeCurrent = new TDEAction(i18n("Merge Current File"), TQIconSet(TQPixmap(startmerge)), 0, pKDiff3App, TQ_SLOT(slotMergeCurrentFile()), ac, "merge_current"); + m_pDirFoldAll = new TDEAction(i18n("Fold All Subdirs"), 0, p, TQ_SLOT(slotFoldAllSubdirs()), ac, "dir_fold_all"); + m_pDirUnfoldAll = new TDEAction(i18n("Unfold All Subdirs"), 0, p, TQ_SLOT(slotUnfoldAllSubdirs()), ac, "dir_unfold_all"); + m_pDirRescan = new TDEAction(i18n("Rescan"), TQt::SHIFT+TQt::Key_F5, p, TQ_SLOT(reload()), ac, "dir_rescan"); + m_pDirSaveMergeState = 0; //new TDEAction(i18n("Save Directory Merge State ..."), 0, p, TQ_SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); + m_pDirLoadMergeState = 0; //new TDEAction(i18n("Load Directory Merge State ..."), 0, p, TQ_SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); + m_pDirChooseAEverywhere = new TDEAction(i18n("Choose A for All Items"), 0, p, TQ_SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere"); + m_pDirChooseBEverywhere = new TDEAction(i18n("Choose B for All Items"), 0, p, TQ_SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere"); + m_pDirChooseCEverywhere = new TDEAction(i18n("Choose C for All Items"), 0, p, TQ_SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere"); + m_pDirAutoChoiceEverywhere = new TDEAction(i18n("Auto-Choose Operation for All Items"), 0, p, TQ_SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere"); + m_pDirDoNothingEverywhere = new TDEAction(i18n("No Operation for All Items"), 0, p, TQ_SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere"); + +// m_pDirSynchronizeDirectories = new TDEToggleAction(i18n("Synchronize Directories"), 0, this, TQ_SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); +// m_pDirChooseNewerFiles = new TDEToggleAction(i18n("Copy Newer Files Instead of Merging"), 0, this, TQ_SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); + + m_pDirShowIdenticalFiles = new TDEToggleAction(i18n("Show Identical Files"), TQIconSet(TQPixmap(showequalfiles)), 0, this, TQ_SLOT(slotShowIdenticalFiles()), ac, "dir_show_identical_files"); + m_pDirShowDifferentFiles = new TDEToggleAction(i18n("Show Different Files"), 0, this, TQ_SLOT(slotShowDifferentFiles()), ac, "dir_show_different_files"); + m_pDirShowFilesOnlyInA = new TDEToggleAction(i18n("Show Files only in A"), TQIconSet(TQPixmap(showfilesonlyina)), 0, this, TQ_SLOT(slotShowFilesOnlyInA()), ac, "dir_show_files_only_in_a"); + m_pDirShowFilesOnlyInB = new TDEToggleAction(i18n("Show Files only in B"), TQIconSet(TQPixmap(showfilesonlyinb)), 0, this, TQ_SLOT(slotShowFilesOnlyInB()), ac, "dir_show_files_only_in_b"); + m_pDirShowFilesOnlyInC = new TDEToggleAction(i18n("Show Files only in C"), TQIconSet(TQPixmap(showfilesonlyinc)), 0, this, TQ_SLOT(slotShowFilesOnlyInC()), ac, "dir_show_files_only_in_c"); m_pDirShowIdenticalFiles->setChecked( m_pOptions->m_bDmShowIdenticalFiles ); - m_pDirCompareExplicit = new TDEAction(i18n("Compare Explicitly Selected Files"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCompareExplicitlySelectedFiles()), ac, "dir_compare_explicitly_selected_files"); - m_pDirMergeExplicit = new TDEAction(i18n("Merge Explicitly Selected Files"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotMergeExplicitlySelectedFiles()), ac, "dir_merge_explicitly_selected_files"); - - m_pDirCurrentDoNothing = new TDEAction(i18n("Do Nothing"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing"); - m_pDirCurrentChooseA = new TDEAction(i18n("A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a"); - m_pDirCurrentChooseB = new TDEAction(i18n("B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b"); - m_pDirCurrentChooseC = new TDEAction(i18n("C"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c"); - m_pDirCurrentMerge = new TDEAction(i18n("Merge"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMerge()), ac, "dir_current_merge"); - m_pDirCurrentDelete = new TDEAction(i18n("Delete (if exists)"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDelete()), ac, "dir_current_delete"); - - m_pDirCurrentSyncDoNothing = new TDEAction(i18n("Do Nothing"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing"); - m_pDirCurrentSyncCopyAToB = new TDEAction(i18n("Copy A to B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" ); - m_pDirCurrentSyncCopyBToA = new TDEAction(i18n("Copy B to A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" ); - m_pDirCurrentSyncDeleteA = new TDEAction(i18n("Delete A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a"); - m_pDirCurrentSyncDeleteB = new TDEAction(i18n("Delete B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b"); - m_pDirCurrentSyncDeleteAAndB = new TDEAction(i18n("Delete A && B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b"); - m_pDirCurrentSyncMergeToA = new TDEAction(i18n("Merge to A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a"); - m_pDirCurrentSyncMergeToB = new TDEAction(i18n("Merge to B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b"); - m_pDirCurrentSyncMergeToAAndB = new TDEAction(i18n("Merge to A && B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b"); + m_pDirCompareExplicit = new TDEAction(i18n("Compare Explicitly Selected Files"), 0, p, TQ_SLOT(slotCompareExplicitlySelectedFiles()), ac, "dir_compare_explicitly_selected_files"); + m_pDirMergeExplicit = new TDEAction(i18n("Merge Explicitly Selected Files"), 0, p, TQ_SLOT(slotMergeExplicitlySelectedFiles()), ac, "dir_merge_explicitly_selected_files"); + + m_pDirCurrentDoNothing = new TDEAction(i18n("Do Nothing"), 0, p, TQ_SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing"); + m_pDirCurrentChooseA = new TDEAction(i18n("A"), 0, p, TQ_SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a"); + m_pDirCurrentChooseB = new TDEAction(i18n("B"), 0, p, TQ_SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b"); + m_pDirCurrentChooseC = new TDEAction(i18n("C"), 0, p, TQ_SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c"); + m_pDirCurrentMerge = new TDEAction(i18n("Merge"), 0, p, TQ_SLOT(slotCurrentMerge()), ac, "dir_current_merge"); + m_pDirCurrentDelete = new TDEAction(i18n("Delete (if exists)"), 0, p, TQ_SLOT(slotCurrentDelete()), ac, "dir_current_delete"); + + m_pDirCurrentSyncDoNothing = new TDEAction(i18n("Do Nothing"), 0, p, TQ_SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing"); + m_pDirCurrentSyncCopyAToB = new TDEAction(i18n("Copy A to B"), 0, p, TQ_SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" ); + m_pDirCurrentSyncCopyBToA = new TDEAction(i18n("Copy B to A"), 0, p, TQ_SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" ); + m_pDirCurrentSyncDeleteA = new TDEAction(i18n("Delete A"), 0, p, TQ_SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a"); + m_pDirCurrentSyncDeleteB = new TDEAction(i18n("Delete B"), 0, p, TQ_SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b"); + m_pDirCurrentSyncDeleteAAndB = new TDEAction(i18n("Delete A && B"), 0, p, TQ_SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b"); + m_pDirCurrentSyncMergeToA = new TDEAction(i18n("Merge to A"), 0, p, TQ_SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a"); + m_pDirCurrentSyncMergeToB = new TDEAction(i18n("Merge to B"), 0, p, TQ_SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b"); + m_pDirCurrentSyncMergeToAAndB = new TDEAction(i18n("Merge to A && B"), 0, p, TQ_SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b"); } diff --git a/src/directorymergewindow.h b/src/directorymergewindow.h index 05d1217..a342099 100644 --- a/src/directorymergewindow.h +++ b/src/directorymergewindow.h @@ -116,7 +116,7 @@ public: class DirectoryMergeWindow : public TQListView { - Q_OBJECT + TQ_OBJECT public: DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOptions, TDEIconLoader* pIconLoader ); @@ -332,7 +332,7 @@ protected slots: class DirectoryMergeInfo : public TQFrame { - Q_OBJECT + TQ_OBJECT public: DirectoryMergeInfo( TQWidget* pParent ); diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp index 205b75e..4486fe4 100644 --- a/src/fileaccess.cpp +++ b/src/fileaccess.cpp @@ -654,7 +654,7 @@ bool FileAccessJobHandler::stat( int detail, bool bWantToWrite ) m_pFileAccess->m_statusText = TQString(); TDEIO::StatJob* pStatJob = TDEIO::stat( m_pFileAccess->m_url, ! bWantToWrite, detail, false ); - connect( pStatJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotStatResult(TDEIO::Job*))); + connect( pStatJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotStatResult(TDEIO::Job*))); g_pProgressDialog->enterEventLoop( pStatJob, i18n("Getting file status: %1").arg(m_pFileAccess->prettyAbsPath()) ); @@ -695,9 +695,9 @@ bool FileAccessJobHandler::get(void* pDestBuffer, long maxLength ) m_bSuccess = false; m_pFileAccess->m_statusText = TQString(); - connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); - connect( pJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray &)), this, TQT_SLOT(slotGetData(TDEIO::Job*, const TQByteArray&))); - connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long))); + connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*))); + connect( pJob, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray &)), this, TQ_SLOT(slotGetData(TDEIO::Job*, const TQByteArray&))); + connect( pJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long))); g_pProgressDialog->enterEventLoop( pJob, i18n("Reading file: %1").arg(m_pFileAccess->prettyAbsPath()) ); return m_bSuccess; @@ -731,9 +731,9 @@ bool FileAccessJobHandler::put(const void* pSrcBuffer, long maxLength, bool bOve m_bSuccess = false; m_pFileAccess->m_statusText = TQString(); - connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotPutJobResult(TDEIO::Job*))); - connect( pJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), this, TQT_SLOT(slotPutData(TDEIO::Job*, TQByteArray&))); - connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long))); + connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotPutJobResult(TDEIO::Job*))); + connect( pJob, TQ_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), this, TQ_SLOT(slotPutData(TDEIO::Job*, TQByteArray&))); + connect( pJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long))); g_pProgressDialog->enterEventLoop( pJob, i18n("Writing file: %1").arg(m_pFileAccess->prettyAbsPath()) ); return m_bSuccess; @@ -796,7 +796,7 @@ bool FileAccessJobHandler::mkDir( const TQString& dirName ) { m_bSuccess = false; TDEIO::SimpleJob* pJob = TDEIO::mkdir( dirURL ); - connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); + connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*))); g_pProgressDialog->enterEventLoop( pJob, i18n("Making directory: %1").arg(dirName) ); return m_bSuccess; @@ -816,7 +816,7 @@ bool FileAccessJobHandler::rmDir( const TQString& dirName ) { m_bSuccess = false; TDEIO::SimpleJob* pJob = TDEIO::rmdir( dirURL ); - connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); + connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*))); g_pProgressDialog->enterEventLoop(pJob, i18n("Removing directory: %1").arg(dirName)); return m_bSuccess; @@ -831,7 +831,7 @@ bool FileAccessJobHandler::removeFile( const TQString& fileName ) { m_bSuccess = false; TDEIO::SimpleJob* pJob = TDEIO::file_delete( KURL::fromPathOrURL(fileName), false ); - connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); + connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*))); g_pProgressDialog->enterEventLoop( pJob, i18n("Removing file: %1").arg(fileName) ); return m_bSuccess; @@ -846,7 +846,7 @@ bool FileAccessJobHandler::symLink( const TQString& linkTarget, const TQString& { m_bSuccess = false; TDEIO::CopyJob* pJob = TDEIO::link( KURL::fromPathOrURL(linkTarget), KURL::fromPathOrURL(linkLocation), false ); - connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); + connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*))); g_pProgressDialog->enterEventLoop( pJob, i18n("Creating symbolic link: %1 -> %2").arg(linkLocation).arg(linkTarget) ); @@ -875,8 +875,8 @@ bool FileAccessJobHandler::rename( const TQString& dest ) int permissions=-1; m_bSuccess = false; TDEIO::FileCopyJob* pJob = TDEIO::file_move( m_pFileAccess->m_url, kurl, permissions, bOverwrite, bResume, bShowProgress ); - connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); - connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long))); + connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*))); + connect( pJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long))); g_pProgressDialog->enterEventLoop( pJob, i18n("Renaming file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) ); @@ -912,8 +912,8 @@ bool FileAccessJobHandler::copyFile( const TQString& dest ) int permissions = (m_pFileAccess->isExecutable()?0111:0)+(m_pFileAccess->isWritable()?0222:0)+(m_pFileAccess->isReadable()?0444:0); m_bSuccess = false; TDEIO::FileCopyJob* pJob = TDEIO::file_copy ( m_pFileAccess->m_url, destUrl, permissions, bOverwrite, bResume, bShowProgress ); - connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*))); - connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long))); + connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*))); + connect( pJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long))); g_pProgressDialog->enterEventLoop( pJob, i18n("Copying file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) ); @@ -1363,16 +1363,16 @@ bool FileAccessJobHandler::listDir( t_DirectoryList* pDirList, bool bRecursive, m_bSuccess = false; if ( pListJob!=0 ) { - connect( pListJob, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), - this, TQT_SLOT( slotListDirProcessNewEntries( TDEIO::Job *, const TDEIO::UDSEntryList& )) ); - connect( pListJob, TQT_SIGNAL( result( TDEIO::Job* )), - this, TQT_SLOT( slotSimpleJobResult(TDEIO::Job*) ) ); + connect( pListJob, TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), + this, TQ_SLOT( slotListDirProcessNewEntries( TDEIO::Job *, const TDEIO::UDSEntryList& )) ); + connect( pListJob, TQ_SIGNAL( result( TDEIO::Job* )), + this, TQ_SLOT( slotSimpleJobResult(TDEIO::Job*) ) ); - connect( pListJob, TQT_SIGNAL( infoMessage(TDEIO::Job*, const TQString&)), - this, TQT_SLOT( slotListDirInfoMessage(TDEIO::Job*, const TQString&) )); + connect( pListJob, TQ_SIGNAL( infoMessage(TDEIO::Job*, const TQString&)), + this, TQ_SLOT( slotListDirInfoMessage(TDEIO::Job*, const TQString&) )); // This line makes the transfer via fish unreliable.:-( - //connect( pListJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long))); + //connect( pListJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long))); g_pProgressDialog->enterEventLoop( pListJob, i18n("Listing directory: %1").arg(m_pFileAccess->prettyAbsPath()) ); @@ -1506,7 +1506,7 @@ ProgressDialog::ProgressDialog( TQWidget* pParent ) hlayout->addStretch(1); m_pAbortButton = new TQPushButton( i18n("&Cancel"), this); hlayout->addWidget( m_pAbortButton ); - connect( m_pAbortButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAbort()) ); + connect( m_pAbortButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAbort()) ); m_progressDelayTimer = 0; resize( 400, 100 ); @@ -1713,7 +1713,7 @@ void ProgressDialog::hide() killTimer( m_progressDelayTimer ); m_progressDelayTimer = 0; // Calling TQDialog::hide() directly doesn't always work. (?) - TQTimer::singleShot( 100, this, TQT_SLOT(delayedHide()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(delayedHide()) ); } void ProgressDialog::delayedHide() diff --git a/src/fileaccess.h b/src/fileaccess.h index d6afad0..b87c54a 100644 --- a/src/fileaccess.h +++ b/src/fileaccess.h @@ -121,7 +121,7 @@ class t_DirectoryList : public std::list<FileAccess> class FileAccessJobHandler : public TQObject { - Q_OBJECT + TQ_OBJECT public: FileAccessJobHandler( FileAccess* pFileAccess ); @@ -174,7 +174,7 @@ private slots: class ProgressDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: ProgressDialog( TQWidget* pParent ); diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp index 7343e1e..83eb692 100644 --- a/src/kdiff3.cpp +++ b/src/kdiff3.cpp @@ -128,7 +128,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par // All default values must be set before calling readOptions(). m_pOptionDialog = new OptionDialog( m_pKDiff3Shell!=0, this ); - connect( m_pOptionDialog, TQT_SIGNAL(applyClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotRefresh()) ); + connect( m_pOptionDialog, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotRefresh()) ); m_pOptionDialog->readOptions( isPart() ? m_pKDiff3Part->instance()->config() : kapp->config() ); @@ -243,7 +243,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par initStatusBar(); m_pFindDialog = new FindDialog( this ); - connect( m_pFindDialog, TQT_SIGNAL(findNext()), TQT_TQOBJECT(this), TQT_SLOT(slotEditFindNext())); + connect( m_pFindDialog, TQ_SIGNAL(findNext()), this, TQ_SLOT(slotEditFindNext())); autoAdvance->setChecked( m_pOptionDialog->m_bAutoAdvance ); showWhiteSpaceCharacters->setChecked( m_pOptionDialog->m_bShowWhiteSpaceCharacters ); @@ -272,23 +272,23 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par slotRefresh(); m_pMainSplitter = this; //new TQSplitter(this); - m_pMainSplitter->setOrientation(Qt::Vertical ); + m_pMainSplitter->setOrientation(TQt::Vertical ); // setCentralWidget( m_pMainSplitter ); m_pDirectoryMergeSplitter = new TQSplitter( m_pMainSplitter ); - m_pDirectoryMergeSplitter->setOrientation(Qt::Horizontal ); + m_pDirectoryMergeSplitter->setOrientation(TQt::Horizontal ); m_pDirectoryMergeWindow = new DirectoryMergeWindow( m_pDirectoryMergeSplitter, m_pOptionDialog, TDEApplication::kApplication()->iconLoader() ); m_pDirectoryMergeInfo = new DirectoryMergeInfo( m_pDirectoryMergeSplitter ); m_pDirectoryMergeWindow->setDirectoryMergeInfo( m_pDirectoryMergeInfo ); - connect( m_pDirectoryMergeWindow, TQT_SIGNAL(startDiffMerge(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)), - TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen2(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*))); - connect( m_pDirectoryMergeWindow, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateAvailabilities())); - connect( m_pDirectoryMergeWindow, TQT_SIGNAL(currentChanged(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateAvailabilities())); - connect( m_pDirectoryMergeWindow, TQT_SIGNAL(checkIfCanContinue(bool*)), TQT_TQOBJECT(this), TQT_SLOT(slotCheckIfCanContinue(bool*))); - connect( m_pDirectoryMergeWindow, TQT_SIGNAL(updateAvailabilities()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateAvailabilities())); - connect( m_pDirectoryMergeWindow, TQT_SIGNAL(statusBarMessage(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString&))); + connect( m_pDirectoryMergeWindow, TQ_SIGNAL(startDiffMerge(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)), + this, TQ_SLOT( slotFileOpen2(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*))); + connect( m_pDirectoryMergeWindow, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotUpdateAvailabilities())); + connect( m_pDirectoryMergeWindow, TQ_SIGNAL(currentChanged(TQListViewItem*)), this, TQ_SLOT(slotUpdateAvailabilities())); + connect( m_pDirectoryMergeWindow, TQ_SIGNAL(checkIfCanContinue(bool*)), this, TQ_SLOT(slotCheckIfCanContinue(bool*))); + connect( m_pDirectoryMergeWindow, TQ_SIGNAL(updateAvailabilities()), this, TQ_SLOT(slotUpdateAvailabilities())); + connect( m_pDirectoryMergeWindow, TQ_SIGNAL(statusBarMessage(const TQString&)), this, TQ_SLOT(slotStatusMsg(const TQString&))); - m_pDirectoryMergeWindow->initDirectoryMergeActions( TQT_TQOBJECT(this), actionCollection() ); + m_pDirectoryMergeWindow->initDirectoryMergeActions( this, actionCollection() ); if ( args!=0 ) args->clear(); // Free up some memory. @@ -430,37 +430,37 @@ void KDiff3App::initActions( TDEActionCollection* ac ) { if (ac==0) KMessageBox::error(0, "actionCollection==0"); - fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), ac); + fileOpen = KStdAction::open(this, TQ_SLOT(slotFileOpen()), ac); fileOpen->setStatusText(i18n("Opens documents for comparison...")); - fileReload = new TDEAction(i18n("Reload"), /*TQIconSet(TQPixmap(reloadIcon)),*/ Key_F5, TQT_TQOBJECT(this), TQT_SLOT(slotReload()), ac, "file_reload"); + fileReload = new TDEAction(i18n("Reload"), /*TQIconSet(TQPixmap(reloadIcon)),*/ Key_F5, this, TQ_SLOT(slotReload()), ac, "file_reload"); - fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), ac); + fileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), ac); fileSave->setStatusText(i18n("Saves the merge result. All conflicts must be solved!")); - fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), ac); + fileSaveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), ac); fileSaveAs->setStatusText(i18n("Saves the current document as...")); - filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), ac); + filePrint = KStdAction::print(this, TQ_SLOT(slotFilePrint()), ac); filePrint->setStatusText(i18n("Print the differences")); - fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), ac); + fileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), ac); fileQuit->setStatusText(i18n("Quits the application")); - editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), ac); + editCut = KStdAction::cut(this, TQ_SLOT(slotEditCut()), ac); editCut->setStatusText(i18n("Cuts the selected section and puts it to the clipboard")); - editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), ac); + editCopy = KStdAction::copy(this, TQ_SLOT(slotEditCopy()), ac); editCopy->setStatusText(i18n("Copies the selected section to the clipboard")); - editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), ac); + editPaste = KStdAction::paste(this, TQ_SLOT(slotEditPaste()), ac); editPaste->setStatusText(i18n("Pastes the clipboard contents to actual position")); - editSelectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotEditSelectAll()), ac); + editSelectAll = KStdAction::selectAll(this, TQ_SLOT(slotEditSelectAll()), ac); editSelectAll->setStatusText(i18n("Select everything in current window")); - editFind = KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(slotEditFind()), ac); + editFind = KStdAction::find(this, TQ_SLOT(slotEditFind()), ac); editFind->setStatusText(i18n("Search for a string")); - editFindNext = KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotEditFindNext()), ac); + editFindNext = KStdAction::findNext(this, TQ_SLOT(slotEditFindNext()), ac); editFindNext->setStatusText(i18n("Search again for the string")); - viewToolBar = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewToolBar()), ac); + viewToolBar = KStdAction::showToolbar(this, TQ_SLOT(slotViewToolBar()), ac); viewToolBar->setStatusText(i18n("Enables/disables the toolbar")); - viewStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewStatusBar()), ac); + viewStatusBar = KStdAction::showStatusbar(this, TQ_SLOT(slotViewStatusBar()), ac); viewStatusBar->setStatusText(i18n("Enables/disables the statusbar")); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), ac); - TDEAction* pAction = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), ac ); + KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), ac); + TDEAction* pAction = KStdAction::preferences(this, TQ_SLOT(slotConfigure()), ac ); if ( isPart() ) pAction->setText(i18n("Configure KDiff3...")); @@ -483,70 +483,70 @@ void KDiff3App::initActions( TDEActionCollection* ac ) #include "xpm/showlinenumbers.xpm" //#include "reload.xpm" - goCurrent = new TDEAction(i18n("Go to Current Delta"), TQIconSet(TQPixmap(currentpos)), CTRL+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotGoCurrent()), ac, "go_current"); - goTop = new TDEAction(i18n("Go to First Delta"), TQIconSet(TQPixmap(upend)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoTop()), ac, "go_top"); - goBottom = new TDEAction(i18n("Go to Last Delta"), TQIconSet(TQPixmap(downend)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoBottom()), ac, "go_bottom"); + goCurrent = new TDEAction(i18n("Go to Current Delta"), TQIconSet(TQPixmap(currentpos)), CTRL+Key_Space, this, TQ_SLOT(slotGoCurrent()), ac, "go_current"); + goTop = new TDEAction(i18n("Go to First Delta"), TQIconSet(TQPixmap(upend)), 0, this, TQ_SLOT(slotGoTop()), ac, "go_top"); + goBottom = new TDEAction(i18n("Go to Last Delta"), TQIconSet(TQPixmap(downend)), 0, this, TQ_SLOT(slotGoBottom()), ac, "go_bottom"); TQString omitsWhitespace = ".\n" + i18n("(Skips white space differences when \"Show White Space\" is disabled.)"); TQString includeWhitespace = ".\n" + i18n("(Does not skip white space differences even when \"Show White Space\" is disabled.)"); - goPrevDelta = new TDEAction(i18n("Go to Previous Delta"), TQIconSet(TQPixmap(up1arrow)), CTRL+Key_Up, TQT_TQOBJECT(this), TQT_SLOT(slotGoPrevDelta()), ac, "go_prev_delta"); + goPrevDelta = new TDEAction(i18n("Go to Previous Delta"), TQIconSet(TQPixmap(up1arrow)), CTRL+Key_Up, this, TQ_SLOT(slotGoPrevDelta()), ac, "go_prev_delta"); goPrevDelta->setToolTip( goPrevDelta->text() + omitsWhitespace ); - goNextDelta = new TDEAction(i18n("Go to Next Delta"), TQIconSet(TQPixmap(down1arrow)), CTRL+Key_Down, TQT_TQOBJECT(this), TQT_SLOT(slotGoNextDelta()), ac, "go_next_delta"); + goNextDelta = new TDEAction(i18n("Go to Next Delta"), TQIconSet(TQPixmap(down1arrow)), CTRL+Key_Down, this, TQ_SLOT(slotGoNextDelta()), ac, "go_next_delta"); goNextDelta->setToolTip( goNextDelta->text() + omitsWhitespace ); - goPrevConflict = new TDEAction(i18n("Go to Previous Conflict"), TQIconSet(TQPixmap(up2arrow)), CTRL+Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(slotGoPrevConflict()), ac, "go_prev_conflict"); + goPrevConflict = new TDEAction(i18n("Go to Previous Conflict"), TQIconSet(TQPixmap(up2arrow)), CTRL+Key_PageUp, this, TQ_SLOT(slotGoPrevConflict()), ac, "go_prev_conflict"); goPrevConflict->setToolTip( goPrevConflict->text() + omitsWhitespace ); - goNextConflict = new TDEAction(i18n("Go to Next Conflict"), TQIconSet(TQPixmap(down2arrow)), CTRL+Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotGoNextConflict()), ac, "go_next_conflict"); + goNextConflict = new TDEAction(i18n("Go to Next Conflict"), TQIconSet(TQPixmap(down2arrow)), CTRL+Key_PageDown, this, TQ_SLOT(slotGoNextConflict()), ac, "go_next_conflict"); goNextConflict->setToolTip( goNextConflict->text() + omitsWhitespace ); - goPrevUnsolvedConflict = new TDEAction(i18n("Go to Previous Unsolved Conflict"), TQIconSet(TQPixmap(prevunsolved)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoPrevUnsolvedConflict()), ac, "go_prev_unsolved_conflict"); + goPrevUnsolvedConflict = new TDEAction(i18n("Go to Previous Unsolved Conflict"), TQIconSet(TQPixmap(prevunsolved)), 0, this, TQ_SLOT(slotGoPrevUnsolvedConflict()), ac, "go_prev_unsolved_conflict"); goPrevUnsolvedConflict->setToolTip( goPrevUnsolvedConflict->text() + includeWhitespace ); - goNextUnsolvedConflict = new TDEAction(i18n("Go to Next Unsolved Conflict"), TQIconSet(TQPixmap(nextunsolved)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoNextUnsolvedConflict()), ac, "go_next_unsolved_conflict"); + goNextUnsolvedConflict = new TDEAction(i18n("Go to Next Unsolved Conflict"), TQIconSet(TQPixmap(nextunsolved)), 0, this, TQ_SLOT(slotGoNextUnsolvedConflict()), ac, "go_next_unsolved_conflict"); goNextUnsolvedConflict->setToolTip( goNextUnsolvedConflict->text() + includeWhitespace ); - chooseA = new TDEToggleAction(i18n("Select Line(s) From A"), TQIconSet(TQPixmap(iconA)), CTRL+Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotChooseA()), ac, "merge_choose_a"); - chooseB = new TDEToggleAction(i18n("Select Line(s) From B"), TQIconSet(TQPixmap(iconB)), CTRL+Key_2, TQT_TQOBJECT(this), TQT_SLOT(slotChooseB()), ac, "merge_choose_b"); - chooseC = new TDEToggleAction(i18n("Select Line(s) From C"), TQIconSet(TQPixmap(iconC)), CTRL+Key_3, TQT_TQOBJECT(this), TQT_SLOT(slotChooseC()), ac, "merge_choose_c"); - autoAdvance = new TDEToggleAction(i18n("Automatically Go to Next Unsolved Conflict After Source Selection"), TQIconSet(TQPixmap(autoadvance)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoAdvanceToggled()), ac, "merge_autoadvance"); - - showWhiteSpaceCharacters = new TDEToggleAction(i18n("Show Space && Tabulator Characters for Differences"), TQIconSet(TQPixmap(showwhitespacechars)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace_characters"); - showWhiteSpace = new TDEToggleAction(i18n("Show White Space"), TQIconSet(TQPixmap(showwhitespace)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace"); - - showLineNumbers = new TDEToggleAction(i18n("Show Line Numbers"), TQIconSet(TQPixmap(showlinenumbers)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowLineNumbersToggled()), ac, "diff_showlinenumbers"); - chooseAEverywhere = new TDEAction(i18n("Choose A Everywhere"), CTRL+SHIFT+Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotChooseAEverywhere()), ac, "merge_choose_a_everywhere"); - chooseBEverywhere = new TDEAction(i18n("Choose B Everywhere"), CTRL+SHIFT+Key_2, TQT_TQOBJECT(this), TQT_SLOT(slotChooseBEverywhere()), ac, "merge_choose_b_everywhere"); - chooseCEverywhere = new TDEAction(i18n("Choose C Everywhere"), CTRL+SHIFT+Key_3, TQT_TQOBJECT(this), TQT_SLOT(slotChooseCEverywhere()), ac, "merge_choose_c_everywhere"); - chooseAForUnsolvedConflicts = new TDEAction(i18n("Choose A for All Unsolved Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseAForUnsolvedConflicts()), ac, "merge_choose_a_for_unsolved_conflicts"); - chooseBForUnsolvedConflicts = new TDEAction(i18n("Choose B for All Unsolved Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseBForUnsolvedConflicts()), ac, "merge_choose_b_for_unsolved_conflicts"); - chooseCForUnsolvedConflicts = new TDEAction(i18n("Choose C for All Unsolved Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseCForUnsolvedConflicts()), ac, "merge_choose_c_for_unsolved_conflicts"); - chooseAForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose A for All Unsolved Whitespace Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseAForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_a_for_unsolved_whitespace_conflicts"); - chooseBForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose B for All Unsolved Whitespace Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseBForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_b_for_unsolved_whitespace_conflicts"); - chooseCForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose C for All Unsolved Whitespace Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseCForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_c_for_unsolved_whitespace_conflicts"); - autoSolve = new TDEAction(i18n("Automatically Solve Simple Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSolve()), ac, "merge_autosolve"); - unsolve = new TDEAction(i18n("Set Deltas to Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUnsolve()), ac, "merge_autounsolve"); - mergeRegExp = new TDEAction(i18n("Run Regular Expression Auto Merge"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRegExpAutoMerge()),ac, "merge_regexp_automerge" ); - mergeHistory = new TDEAction(i18n("Automatically Solve History Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMergeHistory()), ac, "merge_versioncontrol_history" ); - splitDiff = new TDEAction(i18n("Split Diff At Selection"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitDiff()), ac, "merge_splitdiff"); - joinDiffs = new TDEAction(i18n("Join Selected Diffs"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotJoinDiffs()), ac, "merge_joindiffs"); - - showWindowA = new TDEToggleAction(i18n("Show Window A"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWindowAToggled()), ac, "win_show_a"); - showWindowB = new TDEToggleAction(i18n("Show Window B"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWindowBToggled()), ac, "win_show_b"); - showWindowC = new TDEToggleAction(i18n("Show Window C"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWindowCToggled()), ac, "win_show_c"); - winFocusNext = new TDEAction(i18n("Focus Next Window"), ALT+Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotWinFocusNext()), ac, "win_focus_next"); - - overviewModeNormal = new TDEToggleAction(i18n("Normal Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewNormal()), ac, "diff_overview_normal"); - overviewModeAB = new TDEToggleAction(i18n("A vs. B Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewAB()), ac, "diff_overview_ab"); - overviewModeAC = new TDEToggleAction(i18n("A vs. C Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewAC()), ac, "diff_overview_ac"); - overviewModeBC = new TDEToggleAction(i18n("B vs. C Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewBC()), ac, "diff_overview_bc"); - wordWrap = new TDEToggleAction(i18n("Word Wrap Diff Windows"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotWordWrapToggled()), ac, "diff_wordwrap"); - addManualDiffHelp = new TDEAction(i18n("Add Manual Diff Alignment"), TQt::CTRL+TQt::Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotAddManualDiffHelp()), ac, "diff_add_manual_diff_help"); - clearManualDiffHelpList = new TDEAction(i18n("Clear All Manual Diff Alignments"), TQt::CTRL+TQt::SHIFT+TQt::Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotClearManualDiffHelpList()), ac, "diff_clear_manual_diff_help_list"); + chooseA = new TDEToggleAction(i18n("Select Line(s) From A"), TQIconSet(TQPixmap(iconA)), CTRL+Key_1, this, TQ_SLOT(slotChooseA()), ac, "merge_choose_a"); + chooseB = new TDEToggleAction(i18n("Select Line(s) From B"), TQIconSet(TQPixmap(iconB)), CTRL+Key_2, this, TQ_SLOT(slotChooseB()), ac, "merge_choose_b"); + chooseC = new TDEToggleAction(i18n("Select Line(s) From C"), TQIconSet(TQPixmap(iconC)), CTRL+Key_3, this, TQ_SLOT(slotChooseC()), ac, "merge_choose_c"); + autoAdvance = new TDEToggleAction(i18n("Automatically Go to Next Unsolved Conflict After Source Selection"), TQIconSet(TQPixmap(autoadvance)), 0, this, TQ_SLOT(slotAutoAdvanceToggled()), ac, "merge_autoadvance"); + + showWhiteSpaceCharacters = new TDEToggleAction(i18n("Show Space && Tabulator Characters for Differences"), TQIconSet(TQPixmap(showwhitespacechars)), 0, this, TQ_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace_characters"); + showWhiteSpace = new TDEToggleAction(i18n("Show White Space"), TQIconSet(TQPixmap(showwhitespace)), 0, this, TQ_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace"); + + showLineNumbers = new TDEToggleAction(i18n("Show Line Numbers"), TQIconSet(TQPixmap(showlinenumbers)), 0, this, TQ_SLOT(slotShowLineNumbersToggled()), ac, "diff_showlinenumbers"); + chooseAEverywhere = new TDEAction(i18n("Choose A Everywhere"), CTRL+SHIFT+Key_1, this, TQ_SLOT(slotChooseAEverywhere()), ac, "merge_choose_a_everywhere"); + chooseBEverywhere = new TDEAction(i18n("Choose B Everywhere"), CTRL+SHIFT+Key_2, this, TQ_SLOT(slotChooseBEverywhere()), ac, "merge_choose_b_everywhere"); + chooseCEverywhere = new TDEAction(i18n("Choose C Everywhere"), CTRL+SHIFT+Key_3, this, TQ_SLOT(slotChooseCEverywhere()), ac, "merge_choose_c_everywhere"); + chooseAForUnsolvedConflicts = new TDEAction(i18n("Choose A for All Unsolved Conflicts"), 0, this, TQ_SLOT(slotChooseAForUnsolvedConflicts()), ac, "merge_choose_a_for_unsolved_conflicts"); + chooseBForUnsolvedConflicts = new TDEAction(i18n("Choose B for All Unsolved Conflicts"), 0, this, TQ_SLOT(slotChooseBForUnsolvedConflicts()), ac, "merge_choose_b_for_unsolved_conflicts"); + chooseCForUnsolvedConflicts = new TDEAction(i18n("Choose C for All Unsolved Conflicts"), 0, this, TQ_SLOT(slotChooseCForUnsolvedConflicts()), ac, "merge_choose_c_for_unsolved_conflicts"); + chooseAForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose A for All Unsolved Whitespace Conflicts"), 0, this, TQ_SLOT(slotChooseAForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_a_for_unsolved_whitespace_conflicts"); + chooseBForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose B for All Unsolved Whitespace Conflicts"), 0, this, TQ_SLOT(slotChooseBForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_b_for_unsolved_whitespace_conflicts"); + chooseCForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose C for All Unsolved Whitespace Conflicts"), 0, this, TQ_SLOT(slotChooseCForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_c_for_unsolved_whitespace_conflicts"); + autoSolve = new TDEAction(i18n("Automatically Solve Simple Conflicts"), 0, this, TQ_SLOT(slotAutoSolve()), ac, "merge_autosolve"); + unsolve = new TDEAction(i18n("Set Deltas to Conflicts"), 0, this, TQ_SLOT(slotUnsolve()), ac, "merge_autounsolve"); + mergeRegExp = new TDEAction(i18n("Run Regular Expression Auto Merge"), 0, this, TQ_SLOT(slotRegExpAutoMerge()),ac, "merge_regexp_automerge" ); + mergeHistory = new TDEAction(i18n("Automatically Solve History Conflicts"), 0, this, TQ_SLOT(slotMergeHistory()), ac, "merge_versioncontrol_history" ); + splitDiff = new TDEAction(i18n("Split Diff At Selection"), 0, this, TQ_SLOT(slotSplitDiff()), ac, "merge_splitdiff"); + joinDiffs = new TDEAction(i18n("Join Selected Diffs"), 0, this, TQ_SLOT(slotJoinDiffs()), ac, "merge_joindiffs"); + + showWindowA = new TDEToggleAction(i18n("Show Window A"), 0, this, TQ_SLOT(slotShowWindowAToggled()), ac, "win_show_a"); + showWindowB = new TDEToggleAction(i18n("Show Window B"), 0, this, TQ_SLOT(slotShowWindowBToggled()), ac, "win_show_b"); + showWindowC = new TDEToggleAction(i18n("Show Window C"), 0, this, TQ_SLOT(slotShowWindowCToggled()), ac, "win_show_c"); + winFocusNext = new TDEAction(i18n("Focus Next Window"), ALT+Key_Right, this, TQ_SLOT(slotWinFocusNext()), ac, "win_focus_next"); + + overviewModeNormal = new TDEToggleAction(i18n("Normal Overview"), 0, this, TQ_SLOT(slotOverviewNormal()), ac, "diff_overview_normal"); + overviewModeAB = new TDEToggleAction(i18n("A vs. B Overview"), 0, this, TQ_SLOT(slotOverviewAB()), ac, "diff_overview_ab"); + overviewModeAC = new TDEToggleAction(i18n("A vs. C Overview"), 0, this, TQ_SLOT(slotOverviewAC()), ac, "diff_overview_ac"); + overviewModeBC = new TDEToggleAction(i18n("B vs. C Overview"), 0, this, TQ_SLOT(slotOverviewBC()), ac, "diff_overview_bc"); + wordWrap = new TDEToggleAction(i18n("Word Wrap Diff Windows"), 0, this, TQ_SLOT(slotWordWrapToggled()), ac, "diff_wordwrap"); + addManualDiffHelp = new TDEAction(i18n("Add Manual Diff Alignment"), TQt::CTRL+TQt::Key_Y, this, TQ_SLOT(slotAddManualDiffHelp()), ac, "diff_add_manual_diff_help"); + clearManualDiffHelpList = new TDEAction(i18n("Clear All Manual Diff Alignments"), TQt::CTRL+TQt::SHIFT+TQt::Key_Y, this, TQ_SLOT(slotClearManualDiffHelpList()), ac, "diff_clear_manual_diff_help_list"); #ifdef _WIN32 - new TDEAction(i18n("Focus Next Window"), TQt::CTRL+TQt::Key_Tab, TQT_TQOBJECT(this), TQT_SLOT(slotWinFocusNext()), ac, "win_focus_next", false, false); + new TDEAction(i18n("Focus Next Window"), TQt::CTRL+TQt::Key_Tab, this, TQ_SLOT(slotWinFocusNext()), ac, "win_focus_next", false, false); #endif - winFocusPrev = new TDEAction(i18n("Focus Prev Window"), TQt::ALT+TQt::Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotWinFocusPrev()), ac, "win_focus_prev"); - winToggleSplitOrientation = new TDEAction(i18n("Toggle Split Orientation"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotWinToggleSplitterOrientation()), ac, "win_toggle_split_orientation"); + winFocusPrev = new TDEAction(i18n("Focus Prev Window"), TQt::ALT+TQt::Key_Left, this, TQ_SLOT(slotWinFocusPrev()), ac, "win_focus_prev"); + winToggleSplitOrientation = new TDEAction(i18n("Toggle Split Orientation"), 0, this, TQ_SLOT(slotWinToggleSplitterOrientation()), ac, "win_toggle_split_orientation"); - dirShowBoth = new TDEToggleAction(i18n("Dir && Text Split Screen View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDirShowBoth()), ac, "win_dir_show_both"); + dirShowBoth = new TDEToggleAction(i18n("Dir && Text Split Screen View"), 0, this, TQ_SLOT(slotDirShowBoth()), ac, "win_dir_show_both"); dirShowBoth->setChecked( true ); - dirViewToggle = new TDEAction(i18n("Toggle Between Dir && Text View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDirViewToggle()), actionCollection(), "win_dir_view_toggle"); + dirViewToggle = new TDEAction(i18n("Toggle Between Dir && Text View"), 0, this, TQ_SLOT(slotDirViewToggle()), actionCollection(), "win_dir_view_toggle"); m_pMergeEditorPopupMenu = new TQPopupMenu( this ); chooseA->plug( m_pMergeEditorPopupMenu ); @@ -629,7 +629,7 @@ bool KDiff3App::queryClose() ///////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATION +// TQ_SLOT IMPLEMENTATION ///////////////////////////////////////////////////////////////////// diff --git a/src/kdiff3.h b/src/kdiff3.h index e48f42b..ac13114 100644 --- a/src/kdiff3.h +++ b/src/kdiff3.h @@ -62,17 +62,17 @@ class DirectoryMergeInfo; class ReversibleScrollBar : public TQScrollBar { - Q_OBJECT + TQ_OBJECT bool* m_pbRightToLeftLanguage; int m_realVal; public: - ReversibleScrollBar( Qt::Orientation o, TQWidget* pParent, bool* pbRightToLeftLanguage ) + ReversibleScrollBar( TQt::Orientation o, TQWidget* pParent, bool* pbRightToLeftLanguage ) : TQScrollBar( o, pParent ) { m_pbRightToLeftLanguage=pbRightToLeftLanguage; m_realVal=0; - connect( this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int))); + connect( this, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValueChanged(int))); } void setAgain(){ setValue(m_realVal); } public slots: @@ -96,7 +96,7 @@ signals: class KDiff3App : public TQSplitter { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/kdiff3_part.cpp b/src/kdiff3_part.cpp index 8c4e9c3..3f5533e 100644 --- a/src/kdiff3_part.cpp +++ b/src/kdiff3_part.cpp @@ -52,9 +52,9 @@ KDiff3Part::KDiff3Part( TQWidget *parentWidget, const char *widgetName, setWidget(m_widget); // create our actions - //KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - //KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - //KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + //KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + //KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + //KStdAction::save(this, TQ_SLOT(save()), actionCollection()); setXMLFile("kdiff3_part.rc"); diff --git a/src/kdiff3_part.h b/src/kdiff3_part.h index f529a7b..7df6887 100644 --- a/src/kdiff3_part.h +++ b/src/kdiff3_part.h @@ -37,7 +37,7 @@ class KDiff3App; */ class KDiff3Part : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: /** @@ -84,7 +84,7 @@ class TDEAboutData; class KDiff3PartFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: KDiff3PartFactory(); diff --git a/src/kdiff3_shell.cpp b/src/kdiff3_shell.cpp index 2670d9a..f740c3b 100644 --- a/src/kdiff3_shell.cpp +++ b/src/kdiff3_shell.cpp @@ -55,7 +55,7 @@ KDiff3Shell::KDiff3Shell(bool bCompleteInit) { // now that the Part is loaded, we cast it to a Part to get // our hands on it - m_part = static_cast<KParts::ReadWritePart *>(factory->create(TQT_TQOBJECT(this), + m_part = static_cast<KParts::ReadWritePart *>(factory->create(this, "kdiff3_part", "KParts::ReadWritePart" )); if (m_part) @@ -68,7 +68,7 @@ KDiff3Shell::KDiff3Shell(bool bCompleteInit) if (bCompleteInit) ((KDiff3App*)m_part->widget())->completeInit(); - connect(((KDiff3App*)m_part->widget()), TQT_SIGNAL(createNewInstance(const TQString&, const TQString&, const TQString&)), this, TQT_SLOT(slotNewInstance(const TQString&, const TQString&, const TQString&))); + connect(((KDiff3App*)m_part->widget()), TQ_SIGNAL(createNewInstance(const TQString&, const TQString&, const TQString&)), this, TQ_SLOT(slotNewInstance(const TQString&, const TQString&, const TQString&))); } } else @@ -164,8 +164,8 @@ void KDiff3Shell::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } diff --git a/src/kdiff3_shell.h b/src/kdiff3_shell.h index b11f3b8..388c9a6 100644 --- a/src/kdiff3_shell.h +++ b/src/kdiff3_shell.h @@ -38,7 +38,7 @@ class TDEToggleAction; */ class KDiff3Shell : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/src/kreplacements/README b/src/kreplacements/README index fd9411c..6c8852d 100644 --- a/src/kreplacements/README +++ b/src/kreplacements/README @@ -5,7 +5,7 @@ I want to be able to compile and use KDiff3 without KDE too. Since KDiff3 is a KDE program, which uses many KDE-classes and functions there must be some replacement. -In many cases this is just the corresponding Qt-class, but often +In many cases this is just the corresponding TQt-class, but often I wrote something myself. For several very KDE-specific functions there is no real replacement, but only stub functions that allow the program to compile and link. @@ -21,7 +21,7 @@ kreplacements.cpp. The *.moc-files are dummies. The new KDE-philosophy seems to be that *.moc-files are directly included into the sources. -The Qt-philosophy still is to generate moc*.cpp files which will +The TQt-philosophy still is to generate moc*.cpp files which will be compiled seperately. With these dummy-moc-files both versions can be compiled. diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp index a6b7a81..e6d9065 100644 --- a/src/kreplacements/kreplacements.cpp +++ b/src/kreplacements/kreplacements.cpp @@ -172,9 +172,9 @@ KDialogBase::KDialogBase( int, const TQString& caption, int, int, TQWidget* pare setOkButton(); setDefaultButton(); - connect( this, TQT_SIGNAL( defaultButtonPressed() ), this, TQT_SLOT(slotDefault()) ); - connect( this, TQT_SIGNAL( helpButtonPressed() ), this, TQT_SLOT(slotHelp())); - connect( this, TQT_SIGNAL( applyButtonPressed() ), this, TQT_SLOT( slotApply() )); + connect( this, TQ_SIGNAL( defaultButtonPressed() ), this, TQ_SLOT(slotDefault()) ); + connect( this, TQ_SIGNAL( helpButtonPressed() ), this, TQ_SLOT(slotHelp())); + connect( this, TQ_SIGNAL( applyButtonPressed() ), this, TQ_SLOT( slotApply() )); } KDialogBase::~KDialogBase() @@ -352,8 +352,8 @@ TDEActionCollection* TDEMainWindow::actionCollection() void TDEMainWindow::createGUI() { - KStdAction::help(this, TQT_SLOT(slotHelp()), actionCollection()); - KStdAction::about(this, TQT_SLOT(slotAbout()), actionCollection()); + KStdAction::help(this, TQ_SLOT(slotHelp()), actionCollection()); + KStdAction::about(this, TQ_SLOT(slotAbout()), actionCollection()); KStdAction::aboutTQt(actionCollection()); } @@ -480,10 +480,10 @@ void TDEAction::init(TQObject* receiver, const char* slot, TDEActionCollection* if( slot!=0 ) { if (!bToggle) - connect(this, TQT_SIGNAL(activated()), receiver, slot); + connect(this, TQ_SIGNAL(activated()), receiver, slot); else { - connect(this, TQT_SIGNAL(toggled(bool)), receiver, slot); + connect(this, TQ_SIGNAL(toggled(bool)), receiver, slot); } } @@ -696,7 +696,7 @@ TDEAction* KStdAction::about( TQWidget* parent, const char* slot, TDEActionColle TDEAction* KStdAction::aboutTQt( TDEActionCollection* actionCollection ) { TDEMainWindow* p = actionCollection->m_pMainWindow; - TDEAction* a = new TDEAction( i18n("About")+" TQt", 0, tqApp, TQT_SLOT(aboutTQt()), actionCollection, "about_qt", false, false ); + TDEAction* a = new TDEAction( i18n("About")+" TQt", 0, tqApp, TQ_SLOT(aboutTQt()), actionCollection, "about_qt", false, false ); if(p) a->addTo( p->helpMenu ); return a; } @@ -733,7 +733,7 @@ TDEFontChooser::TDEFontChooser( TQWidget* pParent, const TQString& /*name*/, boo m_pParent = pParent; TQVBoxLayout* pLayout = new TQVBoxLayout( this ); m_pSelectFont = new TQPushButton(i18n("Select Font"), this ); - connect(m_pSelectFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectFont())); + connect(m_pSelectFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectFont())); pLayout->addWidget(m_pSelectFont); m_pLabel = new TQLabel( "", this ); @@ -788,7 +788,7 @@ void TDEFontChooser::slotSelectFont() KColorButton::KColorButton(TQWidget* parent) : TQPushButton(parent) { - connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); + connect( this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked())); } TQColor KColorButton::color() diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h index b8c8b74..cc8c2ab 100644 --- a/src/kreplacements/kreplacements.h +++ b/src/kreplacements/kreplacements.h @@ -87,7 +87,7 @@ typedef TQPopupMenu TDEPopupMenu; class KDialogBase : public TQTabDialog { - Q_OBJECT + TQ_OBJECT public: KDialogBase( int, const TQString& caption, int, int, TQWidget* parent, const char* name, @@ -171,7 +171,7 @@ namespace KParts class TDEMainWindow : public TQMainWindow { - Q_OBJECT + TQ_OBJECT private: KStatusBar m_statusBar; @@ -219,7 +219,7 @@ public: class TDEAction : public TQAction { - Q_OBJECT + TQ_OBJECT public: TDEAction(const TQString& text, const TQIconSet& icon, int accel, TQObject* receiver, const char* slot, TDEActionCollection* actionCollection, const char* name, bool bToggle=false, bool bMenu=true); @@ -272,7 +272,7 @@ public: class TDEFontChooser : public TQWidget { - Q_OBJECT + TQ_OBJECT TQFont m_font; TQPushButton* m_pSelectFont; @@ -288,7 +288,7 @@ private slots: class KColorButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT TQColor m_color; public: @@ -391,7 +391,7 @@ extern TDEApplication* kapp; class KLibFactory : public TQObject { - Q_OBJECT + TQ_OBJECT public: TQObject* create(TQObject*,const TQString&,const TQString&); @@ -499,7 +499,7 @@ namespace KParts class Factory : public KLibFactory { - Q_OBJECT + TQ_OBJECT public: virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp index f52d0a3..71c2f97 100644 --- a/src/mergeresultwindow.cpp +++ b/src/mergeresultwindow.cpp @@ -50,7 +50,7 @@ MergeResultWindow::MergeResultWindow( ) : TQWidget( pParent, 0, WRepaintNoErase ) { - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); m_firstLine = 0; m_firstColumn = 0; @@ -84,7 +84,7 @@ MergeResultWindow::MergeResultWindow( m_cursorYPos=0; m_bCursorOn = true; m_bCursorUpdate = false; - connect( &m_cursorTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( slotCursorUpdate() ) ); + connect( &m_cursorTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT( slotCursorUpdate() ) ); m_cursorTimer.start( 500 /*ms*/, true /*single shot*/ ); m_selection.reset(); @@ -1761,7 +1761,7 @@ void MergeResultWindow::paintEvent( TQPaintEvent* ) if ( size() != m_pixmap.size() ) m_pixmap.resize(size()); - MyPainter p(TQT_TQPAINTDEVICE(&m_pixmap), m_pOptionDialog->m_bRightToLeftLanguage, width(), fontWidth); + MyPainter p(&m_pixmap, m_pOptionDialog->m_bRightToLeftLanguage, width(), fontWidth); p.setFont( font() ); p.TQPainter::fillRect( rect(), m_pOptionDialog->m_bgColor ); @@ -1843,7 +1843,7 @@ void MergeResultWindow::paintEvent( TQPaintEvent* ) if ( m_bCursorOn && hasFocus() && m_cursorYPos>=m_firstLine ) { - MyPainter painter(TQT_TQPAINTDEVICE(this), m_pOptionDialog->m_bRightToLeftLanguage, width(), fontWidth); + MyPainter painter(this, m_pOptionDialog->m_bRightToLeftLanguage, width(), fontWidth); int topLineYOffset = 0; int xOffset = fontWidth * leftInfoWidth; @@ -1929,9 +1929,9 @@ void MergeResultWindow::mousePressEvent ( TQMouseEvent* e ) int pos; convertToLinePos( e->x(), e->y(), line, pos ); - bool bLMB = e->button() == Qt::LeftButton; - bool bMMB = e->button() == Qt::MidButton; - bool bRMB = e->button() == Qt::RightButton; + bool bLMB = e->button() == TQt::LeftButton; + bool bMMB = e->button() == TQt::MidButton; + bool bRMB = e->button() == TQt::RightButton; if ( bLMB && pos < m_firstColumn || bRMB ) // Fast range selection { @@ -1999,7 +1999,7 @@ void MergeResultWindow::mousePressEvent ( TQMouseEvent* e ) void MergeResultWindow::mouseDoubleClickEvent( TQMouseEvent* e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { int line; int pos; @@ -2033,7 +2033,7 @@ void MergeResultWindow::mouseDoubleClickEvent( TQMouseEvent* e ) void MergeResultWindow::mouseReleaseEvent ( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { killTimer(m_delayedDrawTimer); m_delayedDrawTimer = 0; @@ -3068,7 +3068,7 @@ WindowTitleWidget::WindowTitleWidget(OptionDialog* pOptionDialog, TQWidget* pPar //m_pBrowseButton = new TQPushButton("..."); //pHLayout->addWidget( m_pBrowseButton, 0 ); - //connect( m_pBrowseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBrowseButtonClicked())); + //connect( m_pBrowseButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBrowseButtonClicked())); m_pModifiedLabel = new TQLabel(i18n("[Modified]"),this); pHLayout->addWidget( m_pModifiedLabel ); @@ -3199,7 +3199,7 @@ bool WindowTitleWidget::eventFilter( TQObject* o, TQEvent* e ) m_pEncodingLabel->setPalette( p ); m_pEncodingSelector->setPalette( p ); } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pFileNameLineEdit) && e->type()==TQEvent::Drop) + if (o == m_pFileNameLineEdit && e->type()==TQEvent::Drop) { TQDropEvent* d = static_cast<TQDropEvent*>(e); @@ -3210,8 +3210,8 @@ bool WindowTitleWidget::eventFilter( TQObject* o, TQEvent* e ) if ( lst.count() > 0 ) { - static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setText( lst[0] ); - static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setFocus(); + static_cast<TQLineEdit*>(o)->setText( lst[0] ); + static_cast<TQLineEdit*>(o)->setFocus(); return true; } } diff --git a/src/mergeresultwindow.h b/src/mergeresultwindow.h index 57f25d7..82cbb7e 100644 --- a/src/mergeresultwindow.h +++ b/src/mergeresultwindow.h @@ -28,7 +28,7 @@ class TQPainter; class Overview : public TQWidget { - Q_OBJECT + TQ_OBJECT public: Overview( TQWidget* pParent, OptionDialog* pOptions ); @@ -96,7 +96,7 @@ enum e_MergeSrcSelector class MergeResultWindow : public TQWidget { - Q_OBJECT + TQ_OBJECT public: MergeResultWindow( @@ -426,7 +426,7 @@ class TQComboBox; class TQLabel; class WindowTitleWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT private: TQLabel* m_pLabel; diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp index 324edbe..90a90f7 100644 --- a/src/optiondialog.cpp +++ b/src/optiondialog.cpp @@ -263,7 +263,7 @@ public: { m_pVar = pVar; m_defaultVal = defaultVal; - TQIntValidator* v = new TQIntValidator(TQT_TQOBJECT(this)); + TQIntValidator* v = new TQIntValidator(this); v->setRange( rangeMin, rangeMax ); setValidator( v ); } @@ -847,7 +847,7 @@ void OptionDialog::setupMergePage( void ) ); ++line; - TQGroupBox* pGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n("Automatic Merge Regular Expression"), page); + TQGroupBox* pGroupBox = new TQGroupBox( 2, TQt::Horizontal, i18n("Automatic Merge Regular Expression"), page); gbox->addMultiCellWidget( pGroupBox, line,line,0,1); ++line; { @@ -873,7 +873,7 @@ void OptionDialog::setupMergePage( void ) ++line; } - pGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n("Version Control History Merging"), page); + pGroupBox = new TQGroupBox( 2, TQt::Horizontal, i18n("Version Control History Merging"), page); gbox->addMultiCellWidget( pGroupBox, line,line,0,1); ++line; { @@ -922,7 +922,7 @@ void OptionDialog::setupMergePage( void ) //int year = newHistoryEntry.cap(4).toInt(); //TQString time = newHistoryEntry.cap(5); //TQString name = newHistoryEntry.cap(6); - TQString defaultSortKeyOrder = "4,3,2,5,1,6"; //TQDate(year,month,day).toString(Qt::ISODate) +" "+ time + " " + branch + " " + name; + TQString defaultSortKeyOrder = "4,3,2,5,1,6"; //TQDate(year,month,day).toString(TQt::ISODate) +" "+ time + " " + branch + " " + name; label = new TQLabel( i18n("History entry start sort key order:"), page ); gbox->addWidget( label, line, 0 ); @@ -936,7 +936,7 @@ void OptionDialog::setupMergePage( void ) "See the documentation for details."); TQToolTip::add( label, s_historyEntryStartSortKeyOrderToolTip ); m_pHistorySortKeyOrderLineEdit->setEnabled(false); - connect( m_pHistoryMergeSorting, TQT_SIGNAL(toggled(bool)), m_pHistorySortKeyOrderLineEdit, TQT_SLOT(setEnabled(bool))); + connect( m_pHistoryMergeSorting, TQ_SIGNAL(toggled(bool)), m_pHistorySortKeyOrderLineEdit, TQ_SLOT(setEnabled(bool))); ++line; m_pHistoryAutoMerge = new OptionCheckBox( i18n("Merge version control history on merge start"), false, "RunHistoryAutoMergeOnMergeStart", &m_bRunHistoryAutoMergeOnMergeStart, page, this ); @@ -954,7 +954,7 @@ void OptionDialog::setupMergePage( void ) TQPushButton* pButton = new TQPushButton( i18n("Test your regular expressions"), page ); gbox->addWidget( pButton, line, 0 ); - connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHistoryMergeRegExpTester())); + connect( pButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotHistoryMergeRegExpTester())); ++line; label = new TQLabel( i18n("Irrelevant merge command:"), page ); @@ -1117,7 +1117,7 @@ void OptionDialog::setupDirectoryMergePage( void ) TQToolTip::add( pWhiteSpaceDiffsEqual, i18n( "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." ) ); - connect(pFullAnalysis, TQT_SIGNAL(toggled(bool)), pWhiteSpaceDiffsEqual, TQT_SLOT(setEnabled(bool))); + connect(pFullAnalysis, TQ_SIGNAL(toggled(bool)), pWhiteSpaceDiffsEqual, TQ_SLOT(setEnabled(bool))); pWhiteSpaceDiffsEqual->setEnabled(false); ++line; @@ -1418,10 +1418,10 @@ static char* countryMap[]={ gbox->addWidget( m_pEncodingPPComboBox, line, 1 ); ++line; - connect(m_pSameEncoding, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEncodingChanged())); - connect(m_pEncodingAComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotEncodingChanged())); - connect(m_pAutoDetectUnicodeA, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEncodingChanged())); - connect(m_pAutoSelectOutEncoding, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEncodingChanged())); + connect(m_pSameEncoding, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEncodingChanged())); + connect(m_pEncodingAComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotEncodingChanged())); + connect(m_pAutoDetectUnicodeA, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEncodingChanged())); + connect(m_pAutoSelectOutEncoding, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEncodingChanged())); OptionCheckBox* pRightToLeftLanguage = new OptionCheckBox( i18n("Right To Left Language"), false, "RightToLeftLanguage", &m_bRightToLeftLanguage, page, this ); gbox->addMultiCellWidget( pRightToLeftLanguage, line, line, 0, 1 ); @@ -1468,14 +1468,14 @@ void OptionDialog::setupIntegrationPage( void ) "Integrate with Rational ClearCase from IBM.\n" "Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n" "(Only enabled when ClearCase \"bin\" directory is in the path.)")); - connect(pIntegrateWithClearCase, TQT_SIGNAL(clicked()),this, TQT_SLOT(slotIntegrateWithClearCase()) ); + connect(pIntegrateWithClearCase, TQ_SIGNAL(clicked()),this, TQ_SLOT(slotIntegrateWithClearCase()) ); pIntegrateWithClearCase->setEnabled( integrateWithClearCase( "existsClearCase", "" )!=0 ); TQPushButton* pRemoveClearCaseIntegration = new TQPushButton( i18n("Remove ClearCase Integration"), page); gbox->addWidget( pRemoveClearCaseIntegration, line, 1 ); TQToolTip::add( pRemoveClearCaseIntegration, i18n( "Restore the old \"map\" file from before doing the Clearcase integration.")); - connect(pRemoveClearCaseIntegration, TQT_SIGNAL(clicked()),this, TQT_SLOT(slotRemoveClearCaseIntegration()) ); + connect(pRemoveClearCaseIntegration, TQ_SIGNAL(clicked()),this, TQ_SLOT(slotRemoveClearCaseIntegration()) ); pRemoveClearCaseIntegration->setEnabled( integrateWithClearCase( "existsClearCase", "" )!=0 ); ++line; diff --git a/src/optiondialog.h b/src/optiondialog.h index b097294..7aefa29 100644 --- a/src/optiondialog.h +++ b/src/optiondialog.h @@ -48,7 +48,7 @@ enum e_LineEndStyle class OptionDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/pdiff.cpp b/src/pdiff.cpp index 25c042e..7e7dffb 100644 --- a/src/pdiff.cpp +++ b/src/pdiff.cpp @@ -533,7 +533,7 @@ void KDiff3App::init( bool bAuto, TotalDiffStatus* pTotalDiffStatus, bool bLoadF } } - TQTimer::singleShot( 10, this, TQT_SLOT(slotAfterFirstPaint()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(slotAfterFirstPaint()) ); if ( bVisibleMergeResultWindow && m_pMergeResultWindow ) { @@ -638,22 +638,22 @@ void KDiff3App::initView() TQVBoxLayout* pVLayout = new TQVBoxLayout(m_pMainWidget,0,0); TQSplitter* pVSplitter = new TQSplitter( m_pMainWidget ); - pVSplitter->setOrientation( Qt::Vertical ); + pVSplitter->setOrientation( TQt::Vertical ); pVLayout->addWidget( pVSplitter ); TQWidget* pDiffWindowFrame = new TQWidget( pVSplitter ); TQHBoxLayout* pDiffHLayout = new TQHBoxLayout( pDiffWindowFrame,0,0 ); m_pDiffWindowSplitter = new TQSplitter( pDiffWindowFrame ); - m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Qt::Horizontal : Qt::Vertical ); + m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? TQt::Horizontal : TQt::Vertical ); pDiffHLayout->addWidget( m_pDiffWindowSplitter ); m_pOverview = new Overview( pDiffWindowFrame, m_pOptionDialog ); pDiffHLayout->addWidget(m_pOverview); - connect( m_pOverview, TQT_SIGNAL(setLine(int)), this, TQT_SLOT(setDiff3Line(int)) ); - //connect( m_pOverview, TQT_SIGNAL(afterFirstPaint()), this, TQT_SLOT(slotAfterFirstPaint())); + connect( m_pOverview, TQ_SIGNAL(setLine(int)), this, TQ_SLOT(setDiff3Line(int)) ); + //connect( m_pOverview, TQ_SIGNAL(afterFirstPaint()), this, TQ_SLOT(slotAfterFirstPaint())); - m_pDiffVScrollBar = new TQScrollBar( Qt::Vertical, pDiffWindowFrame ); + m_pDiffVScrollBar = new TQScrollBar( TQt::Vertical, pDiffWindowFrame ); pDiffHLayout->addWidget( m_pDiffVScrollBar ); m_pDiffTextWindowFrame1 = new DiffTextWindowFrame( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog, 1 ); @@ -662,9 +662,9 @@ void KDiff3App::initView() m_pDiffTextWindow1 = m_pDiffTextWindowFrame1->getDiffTextWindow(); m_pDiffTextWindow2 = m_pDiffTextWindowFrame2->getDiffTextWindow(); m_pDiffTextWindow3 = m_pDiffTextWindowFrame3->getDiffTextWindow(); - connect(m_pDiffTextWindowFrame1, TQT_SIGNAL(fileNameChanged(const TQString&,int)), this, TQT_SLOT(slotFileNameChanged(const TQString&,int))); - connect(m_pDiffTextWindowFrame2, TQT_SIGNAL(fileNameChanged(const TQString&,int)), this, TQT_SLOT(slotFileNameChanged(const TQString&,int))); - connect(m_pDiffTextWindowFrame3, TQT_SIGNAL(fileNameChanged(const TQString&,int)), this, TQT_SLOT(slotFileNameChanged(const TQString&,int))); + connect(m_pDiffTextWindowFrame1, TQ_SIGNAL(fileNameChanged(const TQString&,int)), this, TQ_SLOT(slotFileNameChanged(const TQString&,int))); + connect(m_pDiffTextWindowFrame2, TQ_SIGNAL(fileNameChanged(const TQString&,int)), this, TQ_SLOT(slotFileNameChanged(const TQString&,int))); + connect(m_pDiffTextWindowFrame3, TQ_SIGNAL(fileNameChanged(const TQString&,int)), this, TQ_SLOT(slotFileNameChanged(const TQString&,int))); // Merge window m_pMergeWindowFrame = new TQWidget( pVSplitter ); @@ -679,7 +679,7 @@ void KDiff3App::initView() m_pMergeResultWindow = new MergeResultWindow( m_pMergeWindowFrame, m_pOptionDialog, statusBar() ); pMergeVLayout->addWidget( m_pMergeResultWindow, 1 ); - m_pMergeVScrollBar = new TQScrollBar( Qt::Vertical, m_pMergeWindowFrame ); + m_pMergeVScrollBar = new TQScrollBar( TQt::Vertical, m_pMergeWindowFrame ); pMergeHLayout->addWidget( m_pMergeVScrollBar ); autoAdvance->setEnabled(true); @@ -693,67 +693,67 @@ void KDiff3App::initView() m_pMergeResultWindow->installEventFilter( m_pMergeResultWindowTitle ); // for focus tracking TQHBoxLayout* pHScrollBarLayout = new TQHBoxLayout( pVLayout ); - m_pHScrollBar = new ReversibleScrollBar( Qt::Horizontal, m_pMainWidget, &m_pOptionDialog->m_bRightToLeftLanguage ); + m_pHScrollBar = new ReversibleScrollBar( TQt::Horizontal, m_pMainWidget, &m_pOptionDialog->m_bRightToLeftLanguage ); pHScrollBarLayout->addWidget( m_pHScrollBar ); m_pCornerWidget = new TQWidget( m_pMainWidget ); pHScrollBarLayout->addWidget( m_pCornerWidget ); - connect( m_pDiffVScrollBar, TQT_SIGNAL(valueChanged(int)), m_pOverview, TQT_SLOT(setFirstLine(int))); - connect( m_pDiffVScrollBar, TQT_SIGNAL(valueChanged(int)), m_pDiffTextWindow1, TQT_SLOT(setFirstLine(int))); - connect( m_pHScrollBar, TQT_SIGNAL(valueChanged2(int)), m_pDiffTextWindow1, TQT_SLOT(setFirstColumn(int))); - connect( m_pDiffTextWindow1, TQT_SIGNAL(newSelection()), this, TQT_SLOT(slotSelectionStart())); - connect( m_pDiffTextWindow1, TQT_SIGNAL(selectionEnd()), this, TQT_SLOT(slotSelectionEnd())); - connect( m_pDiffTextWindow1, TQT_SIGNAL(scroll(int,int)), this, TQT_SLOT(scrollDiffTextWindow(int,int))); + connect( m_pDiffVScrollBar, TQ_SIGNAL(valueChanged(int)), m_pOverview, TQ_SLOT(setFirstLine(int))); + connect( m_pDiffVScrollBar, TQ_SIGNAL(valueChanged(int)), m_pDiffTextWindow1, TQ_SLOT(setFirstLine(int))); + connect( m_pHScrollBar, TQ_SIGNAL(valueChanged2(int)), m_pDiffTextWindow1, TQ_SLOT(setFirstColumn(int))); + connect( m_pDiffTextWindow1, TQ_SIGNAL(newSelection()), this, TQ_SLOT(slotSelectionStart())); + connect( m_pDiffTextWindow1, TQ_SIGNAL(selectionEnd()), this, TQ_SLOT(slotSelectionEnd())); + connect( m_pDiffTextWindow1, TQ_SIGNAL(scroll(int,int)), this, TQ_SLOT(scrollDiffTextWindow(int,int))); m_pDiffTextWindow1->installEventFilter( this ); - connect( m_pDiffVScrollBar, TQT_SIGNAL(valueChanged(int)), m_pDiffTextWindow2, TQT_SLOT(setFirstLine(int))); - connect( m_pHScrollBar, TQT_SIGNAL(valueChanged2(int)), m_pDiffTextWindow2, TQT_SLOT(setFirstColumn(int))); - connect( m_pDiffTextWindow2, TQT_SIGNAL(newSelection()), this, TQT_SLOT(slotSelectionStart())); - connect( m_pDiffTextWindow2, TQT_SIGNAL(selectionEnd()), this, TQT_SLOT(slotSelectionEnd())); - connect( m_pDiffTextWindow2, TQT_SIGNAL(scroll(int,int)), this, TQT_SLOT(scrollDiffTextWindow(int,int))); + connect( m_pDiffVScrollBar, TQ_SIGNAL(valueChanged(int)), m_pDiffTextWindow2, TQ_SLOT(setFirstLine(int))); + connect( m_pHScrollBar, TQ_SIGNAL(valueChanged2(int)), m_pDiffTextWindow2, TQ_SLOT(setFirstColumn(int))); + connect( m_pDiffTextWindow2, TQ_SIGNAL(newSelection()), this, TQ_SLOT(slotSelectionStart())); + connect( m_pDiffTextWindow2, TQ_SIGNAL(selectionEnd()), this, TQ_SLOT(slotSelectionEnd())); + connect( m_pDiffTextWindow2, TQ_SIGNAL(scroll(int,int)), this, TQ_SLOT(scrollDiffTextWindow(int,int))); m_pDiffTextWindow2->installEventFilter( this ); - connect( m_pDiffVScrollBar, TQT_SIGNAL(valueChanged(int)), m_pDiffTextWindow3, TQT_SLOT(setFirstLine(int))); - connect( m_pHScrollBar, TQT_SIGNAL(valueChanged2(int)), m_pDiffTextWindow3, TQT_SLOT(setFirstColumn(int))); - connect( m_pDiffTextWindow3, TQT_SIGNAL(newSelection()), this, TQT_SLOT(slotSelectionStart())); - connect( m_pDiffTextWindow3, TQT_SIGNAL(selectionEnd()), this, TQT_SLOT(slotSelectionEnd())); - connect( m_pDiffTextWindow3, TQT_SIGNAL(scroll(int,int)), this, TQT_SLOT(scrollDiffTextWindow(int,int))); + connect( m_pDiffVScrollBar, TQ_SIGNAL(valueChanged(int)), m_pDiffTextWindow3, TQ_SLOT(setFirstLine(int))); + connect( m_pHScrollBar, TQ_SIGNAL(valueChanged2(int)), m_pDiffTextWindow3, TQ_SLOT(setFirstColumn(int))); + connect( m_pDiffTextWindow3, TQ_SIGNAL(newSelection()), this, TQ_SLOT(slotSelectionStart())); + connect( m_pDiffTextWindow3, TQ_SIGNAL(selectionEnd()), this, TQ_SLOT(slotSelectionEnd())); + connect( m_pDiffTextWindow3, TQ_SIGNAL(scroll(int,int)), this, TQ_SLOT(scrollDiffTextWindow(int,int))); m_pDiffTextWindow3->installEventFilter( this ); MergeResultWindow* p = m_pMergeResultWindow; - connect( m_pMergeVScrollBar, TQT_SIGNAL(valueChanged(int)), p, TQT_SLOT(setFirstLine(int))); - - connect( m_pHScrollBar, TQT_SIGNAL(valueChanged2(int)), p, TQT_SLOT(setFirstColumn(int))); - connect( p, TQT_SIGNAL(scroll(int,int)), this, TQT_SLOT(scrollMergeResultWindow(int,int))); - connect( p, TQT_SIGNAL(sourceMask(int,int)), this, TQT_SLOT(sourceMask(int,int))); - connect( p, TQT_SIGNAL( resizeSignal() ),this, TQT_SLOT(resizeMergeResultWindow())); - connect( p, TQT_SIGNAL( selectionEnd() ), this, TQT_SLOT( slotSelectionEnd() ) ); - connect( p, TQT_SIGNAL( newSelection() ), this, TQT_SLOT( slotSelectionStart() ) ); - connect( p, TQT_SIGNAL( modifiedChanged(bool) ), this, TQT_SLOT( slotOutputModified(bool) ) ); - connect( p, TQT_SIGNAL( modifiedChanged(bool) ), m_pMergeResultWindowTitle, TQT_SLOT( slotSetModified(bool) ) ); - connect( p, TQT_SIGNAL( updateAvailabilities() ), this, TQT_SLOT( slotUpdateAvailabilities() ) ); - connect( p, TQT_SIGNAL( showPopupMenu(const TQPoint&) ), this, TQT_SLOT(showPopupMenu(const TQPoint&))); - connect( p, TQT_SIGNAL( noRelevantChangesDetected() ), this, TQT_SLOT(slotNoRelevantChangesDetected())); + connect( m_pMergeVScrollBar, TQ_SIGNAL(valueChanged(int)), p, TQ_SLOT(setFirstLine(int))); + + connect( m_pHScrollBar, TQ_SIGNAL(valueChanged2(int)), p, TQ_SLOT(setFirstColumn(int))); + connect( p, TQ_SIGNAL(scroll(int,int)), this, TQ_SLOT(scrollMergeResultWindow(int,int))); + connect( p, TQ_SIGNAL(sourceMask(int,int)), this, TQ_SLOT(sourceMask(int,int))); + connect( p, TQ_SIGNAL( resizeSignal() ),this, TQ_SLOT(resizeMergeResultWindow())); + connect( p, TQ_SIGNAL( selectionEnd() ), this, TQ_SLOT( slotSelectionEnd() ) ); + connect( p, TQ_SIGNAL( newSelection() ), this, TQ_SLOT( slotSelectionStart() ) ); + connect( p, TQ_SIGNAL( modifiedChanged(bool) ), this, TQ_SLOT( slotOutputModified(bool) ) ); + connect( p, TQ_SIGNAL( modifiedChanged(bool) ), m_pMergeResultWindowTitle, TQ_SLOT( slotSetModified(bool) ) ); + connect( p, TQ_SIGNAL( updateAvailabilities() ), this, TQ_SLOT( slotUpdateAvailabilities() ) ); + connect( p, TQ_SIGNAL( showPopupMenu(const TQPoint&) ), this, TQ_SLOT(showPopupMenu(const TQPoint&))); + connect( p, TQ_SIGNAL( noRelevantChangesDetected() ), this, TQ_SLOT(slotNoRelevantChangesDetected())); sourceMask(0,0); - connect( p, TQT_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow1, TQT_SLOT(setFastSelectorRange(int,int))); - connect( p, TQT_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow2, TQT_SLOT(setFastSelectorRange(int,int))); - connect( p, TQT_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow3, TQT_SLOT(setFastSelectorRange(int,int))); - connect(m_pDiffTextWindow1, TQT_SIGNAL(setFastSelectorLine(int)), p, TQT_SLOT(slotSetFastSelectorLine(int))); - connect(m_pDiffTextWindow2, TQT_SIGNAL(setFastSelectorLine(int)), p, TQT_SLOT(slotSetFastSelectorLine(int))); - connect(m_pDiffTextWindow3, TQT_SIGNAL(setFastSelectorLine(int)), p, TQT_SLOT(slotSetFastSelectorLine(int))); - connect(m_pDiffTextWindow1, TQT_SIGNAL(gotFocus()), p, TQT_SLOT(updateSourceMask())); - connect(m_pDiffTextWindow2, TQT_SIGNAL(gotFocus()), p, TQT_SLOT(updateSourceMask())); - connect(m_pDiffTextWindow3, TQT_SIGNAL(gotFocus()), p, TQT_SLOT(updateSourceMask())); - connect(m_pDirectoryMergeInfo, TQT_SIGNAL(gotFocus()), p, TQT_SLOT(updateSourceMask())); + connect( p, TQ_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow1, TQ_SLOT(setFastSelectorRange(int,int))); + connect( p, TQ_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow2, TQ_SLOT(setFastSelectorRange(int,int))); + connect( p, TQ_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow3, TQ_SLOT(setFastSelectorRange(int,int))); + connect(m_pDiffTextWindow1, TQ_SIGNAL(setFastSelectorLine(int)), p, TQ_SLOT(slotSetFastSelectorLine(int))); + connect(m_pDiffTextWindow2, TQ_SIGNAL(setFastSelectorLine(int)), p, TQ_SLOT(slotSetFastSelectorLine(int))); + connect(m_pDiffTextWindow3, TQ_SIGNAL(setFastSelectorLine(int)), p, TQ_SLOT(slotSetFastSelectorLine(int))); + connect(m_pDiffTextWindow1, TQ_SIGNAL(gotFocus()), p, TQ_SLOT(updateSourceMask())); + connect(m_pDiffTextWindow2, TQ_SIGNAL(gotFocus()), p, TQ_SLOT(updateSourceMask())); + connect(m_pDiffTextWindow3, TQ_SIGNAL(gotFocus()), p, TQ_SLOT(updateSourceMask())); + connect(m_pDirectoryMergeInfo, TQ_SIGNAL(gotFocus()), p, TQ_SLOT(updateSourceMask())); - connect( m_pDiffTextWindow1, TQT_SIGNAL( resizeSignal(int,int) ),this, TQT_SLOT(resizeDiffTextWindow(int,int))); + connect( m_pDiffTextWindow1, TQ_SIGNAL( resizeSignal(int,int) ),this, TQ_SLOT(resizeDiffTextWindow(int,int))); // The following two connects cause the wordwrap to be recalced thrice, just to make sure. Better than forgetting one. - connect( m_pDiffTextWindow2, TQT_SIGNAL( resizeSignal(int,int) ),this, TQT_SLOT(slotRecalcWordWrap())); - connect( m_pDiffTextWindow3, TQT_SIGNAL( resizeSignal(int,int) ),this, TQT_SLOT(slotRecalcWordWrap())); + connect( m_pDiffTextWindow2, TQ_SIGNAL( resizeSignal(int,int) ),this, TQ_SLOT(slotRecalcWordWrap())); + connect( m_pDiffTextWindow3, TQ_SIGNAL( resizeSignal(int,int) ),this, TQ_SLOT(slotRecalcWordWrap())); m_pDiffTextWindow1->setFocus(); m_pMainWidget->setMinimumSize(50,50); @@ -837,7 +837,7 @@ void KDiff3App::resizeEvent(TQResizeEvent* e) bool KDiff3App::eventFilter( TQObject* o, TQEvent* e ) { - if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pMergeResultWindow) ) + if( o == m_pMergeResultWindow ) { if ( e->type() == TQEvent::KeyPress ) { // key press @@ -929,9 +929,9 @@ bool KDiff3App::eventFilter( TQObject* o, TQEvent* e ) { raise(); TQString filename = stringList.first(); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow1) ) m_sd1.setFilename( filename ); - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow2) ) m_sd2.setFilename( filename ); - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow3) ) m_sd3.setFilename( filename ); + if ( o == m_pDiffTextWindow1 ) m_sd1.setFilename( filename ); + else if ( o == m_pDiffTextWindow2 ) m_sd2.setFilename( filename ); + else if ( o == m_pDiffTextWindow3 ) m_sd3.setFilename( filename ); init(); } #else @@ -941,9 +941,9 @@ bool KDiff3App::eventFilter( TQObject* o, TQEvent* e ) { raise(); FileAccess fa( urlList.first().url() ); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow1) ) m_sd1.setFileAccess( fa ); - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow2) ) m_sd2.setFileAccess( fa ); - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow3) ) m_sd3.setFileAccess( fa ); + if ( o == m_pDiffTextWindow1 ) m_sd1.setFileAccess( fa ); + else if ( o == m_pDiffTextWindow2 ) m_sd2.setFileAccess( fa ); + else if ( o == m_pDiffTextWindow3 ) m_sd3.setFileAccess( fa ); init(); } #endif @@ -955,9 +955,9 @@ bool KDiff3App::eventFilter( TQObject* o, TQEvent* e ) if ( bDecodeSuccess && canContinue() ) { raise(); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow1) ) m_sd1.setData(text); - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow2) ) m_sd2.setData(text); - else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow3) ) m_sd3.setData(text); + if ( o == m_pDiffTextWindow1 ) m_sd1.setData(text); + else if ( o == m_pDiffTextWindow2 ) m_sd2.setData(text); + else if ( o == m_pDiffTextWindow3 ) m_sd3.setData(text); init(); } } @@ -995,7 +995,7 @@ void KDiff3App::slotFileOpen() TQDir::convertSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameC() : m_sd3.isFromBuffer() ? TQString("") : m_sd3.getAliasName() ), m_bDirCompare ? ! m_pDirectoryMergeWindow->getDirNameDest().isEmpty() : !m_outputFilename.isEmpty(), TQDir::convertSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameDest() : m_bDefaultFilename ? TQString("") : m_outputFilename ), - TQT_SLOT(slotConfigure()), m_pOptionDialog ); + TQ_SLOT(slotConfigure()), m_pOptionDialog ); /*OpenDialog d(this, m_sd1.isFromBuffer() ? TQString("") : m_sd1.getAliasName(), @@ -1003,7 +1003,7 @@ void KDiff3App::slotFileOpen() m_sd3.isFromBuffer() ? TQString("") : m_sd3.getAliasName(), !m_outputFilename.isEmpty(), m_bDefaultFilename ? TQString("") : m_outputFilename, - TQT_SLOT(slotConfigure()), m_pOptionDialog );*/ + TQ_SLOT(slotConfigure()), m_pOptionDialog );*/ int status = d.exec(); if ( status == TQDialog::Accepted ) { @@ -1296,7 +1296,7 @@ void KDiff3App::choose( int choice ) if ( autoAdvance->isChecked() ) { m_bTimerBlock = true; - TQTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, TQT_SLOT( slotGoNextUnsolvedConflict() ) ); + TQTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, TQ_SLOT( slotGoNextUnsolvedConflict() ) ); } } } @@ -1434,7 +1434,7 @@ void KDiff3App::slotRefresh() } if ( m_pDiffWindowSplitter!=0 ) { - m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Qt::Horizontal : Qt::Vertical ); + m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? TQt::Horizontal : TQt::Vertical ); } if ( m_pDirectoryMergeWindow ) { @@ -1447,11 +1447,11 @@ void KDiff3App::slotSelectionStart() //editCopy->setEnabled( false ); //editCut->setEnabled( false ); - const TQObject* s = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); - if (m_pDiffTextWindow1 && TQT_BASE_OBJECT_CONST(s)!=TQT_BASE_OBJECT(m_pDiffTextWindow1)) m_pDiffTextWindow1->resetSelection(); - if (m_pDiffTextWindow2 && TQT_BASE_OBJECT_CONST(s)!=TQT_BASE_OBJECT(m_pDiffTextWindow2)) m_pDiffTextWindow2->resetSelection(); - if (m_pDiffTextWindow3 && TQT_BASE_OBJECT_CONST(s)!=TQT_BASE_OBJECT(m_pDiffTextWindow3)) m_pDiffTextWindow3->resetSelection(); - if (m_pMergeResultWindow && TQT_BASE_OBJECT_CONST(s)!=TQT_BASE_OBJECT(m_pMergeResultWindow)) m_pMergeResultWindow->resetSelection(); + const TQObject* s = sender(); + if (m_pDiffTextWindow1 && s!=m_pDiffTextWindow1) m_pDiffTextWindow1->resetSelection(); + if (m_pDiffTextWindow2 && s!=m_pDiffTextWindow2) m_pDiffTextWindow2->resetSelection(); + if (m_pDiffTextWindow3 && s!=m_pDiffTextWindow3) m_pDiffTextWindow3->resetSelection(); + if (m_pMergeResultWindow && s!=m_pMergeResultWindow) m_pMergeResultWindow->resetSelection(); } void KDiff3App::slotSelectionEnd() @@ -2032,10 +2032,10 @@ void KDiff3App::slotWinToggleSplitterOrientation() if ( m_pDiffWindowSplitter!=0 ) { m_pDiffWindowSplitter->setOrientation( - m_pDiffWindowSplitter->orientation()==Qt::Vertical ? Qt::Horizontal : Qt::Vertical + m_pDiffWindowSplitter->orientation()==TQt::Vertical ? TQt::Horizontal : TQt::Vertical ); - m_pOptionDialog->m_bHorizDiffWindowSplitting = m_pDiffWindowSplitter->orientation()==Qt::Horizontal; + m_pOptionDialog->m_bHorizDiffWindowSplitting = m_pDiffWindowSplitter->orientation()==TQt::Horizontal; } } diff --git a/src/smalldialogs.cpp b/src/smalldialogs.cpp index b27aed5..1fc361a 100644 --- a/src/smalldialogs.cpp +++ b/src/smalldialogs.cpp @@ -57,10 +57,10 @@ OpenDialog::OpenDialog( m_pLineA->setEditText( KURL(n1).prettyURL() ); m_pLineA->setMinimumSize( 200, m_pLineA->size().height() ); TQPushButton * button = new TQPushButton( i18n("File..."), this ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectFileA() ) ); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectFileA() ) ); TQPushButton * button2 = new TQPushButton( i18n("Dir..."), this ); - connect( button2, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectDirA() ) ); - connect( m_pLineA, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(inputFilenameChanged() ) ); + connect( button2, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectDirA() ) ); + connect( m_pLineA, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(inputFilenameChanged() ) ); h->addWidget( label, 0, 0 ); h->addWidget( m_pLineA, 0, 1 ); @@ -73,10 +73,10 @@ OpenDialog::OpenDialog( m_pLineB->setEditText( KURL(n2).prettyURL() ); m_pLineB->setMinimumSize( 200, m_pLineB->size().height() ); button = new TQPushButton( i18n("File..."), this ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectFileB() ) ); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectFileB() ) ); button2 = new TQPushButton( i18n("Dir..."), this ); - connect( button2, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectDirB() ) ); - connect( m_pLineB, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(inputFilenameChanged() ) ); + connect( button2, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectDirB() ) ); + connect( m_pLineB, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(inputFilenameChanged() ) ); h->addWidget( label, 1, 0 ); h->addWidget( m_pLineB, 1, 1 ); @@ -89,10 +89,10 @@ OpenDialog::OpenDialog( m_pLineC->setEditText( KURL(n3).prettyURL() ); m_pLineC->setMinimumSize( 200, m_pLineC->size().height() ); button = new TQPushButton( i18n("File..."), this ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectFileC() ) ); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectFileC() ) ); button2 = new TQPushButton( i18n("Dir..."), this ); - connect( button2, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectDirC() ) ); - connect( m_pLineC, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(inputFilenameChanged() ) ); + connect( button2, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectDirC() ) ); + connect( m_pLineC, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(inputFilenameChanged() ) ); h->addWidget( label, 2, 0 ); h->addWidget( m_pLineC, 2, 1 ); @@ -120,7 +120,7 @@ OpenDialog::OpenDialog( m->insertItem( i18n("Swap %1<->Output").arg("A"), id++ ); m->insertItem( i18n("Swap %1<->Output").arg("B"), id++ ); m->insertItem( i18n("Swap %1<->Output").arg("C"), id++ ); - connect( m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSwapCopyNames(int))); + connect( m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSwapCopyNames(int))); button->setPopup(m); @@ -132,13 +132,13 @@ OpenDialog::OpenDialog( m_pLineOut->setEditText( KURL(outputName).prettyURL() ); m_pLineOut->setMinimumSize( 200, m_pLineOut->size().height() ); button = new TQPushButton( i18n("File..."), this ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectOutputName() ) ); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectOutputName() ) ); button2 = new TQPushButton( i18n("Dir..."), this ); - connect( button2, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectOutputDir() ) ); - connect( m_pMerge, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(internalSlot(int)) ); - connect( this, TQT_SIGNAL(internalSignal(bool)), m_pLineOut, TQT_SLOT(setEnabled(bool)) ); - connect( this, TQT_SIGNAL(internalSignal(bool)), button, TQT_SLOT(setEnabled(bool)) ); - connect( this, TQT_SIGNAL(internalSignal(bool)), button2, TQT_SLOT(setEnabled(bool)) ); + connect( button2, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectOutputDir() ) ); + connect( m_pMerge, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(internalSlot(int)) ); + connect( this, TQ_SIGNAL(internalSignal(bool)), m_pLineOut, TQ_SLOT(setEnabled(bool)) ); + connect( this, TQ_SIGNAL(internalSignal(bool)), button, TQ_SLOT(setEnabled(bool)) ); + connect( this, TQ_SIGNAL(internalSignal(bool)), button2, TQ_SLOT(setEnabled(bool)) ); m_pMerge->setChecked( !bMerge ); m_pMerge->setChecked( bMerge ); @@ -156,18 +156,18 @@ OpenDialog::OpenDialog( TQHBoxLayout* l = new TQHBoxLayout( v, 5 ); button = new TQPushButton( i18n("Configure..."), this ); - connect( button, TQT_SIGNAL(clicked()), pParent, slotConfigure ); + connect( button, TQ_SIGNAL(clicked()), pParent, slotConfigure ); l->addWidget( button, 1 ); l->addStretch(1); button = new TQPushButton( i18n("&OK"), this ); button->setDefault( true ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( accept() ) ); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( accept() ) ); l->addWidget( button, 1 ); button = new TQPushButton( i18n("&Cancel"), this ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( reject() ) ); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( reject() ) ); l->addWidget( button,1 ); TQSize sh = sizeHint(); @@ -200,8 +200,8 @@ bool OpenDialog::eventFilter(TQObject* o, TQEvent* e) if ( lst.count() > 0 ) { - static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setText( lst[0] ); - static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setFocus(); + static_cast<TQLineEdit*>(o)->setText( lst[0] ); + static_cast<TQLineEdit*>(o)->setFocus(); } return true; @@ -376,11 +376,11 @@ FindDialog::FindDialog(TQWidget* pParent) TQPushButton* pButton = new TQPushButton( i18n("&Search"), this ); layout->addWidget( pButton, line, 0 ); - connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); + connect( pButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); pButton = new TQPushButton( i18n("&Cancel"), this ); layout->addWidget( pButton, line, 1 ); - connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect( pButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); hide(); } @@ -399,7 +399,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo TQToolTip::add( l, autoMergeRegExpToolTip ); m_pAutoMergeRegExpEdit = new TQLineEdit(this); pGrid->addWidget(m_pAutoMergeRegExpEdit,line,1); - connect( m_pAutoMergeRegExpEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc())); + connect( m_pAutoMergeRegExpEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc())); ++line; l = new TQLabel(i18n("Example auto merge line:"), this); @@ -407,7 +407,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo TQToolTip::add( l, i18n("For auto merge test copy a line as used in your files.") ); m_pAutoMergeExampleEdit = new TQLineEdit(this); pGrid->addWidget(m_pAutoMergeExampleEdit,line,1); - connect( m_pAutoMergeExampleEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc())); + connect( m_pAutoMergeExampleEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc())); ++line; l = new TQLabel(i18n("Match result:"), this); @@ -426,7 +426,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo TQToolTip::add( l, historyStartRegExpToolTip ); m_pHistoryStartRegExpEdit = new TQLineEdit(this); pGrid->addWidget(m_pHistoryStartRegExpEdit,line,1); - connect( m_pHistoryStartRegExpEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc())); + connect( m_pHistoryStartRegExpEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc())); ++line; l = new TQLabel(i18n("Example history start line (with leading comment):"), this); @@ -436,7 +436,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo "including the leading comment.") ); m_pHistoryStartExampleEdit = new TQLineEdit(this); pGrid->addWidget(m_pHistoryStartExampleEdit,line,1); - connect( m_pHistoryStartExampleEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc())); + connect( m_pHistoryStartExampleEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc())); ++line; l = new TQLabel(i18n("Match result:"), this); @@ -455,7 +455,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo TQToolTip::add( l, historyEntryStartRegExpToolTip ); m_pHistoryEntryStartRegExpEdit = new TQLineEdit(this); pGrid->addWidget(m_pHistoryEntryStartRegExpEdit,line,1); - connect( m_pHistoryEntryStartRegExpEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc())); + connect( m_pHistoryEntryStartRegExpEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc())); ++line; l = new TQLabel(i18n("History sort key order:"), this); @@ -463,7 +463,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo TQToolTip::add( l, historySortKeyOrderToolTip ); m_pHistorySortKeyOrderEdit = new TQLineEdit(this); pGrid->addWidget(m_pHistorySortKeyOrderEdit,line,1); - connect( m_pHistorySortKeyOrderEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc())); + connect( m_pHistorySortKeyOrderEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc())); ++line; l = new TQLabel(i18n("Example history entry start line (without leading comment):"), this); @@ -473,7 +473,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo ++line; m_pHistoryEntryStartExampleEdit = new TQLineEdit(this); pGrid->addWidget(m_pHistoryEntryStartExampleEdit,line,1); - connect( m_pHistoryEntryStartExampleEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc())); + connect( m_pHistoryEntryStartExampleEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc())); ++line; l = new TQLabel(i18n("Match result:"), this); @@ -492,11 +492,11 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo TQPushButton* pButton = new TQPushButton(i18n("OK"), this); pGrid->addWidget(pButton,line,0); - connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); + connect( pButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); pButton = new TQPushButton(i18n("Cancel"), this); pGrid->addWidget(pButton,line,1); - connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect( pButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); resize( 800, sizeHint().height() ); } diff --git a/src/smalldialogs.h b/src/smalldialogs.h index da7c671..026023a 100644 --- a/src/smalldialogs.h +++ b/src/smalldialogs.h @@ -32,7 +32,7 @@ class TQLabel; class OpenDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: OpenDialog( @@ -69,7 +69,7 @@ signals: class FindDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: FindDialog(TQWidget* pParent); @@ -93,7 +93,7 @@ public: class RegExpTester : public TQDialog { - Q_OBJECT + TQ_OBJECT private: TQLineEdit* m_pAutoMergeRegExpEdit; diff --git a/translations/desktop_files/ru.po b/translations/desktop_files/ru.po index e18eb98..c1a2321 100644 --- a/translations/desktop_files/ru.po +++ b/translations/desktop_files/ru.po @@ -1,35 +1,37 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-28 10:45+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-11-29 11:13+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/kdiff3-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kdiff3plugin/kdiff3_plugin.desktop:4 msgid "Compare/Merge Files/Directories" -msgstr "" +msgstr "Сравнить/объединить файлы или каталоги" #. Name #: kdiff3plugin/kdiff3plugin.desktop:4 msgid "Compare/Merge Files/Directories with KDiff3" -msgstr "" +msgstr "Сравнить/объединить файлы или каталоги через KDiff3" #. Name #: src/kdiff3.desktop:3 msgid "KDiff3" -msgstr "" +msgstr "KDiff3" #. GenericName #: src/kdiff3.desktop:5 @@ -44,4 +46,4 @@ msgstr "Утилита сравнения и объединения файлов #. Name #: src/kdiff3part.desktop:3 msgid "KDiff3Part" -msgstr "" +msgstr "KDiff3Part" diff --git a/translations/messages/kdiff3/ar.po b/translations/messages/kdiff3/ar.po index b3195b6..cb854d3 100644 --- a/translations/messages/kdiff3/ar.po +++ b/translations/messages/kdiff3/ar.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2006-12-03 19:06+0100\n" "Last-Translator: محمد سعد Mohamed SAAD <metehyi@free.fr>\n" "Language-Team: Arabic <doc@arabeyes.org>\n" @@ -26,11 +26,11 @@ msgid "" "Your emails" msgstr "metehyi@free.fr" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "فشل كتابة بيانات الحافظة إلى الملف المؤقت." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "من الحافظة" @@ -67,11 +67,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "خطأ داخلي فادح" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "السطر الأعلى" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "النهاية" @@ -103,218 +103,218 @@ msgstr "فشل فتح %1." msgid "Comparing file..." msgstr "جاري مقارنة الملف..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "خطأ عند القراءة من %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "الإسم" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "العملية" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "الحالة" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "أبيض" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "إعادة المسح" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "فشل فتح المجلّدات:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "الدليل A \"%1\" غير موجود أو هو ليس دليل.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "الدليل B \"%1\" غير موجود أو هو ليس دليل.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "الدليل C \"%1\" غير موجود أو هو ليس دليل.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "خطأ فتح الدليل" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "تحذير بشأن الضوابط" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "جاري مسح المجلّدات...." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "قراءة الدليل A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "قراءة الدليل B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "قراءة الدليل C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "إفحص الأذون للمجلّدات الفرعية." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "جاهز." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "حالة مقارنة المجلّدات" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "عدد المجلّدات الفرعية:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "عدد الملفات المتساوية:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "عدد الملفات المختلفة:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&تابع" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "جاري الإجراء " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "واجب العمل." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "أنسخ A إلى B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "أنسخ B إلى A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "أمحي A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "أمحي B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "أمحي A و B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "أمحي ( إذا كان موجود )" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "هذه العملية ليست ممكنة حالياً." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "العملية غير ممكنة" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -323,40 +323,40 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "خطأ في البرنامج" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "حصل خطأ عند النسخ.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "خطأ." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "إنتهيت." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "غير محفوظ." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -368,306 +368,306 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "إفعله" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "تابع بلبند الأخير" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "جاري..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "حصل خطأ. إضغط موافق لترى المعلومات المفصلة.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "نسخ( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "إعادة تسمية( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "خطأ: فشلت إعادة التسمية." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "خطأ عند إنشاء الدليل." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "الهدف" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "الدليل" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "النوع" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "الحجم" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "آخر تغيير" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "غير متوفر" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "الهدف: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "نفّذ العملية للبند الحالي" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "قارن الملفات المختارة" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "عملية إختيار تلقائية لكل البنود" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "لا عملية لكل البنود" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "أعرض الملفات المتشابهة" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "أعرض الملفات المختلفة" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "أعرض الملفات فقط في أ" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "أعرض الملفات فقط في ب" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "أعرض الملفات فقط في س" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "لا تفعل أي شيئ" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "أ" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "ب" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "س" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "أمحي أ و ب" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "" diff --git a/translations/messages/kdiff3/az.po b/translations/messages/kdiff3/az.po index d0174b3..baf3124 100644 --- a/translations/messages/kdiff3/az.po +++ b/translations/messages/kdiff3/az.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2004-03-15 21:45+0200\n" "Last-Translator: Mətin Əmirov <metin@karegen.com>\n" "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n" @@ -27,11 +27,11 @@ msgid "" "Your emails" msgstr "metin@karegen.com" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "" @@ -63,11 +63,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Son" @@ -100,218 +100,218 @@ msgstr "" msgid "Comparing file..." msgstr "Quraşdır..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Ad" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Əməliyyat" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Vəziyyət" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Hazırdır." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -320,40 +320,40 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Xəta." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Qurtardı." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -365,306 +365,306 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Növ" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Böyüklük" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "" diff --git a/translations/messages/kdiff3/bg.po b/translations/messages/kdiff3/bg.po index e60ab76..da9ab8f 100644 --- a/translations/messages/kdiff3/bg.po +++ b/translations/messages/kdiff3/bg.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2006-11-16 23:19+0200\n" "Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n" "Language-Team: Bulgarian <dict@linux.zonebg.com>\n" @@ -26,12 +26,12 @@ msgid "" "Your emails" msgstr "krasimira_m@yahoo.com" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "" "Записът на данните от системния буфер във временния файл беше неуспешен." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "От системния буфер" @@ -78,11 +78,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "Сериозна вътрешна грешка" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "Най-горна линия" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Край" @@ -114,40 +114,40 @@ msgstr "Отварянето на %1 беше неуспешно." msgid "Comparing file..." msgstr "Сравняване на файл..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Грешка по време на четене от %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Име" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Действие" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Статус" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Нерешен" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Решен" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Запълнено" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Празно" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -155,35 +155,35 @@ msgstr "" "В момента извършвате сливане на директория. Сигурни ли сте, че искате да " "прекъснете сливането и да сканирате отново директорията?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Ново сканиране" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Продължение на сливането" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Отварянето на директориите беше неуспешно:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Директория А \"%1\" не съществува или не е директория.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Директория Б \"%1\" не съществува или не е директория.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Директория В \"%1\" не съществува или не е директория.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Грешка при отваряне на директория" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -193,144 +193,144 @@ msgstr "" "същата като А или Б.\n" "Проверете отново преди да продължите." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Предупреждение за параметър" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Сканиране на директориите..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Четене на директория А" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Четене на директория Б" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Четене на директория В" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Някои от поддиректориите са нечетими" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Проверете правата на поддиректориите." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "В готовност." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Статус на сравняването на директории" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Бройка на поддиректориите:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Бройка на еднаквите файлове:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Бройка на различните файлове:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Бройка на ръчните сливания:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Това засяга всички операции по сливане." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Промяна на всички операции по сливане" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Продължение" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Обработка " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Задача." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Копиране на А в Б" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Копиране на Б в А" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Изтриване на А" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Изтриване на Б" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Изтриване на А и Б" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Сливане с А" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Сливане с Б" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Сливане с А и Б" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Изтриване (ако съществува)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Сливане" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Сливане (ръчно)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Грешка: Конфликт в типовете на файлове" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Грешка: Датите са еднакви, но файловете не са." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Това действие в момента не е възможно." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Действието не е възможно" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -345,40 +345,40 @@ msgstr "" "Ако знаете как да го направите отново, моля, свържете се с автора на " "програмата." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Програмна грешка" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Възникна грешка по време на копирането.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Грешка при сливане" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Грешка." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Изпълнено." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Не е записан." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Непозната операция за сливане. (Това не трябва да се случва никога!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Непозната операция за сливане." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -397,19 +397,19 @@ msgstr "" "Имайте предвид, че тази програма е все още бета версия и изобщо НЯМА " "ГАРАНЦИЯ! Правете резервни копия на важната информация!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Стартиране на сливането" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Изпълнение" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Симулация" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -417,7 +417,7 @@ msgstr "" "Осветеният елемент има различни типове в различните директории. Изберете " "какво да се направи." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -425,7 +425,7 @@ msgstr "" "Датите на последна промяна на файловете са еднакви, но файловете не са. " "Изберете какво да се направи." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -433,7 +433,7 @@ msgstr "" "В момента действието е невъзможно, тъй като тече процес на сливане на " "директории." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -443,286 +443,286 @@ msgstr "" "Искате ли да продължите с елемента, който е причинил тази грешка или ще го " "прескочите?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Продължаване на сливането след грешката" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Продължаване с последния елемент" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Прескачане на елемент" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Прескочен." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "Изпълнява се..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Операцията по сливане завърши." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Сливането завърши" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Симулацията на сливане завърши: Проверете дали сте съгласни с предложените " "действия." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" "Възникнала е грешка. Натиснете \"ОК\", за да видите подробна информация.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Грешка: По време на изтриването на %1: Създаването на резервно копие беше " "неуспешно." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "рекурсивно изтриване на директория( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "изтриване( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Грешка: операцията по изтриване беше неуспешна при опит за четене на " "директорията." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Грешка: операцията по изтриване на директория( %1 ) беше неуспешна." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Грешка: операцията по изтриване беше неуспешна." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ръчно сливане( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Забележка: След ръчно сливане, потребителят трябва да натисне клавиш " "F7, за да продължи." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Грешка: копирането на ( %1 -> %2 ) беше неуспешно. Изтриването на " "съществуващото местоназначение е неуспешно." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "копиране на препратка( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Грешка: копирането на препратка беше неуспешно: Отдалечени препратки не се " "поддържат." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Грешка: копирането на препратка беше неуспешно." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "копиране( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Грешка по време на преименуване( %1 -> %2 ): Изтриването на съществуващото " "местоназначение беше неуспешно." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "преименуване( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Грешка: Преименуването беше неуспешно." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Грешка по време на създаване на директория %1. Не може да се изтрие " "съществуващ файл." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "създаване на директория( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Грешка по време на създаване на директория." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Местоназначение" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Директория" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Тип" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Размер" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Атрибути" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Последна промяна" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Местоназначение на препратката" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "не е наличен" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "А (местоназначение): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "А (база): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "Б (местоназначение): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "В (местоназначение): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Местоназначение: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "Запис състоянието при сливане като..." -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Стартиране/Продължение на сливането на директория" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Стартиране на операцията за текущия елемент" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Сравняване на маркираните файлове" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Сливане на текущия файл" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Скриване на всички поддиректории" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Показване на всички поддиректории" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Изберете А за всички елементи" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Изберете Б за всички елементи" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Изберете В за всички елементи" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Автоматично избиране на операция за всички елементи" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Без операция за всички елементи" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "Показване на идентични файлове" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "Показване на различните файлове" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "Показване на файлове само в A" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "Показване на файлове само в B" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "Показване на файлове само в C" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "Сравняване на маркираните файлове" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "Сливане на маркираните файлове" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Да не се прави нищо" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "А" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "Б" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "В" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Изтриване на А и Б" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Сливане в А и Б" diff --git a/translations/messages/kdiff3/br.po b/translations/messages/kdiff3/br.po index 49d9bc2..1509240 100644 --- a/translations/messages/kdiff3/br.po +++ b/translations/messages/kdiff3/br.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeextragear-1/kdiff3.po\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n" "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n" "Language-Team: br <LL@li.org>\n" @@ -24,11 +24,11 @@ msgid "" "Your emails" msgstr "tvignaud@mandriva.com, jdrapier@club-internet.fr" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Eus ar golver" @@ -60,11 +60,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "Fazi diabarzh grevus" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Dibenn" @@ -96,218 +96,218 @@ msgstr "Sac'het eo digeiñ ar restr %1." msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Fazi en ur less eus %1." -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Anv" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Ober" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Stad" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Gwenn" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Sac'het eo digeriñ ar renkelloù :" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Fazi en ur zigeriñ ar renkell" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Emaon o tielfennañ ar renkelloù ..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Emaon o lenn ar renkell A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Emaon o lenn ar renkell B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Emaon o lenn ar renkell C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Prest." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Niver a is-renkelloù :" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Kenderc'hel" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "O treterez " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Traoù d'ober." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Eilañ A da B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Eilañ B da A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Lemel A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Lemel B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Lemel A & B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Dastum" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -316,40 +316,40 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Fazi gant ar meziant" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Degouezhet ez eus ar fazi en ur eilañ.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Fazi en ur dastum" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Fazi." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Graet." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "N'eo ket enrollet." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -361,306 +361,306 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Tremen an dra" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Tremenet." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "Ober a ran ..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Degouezhet ez eus ar fazi. Gwaskit OK da welet an titouroù munut.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "dilemel( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Fazi : sac'het eo lemel." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "eilañ( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "adenvel( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Fazi en ur c'hrouiñ ur renkell." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Dehaez." -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Renkell" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Seurt" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Ment" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Kemm diwezhañ" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Liamm dehaezadur" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "n'eo ket da gaout" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Dehaez. : " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "Diskouez restroù a zo e A hepken" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "Diskouez restroù a zo e B hepken" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "Diskouez restroù a zo e C hepken" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Ober netra" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "G" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Lemel A && B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "" diff --git a/translations/messages/kdiff3/ca.po b/translations/messages/kdiff3/ca.po index 87093b0..be8c67d 100644 --- a/translations/messages/kdiff3/ca.po +++ b/translations/messages/kdiff3/ca.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -22,11 +22,11 @@ msgid "" "Your emails" msgstr "" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "" @@ -58,11 +58,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "" @@ -94,218 +94,218 @@ msgstr "" msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "" -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -314,40 +314,40 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "" -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "" -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -359,306 +359,306 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "" diff --git a/translations/messages/kdiff3/cs.po b/translations/messages/kdiff3/cs.po index 4917c69..a99fff7 100644 --- a/translations/messages/kdiff3/cs.po +++ b/translations/messages/kdiff3/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2007-01-25 19:58+0100\n" "Last-Translator: Klára Cihlářová <koty@seznam.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -29,11 +29,11 @@ msgid "" "Your emails" msgstr "koty@seznam.cz,jfriedl@suse.cz" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "Zápis dat schránky do dočasného souboru selhal." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Ze schránky" @@ -67,11 +67,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "Závažná interní chyba" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Konec" @@ -103,74 +103,74 @@ msgstr "Otevření %1 selhalo." msgid "Comparing file..." msgstr "Porovnání souborů..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Chyba čtení z %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Jméno" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Operace" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Stav" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Nevyřešeno" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Vyřešeno" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Nebílý" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Bílá" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Znovu prohledat" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Pokračovat se slučováním" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Otvírání adresářů selhalo:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Adresář A \"%1\" neexistuje nebo není adresářem.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Adresář B \"%1\" neexistuje nebo není adresářem.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Adresář C \"%1\" neexistuje nebo není adresářem.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Chyba otvírání adresáře" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -179,144 +179,144 @@ msgstr "" "Cílový adresář nesmí být při slučování tří adresářů shodný s A nebo B.\n" "Před pokračováním proveďte kontrolu." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Prohledávání adresářů..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Čtení adresáře A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Čtení adresáře B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Čtení adresáře C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Některé podadresáře byly nečitelné v" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Zkontrolujte oprávnění podadresářů." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Připraven." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Stav porovnání adresářů" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Počet podadresářů:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Počet shodných souborů:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Počet rozdílných souborů:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Počet ručních sloučení:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Toto ovlivňuje všechna slučování." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "P&okračovat" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Zpracovávání " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Udělat." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Zkopírovat A do B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Zkopírovat B do A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Smazat A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Smazat B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Smazat A a B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Sloučit do A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Sloučit do B" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Sloučit do A a B" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Smazat (pokud existuje)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Sloučit" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Sloučit (ručně)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Chyba: Konflikt typů souborů" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Chyba: Data jsou shodná ale soubory nikoliv." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Tato operace není nyní možná." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Operace není možná" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -330,40 +330,40 @@ msgstr "" "\n" "Pokud tuto situaci umíte reprodukovat, kontaktujte prosím autora programu." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Chyba programu" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Během kopírování se stala chyba.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Chyba slučování" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Chyba." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Hotovo." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Neuloženo." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Neznámá slučovací operace. (Toto se nesmí nikdy stát!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Neznámá slučovací operace." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -375,306 +375,306 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Pokračovat se slučováním po chybě" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Přeskočit položku" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Přeskočeno." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Slučování dokončeno" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Velikost" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "nedostupný" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "Zobrazit rozdílné soubory" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Nedělat nic" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "" diff --git a/translations/messages/kdiff3/cy.po b/translations/messages/kdiff3/cy.po index c7a88d4..350ea43 100644 --- a/translations/messages/kdiff3/cy.po +++ b/translations/messages/kdiff3/cy.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: ../cy/messages//kdeextragear-1/kdiff3.po\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n" "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n" "Language-Team: cy <LL@li.org>\n" @@ -22,11 +22,11 @@ msgid "" "Your emails" msgstr "kyfieithu@dotmon.com" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "" @@ -58,11 +58,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Diwedd" @@ -95,218 +95,218 @@ msgstr "" msgid "Comparing file..." msgstr "Yn cadw ffeil..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Enw" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Gweithrediad" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Cyflwr" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Gwyn" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Ailsyllu" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Parod." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Mynd ymlaen" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Cyfuno" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -315,40 +315,40 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Gwall." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Wedi'i wneud." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -360,306 +360,306 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Math" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Maint" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "dim ar gael" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "" diff --git a/translations/messages/kdiff3/da.po b/translations/messages/kdiff3/da.po index 8f41faa..c3b96f6 100644 --- a/translations/messages/kdiff3/da.po +++ b/translations/messages/kdiff3/da.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2006-11-16 08:18-0500\n" "Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -28,11 +28,11 @@ msgid "" "Your emails" msgstr "erik@binghamton.edu" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "Skrivning af klippebordsdata til midlertidig fil mislykkedes." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Fra klippebord" @@ -77,11 +77,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "Alvorlig intern fejl" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "Toplinje" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Slut" @@ -113,40 +113,40 @@ msgstr "Åbning af %1 mislykkedes." msgid "Comparing file..." msgstr "Sammenligner fil..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Fejl ved læsning fra %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Navn" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Operation" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Uløst" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Løst" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Ikke-hvid" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Hvid" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -154,35 +154,35 @@ msgstr "" "Du er ved at udføre en mappeindfletning. Er du sikker på at du ønsker at " "afbryde indfletningen og skanne mappen igen?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Genskan" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Fortsæt med indfletning" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Det mislykkedes at åbne mapper:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Mappen A \"%1\" eksisterer ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Mappen B \"%1\" eksisterer ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Mappen C \"%1\" eksisterer ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Fejl ved åbning af mappe" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -192,144 +192,144 @@ msgstr "" "sammen.\n" "Tjek igen før du fortsætter." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Parameteradvarsel" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Skanner mapper..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Læser mappen A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Læser mappen B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Læser mappen C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Nogle undermapper kunne ikke læses i" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Tjek tilladelser for undermapperne." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Klar." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Status for mappesammenligning" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Antal undermapper:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Antal ens filer:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Antal forskellige filer:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Antal manuelle indfletninger:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Dette påvirker alle indfletningsoperationer." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Ændrer alle indfletningsoperationer" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Fortsæt" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Behandler" -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "At gøre." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Kopiér A til B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Kopiér B til A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Slet A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Slet B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Slet A & B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Indflet til A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Indflet til B" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Indflet til A & B" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Slet (hvis det eksisterer)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Indflet" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Indflet (manuelt)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Fejl: Filtyper i konflikt" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Fejl: Datoer er ens men filer er ikke." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Denne operation er ikke mulig for øjeblikket." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Operation ikke mulig" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -343,40 +343,40 @@ msgstr "" "\n" "Hvis du ved hvordan dette kan reproduceres, så kontakt programmets forfatter." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Programfejl" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Der opstod en fejl mens der kopieredes.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Indfletningsfejl" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Fejl." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Færdig." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Ikke gemt." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Ukendt indfletningsoperation. (Dette skulle ikke kunne ske!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Ukendt indfletningsoperation." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -395,19 +395,19 @@ msgstr "" "Vær klar over at dette program stadig har beta-status og der er INGEN " "GARANTI overhovedet! Lav sikkerhedskopier af dine vitale data!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Starter indfletning" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Gør det" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Simulér det" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -415,7 +415,7 @@ msgstr "" "Det frem,hævede punkt har forskellig type i de forskellige mapper. Vælg hvad " "der skal gøres." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -423,7 +423,7 @@ msgstr "" "Ændringsdatoerne for filerne er ens, men filerne er ikke ens. Vælg hvad der " "skal gøres." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -431,7 +431,7 @@ msgstr "" "Denne operation er ikke mulig lige nu da mappe-indfletningen kører for " "øjeblikket." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -441,274 +441,274 @@ msgstr "" "Ønsker du at fortsætte punktet der forårsagede fejlen eller ønsker du at " "springe over dette punkt?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Fortsæt med indfletning efter en fejl" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Fortsæt med det sidste punkt" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Spring over punkt" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Sprunget over." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "I fremgang..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Indfletningsoperation færdig." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Indfletning færdig" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Simuleret indfletning færdig: Tjek om du er enig i de foreslåede operationer." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Der opstod en fejl. Tryk på o.k. for at se detaljeret information.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "Fejl: Under sletning af %1: Det mislykkedes at lave sikkerhedskopi." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "slet mappe rekursivt( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "slet( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Fejl: 'slet mappe'-operation mislykkedes under forsøget på at læse mappen." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Fejl: rmdir( %1 ) operation mislykkedes." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Fejl: slet-operation mislykkedes." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "manuel indfletning( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Bemærk: Efter en manuel indfletning skal brugeren fortsætte ved at " "trykke på F7." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Fejl: copy( %1 -> %2 ) mislykkedes. Sletning af eksisterende mål mislykkedes." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Fejl: copyLink mislykkedes: Eksterne link er endnu ikke understøttede." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Fejl: copyLink mislykkedes." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Fejl under rename( %1 -> %2 ): Kan ikke slette eksisterende mål." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Fejl: Omdøbning mislykkedes." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Fejl ved makeDir af %1. Kan ikke slette eksisterende fil." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Fejl ved oprettelse af mappe." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Mål" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Mappe" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Størrelse" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Sidste ændring" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Link-destination" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "ikke tilgængelig" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (Basis): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "Gem tilstand for mappesammenfletning som..." -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Start/Fortsæt mappeindfletning" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Kør operation for dette punkt" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Sammenlign udvalgt fil" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Indflet udvalgt fil" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Fold alle undermapper sammen" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Fold alle undermapper ud" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Vælg A for alle punkter" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Vælg B for alle punkter" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Vælg C for alle punkter" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Auto-vælg operation for alle punkter" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Ingen operation for alle punkter" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "Vis identiske filer" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "Vis forskellige filer" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "Vis kun filer i A" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "Vis kun filer i B" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "Vis kun filer i C" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "Sammenlign eksplicit markerede filer" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "Sammenflet eksplicit markerede filer" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Gør intet" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Slet A && B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Indflet til A && B" diff --git a/translations/messages/kdiff3/de.po b/translations/messages/kdiff3/de.po index 8ca1b98..378f576 100644 --- a/translations/messages/kdiff3/de.po +++ b/translations/messages/kdiff3/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2019-12-22 22:59+0000\n" "Last-Translator: Chris <xchrisx@uber.space>\n" "Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/" @@ -34,11 +34,11 @@ msgid "" "Your emails" msgstr "joachim.eibl@gmx.de, (Keine Email)" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "Speichern der Zwischenablage in temporärer Datei ist fehlgeschlagen." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Aus Zwischenablage" @@ -86,11 +86,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "Schwerwiegender interner Fehler" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "Oberste Zeile" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Ende" @@ -122,40 +122,40 @@ msgstr "Öffnen von %1 ist fehlgeschlagen." msgid "Comparing file..." msgstr "Datei wird verglichen ..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Fehler beim Lesen von %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Name" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Aktion" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Ungelöst" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Gelöst" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Nicht weiß" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Weiß" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -163,35 +163,35 @@ msgstr "" "Sie sind dabei, Verzeichnisse zusammenzuführen. Sind Sie sicher, dass Sie " "diese Operation abbrechen und das Verzeichnis erneut einlesen wollen?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Neu einlesen" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Zusammenführung fortsetzen" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Öffnen der Verzeichnisse fehlgeschlagen:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Verzeichnis A \"%1\" existiert nicht oder ist kein Verzeichnis.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Verzeichnis B \"%1\" existiert nicht oder ist kein Verzeichnis.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Verzeichnis C \"%1\" existiert nicht oder ist kein Verzeichnis.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Fehler beim Öffnen des Verzeichnisses" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -201,144 +201,144 @@ msgstr "" "nicht mit A oder B identisch sein.\n" "Bitte überprüfen Sie dies." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Parameter-Warnung" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Verzeichnisse einlesen ..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Einlesen von Verzeichnis A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Einlesen von Verzeichnis B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Einlesen von Verzeichnis C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Einige Unterverzeichnisse nicht lesbar in" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Überprüfen Sie bitte die Zugriffsrechte für die Unterverzeichnisse." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Bereit" -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Status des Verzeichnisvergleichs" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Anzahl der Unterverzeichnisse:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Anzahl der identischen Dateien:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Anzahl der unterschiedlichen Dateien:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Anzahl der manuellen Zusammenführungen:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Dies beeinflußt alle Zusammenführungsaktionen." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Änderung aller Zusammenführungsaktionen" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Fortsetzen" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Fortschritt " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Unerledigt." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Kopiere A nach B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Kopiere B nach A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Lösche A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Lösche B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Lösche A & B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Zusammenführen nach A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Zusammenführen nach B" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Zusammenführen nach A & B" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Lösche (falls vorhanden)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Zusammenführen" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Zusammenführen (manuell)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Fehler: Konflikt der Dateitypen" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Fehler: Gleiches Datum, aber unterschiedliche Dateien." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Diese Aktion ist momentan nicht zulässig." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Unzulässige Aktion" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -353,40 +353,40 @@ msgstr "" "Wenn Sie dies reproduzieren können, informieren Sie bitte den Autor dieses " "Programms." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Programm Fehler" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Ein Fehler ist während des Kopierens aufgetreten.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Zusammenführungsfehler" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Fehler." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Erledigt." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Nicht gespeichert." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Unbekannte Zusammenführaktion. (Sollte nie passieren!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Unbekannte Zusammenführaktion." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -406,19 +406,19 @@ msgstr "" "Sie sollten aber wissen, dass dieses Programm noch Beta-Status hat und es " "KEINE GARANTIE gibt! Erstellen Sie Sicherungkopien Ihrer wichtigen Daten!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Start der Zusammenführung" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Start" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Simulieren" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -426,7 +426,7 @@ msgstr "" "Das markierte Element hat einen unterschiedlichen Typ in den verschiedenen " "Verzeichnissen. Wählen Sie eine Aktion." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -434,7 +434,7 @@ msgstr "" "Für die markierte Datei ist zwar das Datum der letzen Änderung gleich, aber " "die Dateien unterscheiden sich. Wählen Sie die Zusammenführaktion." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -442,7 +442,7 @@ msgstr "" "Diese Aktion ist momentan nicht möglich, weil zur Zeit Verzeichnisse " "zusammengeführt werden." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -452,283 +452,283 @@ msgstr "" "Wollen Sie mit diesem Element fortfahren, oder wollen Sie dieses Element " "überspringen?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Fortsetzung der Zusammenführung nach einem Fehler" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Mit letztem Element fortsetzen" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Element überspringen" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Übersprungen." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "In Bearbeitung ..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Die Zusammenführung ist fertig." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Zusammenführung abgeschlossen" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Die simulierte Zusammenführung ist abgeschlossen. Überprüfen Sie, ob Sie mit " "den vorgeschlagenen Aktionen einverstanden sind." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Ein Fehler ist aufgetreten. Wählen Sie OK um Details zu sehen.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Fehler: Beim Löschen von %1: Die Erstellung einer Sicherungskopie schlug " "fehl." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "Lösche Verzeichnis rekursiv( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "Lösche( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Fehler: Löschen des Verzeichnisses schlug fehl, da es nicht gelesen werden " "konnte." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Fehler: Verzeichnis löschen( %1 ) Operation fehlgeschlagen." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Fehler: Löschoperation fehlgeschlagen." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "Manuelles Zusammenführen( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " Hinweis: Nach manuellem Zusammenführen mit F7 fortsetzen." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Fehler: Kopie( %1 -> %2 ) fehlgeschlagen. Das existierende Ziel konnte nicht " "gelöscht werden." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "Verknüpfung kopieren( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Fehler: Verknüpfung kopieren: Nichtlokale Verknüpfungen werden nicht " "unterstützt." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Fehler: Verknüpfung kopieren fehlgeschlagen." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "kopiere( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Fehler beim Umbenennen( %1 -> %2 ): Das existierende Ziel konnte nicht " "gelöscht werden." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "Umbenennen( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Fehler: Umbenennen fehlgeschlagen." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Fehler beim Erstellen des Verzeichnisses %1. Kann existierendes Objekt nicht " "löschen." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "erstelleVerzeichnis( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Fehler beim Erstellen eines Verzeichnis." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Ziel" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Verzeichnis" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Größe" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Letzte Änderung" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Verknüpfungsziel" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "nicht vorhanden" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (Ziel): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (Basis): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (Ziel): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (Ziel): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Ziel: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "Verzeichniszusammenführungsstatus speichern unter ..." -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Verzeichniszusammenführung starten/fortsetzen" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Aktion des aktuellen Elements ausführen" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Vergleiche gewählte Datei" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Aktuelle Datei zusammenführen" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Alle Unterverzeichnisse einklappen" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Alle Unterverzeichnisse ausklappen" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Für alle Elemente A wählen" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Für alle Elemente B wählen" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Für alle Elemente C wählen" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Aktion für alle Elemente automatisch wählen" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Keine Aktion für alle Elemente" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "Zeige identische Dateien" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "Zeige unterschiedliche Dateien" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "Zeige Dateien nur in A" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "Zeige Dateien nur in B" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "Zeige Dateien nur in C" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "Vergleiche explizit ausgewählte Dateien" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "Führe explizit ausgewählte Dateien zusammen" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Nichts tun" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Lösche A && B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Zusammenführen nach A && B" diff --git a/translations/messages/kdiff3/el.po b/translations/messages/kdiff3/el.po index e5f27e8..0122a1c 100644 --- a/translations/messages/kdiff3/el.po +++ b/translations/messages/kdiff3/el.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2007-03-15 15:23+0200\n" "Last-Translator: Spiros Georgaras <sngeorgaras@otenet.gr>\n" "Language-Team: Greek <i18ngr@lists.hellug.gr>\n" @@ -27,11 +27,11 @@ msgid "" "Your emails" msgstr "sngeorgaras@otenet.gr,manolis@koppermind.homelinux.org" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "Η εγγραφή δεδομένων στο προσωρινό αρχείο απέτυχε." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Από το πρόχειρο" @@ -76,11 +76,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "Σοβαρό εσωτερικό σφάλμα" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "Πάνω γραμμή" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Τέλος" @@ -112,40 +112,40 @@ msgstr "Το άνοιγμα του %1 απέτυχε." msgid "Comparing file..." msgstr "Σύγκριση αρχείου..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Σφάλμα ανάγνωσης από το %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Όνομα" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Λειτουργία" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Κατάσταση" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Μη λυμένο" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Λυμένο" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Μη κενό" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Κενό" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -153,35 +153,35 @@ msgstr "" "Αυτή τη στιγμή κάνετε μια συγχώνευση καταλόγου. Είστε σίγουροι ότι " "επιθυμείτε την εγκατάλειψη της συγχώνευσης και την επανασάρωση του καταλόγου;" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Επανασάρωση" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Συνέχεια συγχώνευσης" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Το άνοιγμα των καταλόγων απέτυχε:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Ο κατάλογος Α \"%1\" δεν υπάρχει ή δεν είναι κατάλογος.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Ο κατάλογος Β \"%1\" δεν υπάρχει ή δεν είναι κατάλογος.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Ο κατάλογος Γ \"%1\" δεν υπάρχει ή δεν είναι κατάλογος.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Σφάλμα ανοίγματος Καταλόγου" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -191,144 +191,144 @@ msgstr "" "συγχωνεύονται τρεις κατάλογοι.\n" "Κάντε έναν έλεγχο ξανά πριν συνεχίσετε." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Προειδοποίηση παραμέτρου" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Σάρωση καταλόγων..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Ανάγνωση καταλόγου Α" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Ανάγνωση καταλόγου Β" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Ανάγνωση καταλόγου Γ" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Μερικοί υποκατάλογοι δεν είναι αναγνώσιμοι στο" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Ελέγξτε τις άδειες χρήσης των υποκαταλόγων." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Έτοιμο." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Κατάσταση σύγκρισης καταλόγου" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Αριθμός υποκαταλόγων:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Αριθμός ίδιων αρχείων:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Αριθμός διαφορετικών αρχείων:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Αριθμός χειροκίνητων συγχωνεύσεων:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Αυτό επηρεάζει όλες τις συγχωνεύσεις." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Αλλαγή όλων των λειτουργιών συγχώνευσης" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "Συνέ&χεια" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Επεξεργασία " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Προς υλοποίηση." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Αντιγραφή του Α στο Β" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Αντιγραφή του Β στο Α" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Διαγραφή του Α" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Διαγραφή του Β" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Διαγραφή των Α & Β" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Συγχώνευση στο Α" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Συγχώνευση στο Β" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Συγχώνευση στα Α & Β" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Διαγραφή (αν υπάρχει)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Συγχώνευση" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Συγχώνευση (χειροκίνητη)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Σφάλμα: Σύγκρουση τύπου αρχείων" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Σφάλμα: Οι ημερομηνίες είναι ίδιες αλλά τα αρχεία όχι." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Αυτή η λειτουργία δεν είναι δυνατή αυτή τη στιγμή." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Μη δυνατή λειτουργία" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -343,40 +343,40 @@ msgstr "" "Αν μπορείτε να το αναπαράγετε, παρακαλώ επικοινωνήστε με το συγγραφέα του " "προγράμματος." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Σφάλμα προγράμματος" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Ένα σφάλμα παρουσιάστηκε κατά την αντιγραφή.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Σφάλμα συγχώνευσης" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Σφάλμα." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Έγινε." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Δεν αποθηκεύτηκε." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Άγνωστη λειτουργία συγχώνευσης. (Δε θα έπρεπε να συμβεί ποτέ!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Άγνωστη λειτουργία συγχώνευσης." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -397,19 +397,19 @@ msgstr "" "υπάρχει ΕΓΓΥΗΣΗ ούτως ή άλλως! Κάντε αντίγραφα ασφαλείας για τα σημαντικά " "δεδομένα σας!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Εκκίνηση συγχώνευσης" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Εκτέλεση" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Εξομοίωση" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -417,7 +417,7 @@ msgstr "" "Το τονισμένο αντικείμενο έχει διαφορετικό τύπο σε διαφορετικούς καταλόγους. " "Επιλέξτε τι θέλετε να κάνετε." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -425,7 +425,7 @@ msgstr "" "Οι ημερομηνίες τροποποίησης των αρχείων είναι ίδιες αλλά τα αρχεία δεν " "είναι. Επιλέξτε τι θέλετε να κάνετε." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -433,7 +433,7 @@ msgstr "" "Αυτή η λειτουργία δεν είναι αυτή τη στιγμή δυνατή γιατί η συγχώνευση " "καταλόγου εκτελείται αυτήν τη στιγμή." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -443,287 +443,287 @@ msgstr "" "Επιθυμείτε τη συνέχεια με το αντικείμενο που προκάλεσε το σφάλμα ή " "επιθυμείτε την παράλειψή του;" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Συνέχεια συγχώνευσης μετά από ένα σφάλμα" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Συνέχεια με το τελευταίο αντικείμενο" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Παράλειψη αντικειμένου" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Παραλείφθηκε." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "Σε πρόοδο..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Η λειτουργία συγχώνευσης ολοκληρώθηκε." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Η συγχώνευση ολοκληρώθηκε" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Η εξομοίωση συγχώνευσης ολοκληρώθηκε: Ελέγξτε αν συμφωνείτε με τις " "προτεινόμενες ενέργειες." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" "Παρουσιάστηκε ένα σφάλμα. Πατήστε το Εντάξει για να δείτε λεπτομερείς " "πληροφορίες.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Σφάλμα: Κατά τη διαγραφή του %1: Η δημιουργία του αντιγράφου ασφαλείας " "απέτυχε." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "αναδρομική διαγραφή καταλόγου( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "διαγραφή ( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Σφάλμα: η διαγραφή καταλόγου απέτυχε κατά την προσπάθεια ανάγνωσης του " "καταλόγου." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Σφάλμα: η λειτουργία rmdir( %1 ) απέτυχε." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Σφάλμα: η διαγραφή απέτυχε." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "χειροκίνητη συγχώνευση( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Σημείωση: Μετά από μία χειροκίνητη συγχώνευση ο χρήστης θα πρέπει να " "συνεχίσει πατώντας F7." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Σφάλμα: η αντιγραφή ( %1 -> %2 ) απέτυχε. Η διαγραφή του υπάρχοντος " "προορισμού απέτυχε." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "Αντιγραφή δεσμού( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Σφάλμα: η αντιγραφή δεσμού απέτυχε: Οι απομακρυσμένοι δεσμοί δεν " "υποστηρίζονται ακόμα." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Σφάλμα: η αντιγραφή δεσμού απέτυχε." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "αντιγραφή ( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Σφάλμα κατά την μετονομασία( %1 -> %2 ): Αδυναμία διαγραφής του υπάρχοντος " "προορισμού." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "μετονομασία ( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Σφάλμα: Η μετονομασία απέτυχε." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Σφάλμα κατά τη δημιουργία του καταλόγου %1. Αδύνατη η διαγραφή υπάρχοντος " "αρχείου." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "Δημιουργία καταλόγου( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Σφάλμα κατά τη δημιουργία του καταλόγου." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Προορ." -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Κατ" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Τύπος" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Μέγεθος" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Ιδιοτ" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Τελευταία τροποποίηση" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Δεσμός-προορισμός" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "μη διαθέσιμο" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (Προορ): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (Βάση): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (Προορ): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "Γ (Προορ): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Προορ: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "Αποθήκευση κατάστασης συγχώνευσης καταλόγου ως..." -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Έναρξη/συνέχεια συγχώνευσης καταλόγου" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Εκτέλεση της λειτουργίας για το τρέχον αντικείμενο" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Σύγκριση του επιλεγμένου αρχείου" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Συγχώνευση του επιλεγμένου αρχείου" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Αναδίπλωση όλων των υποκαταλόγων" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Ανάπτυξη όλων των υποκαταλόγων" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Επιλογή του Α για όλα τα αντικείμενα" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Επιλογή του Β για όλα τα αντικείμενα" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Επιλογή του Γ για Όλα τα αντικείμενα" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Λειτουργία αυτόματης επιλογής για όλα τα αντικείμενα" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Καμία λειτουργία για όλα τα αντικείμενα" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "Εμφάνιση ταυτόσημων αρχείων" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "Εμφάνιση διαφορετικών αρχείων" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "Εμφάνιση αρχείων μόνο στο Α" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "Εμφάνιση αρχείων μόνο στο Β" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "Εμφάνιση αρχείων μόνο στο Γ" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "Σύγκριση άμεσα επιλεγμένων αρχείων" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "Συγχώνευση άμεσα επιλεγμένων αρχείων" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Να μη γίνει τίποτα" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "Α" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "Β" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "Γ" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Διαγραφή των A && B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Συγχώνευση σε A && B" diff --git a/translations/messages/kdiff3/en_GB.po b/translations/messages/kdiff3/en_GB.po index a285a72..50efd01 100644 --- a/translations/messages/kdiff3/en_GB.po +++ b/translations/messages/kdiff3/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2005-02-02 11:52+0000\n" "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n" "Language-Team: British English <kde-en-gb@kde.me.uk>\n" @@ -29,11 +29,11 @@ msgid "" "Your emails" msgstr "kde-en-gb@jriddell.org" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "Writing clipboard data to temp file failed." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "From Clipboard" @@ -77,12 +77,12 @@ msgstr "" msgid "Severe Internal Error" msgstr "Severe Internal Error" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Top line %1" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "End" @@ -114,40 +114,40 @@ msgstr "Opening %1 failed." msgid "Comparing file..." msgstr "Comparing file..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Error reading from %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Name" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Operation" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Unsolved" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Solved" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Nonwhite" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "White" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -155,35 +155,35 @@ msgstr "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Rescan" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Continue Merging" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Opening of directories failed:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Dir A \"%1\" does not exist or is not a directory.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Dir B \"%1\" does not exist or is not a directory.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Dir C \"%1\" does not exist or is not a directory.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Directory Open Error" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -193,144 +193,144 @@ msgstr "" "directories are merged.\n" "Check again before continuing." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Parameter Warning" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Scanning directories..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Reading Directory A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Reading Directory B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Reading Directory C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Some subdirectories were not readable in" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Check the permissions of the subdirectories." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Ready." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Directory Comparison Status" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Number of subdirectories:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Number of equal files:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Number of different files:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Number of manual merges:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "This affects all merge operations." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Changing All Merge Operations" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "C&ontinue" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Processing " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "To do." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Copy A to B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Copy B to A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Delete A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Delete B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Delete A & B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Merge to A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Merge to B" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Merge to A & B" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Delete (if exists)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Merge" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Merge (manual)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Error: Conflicting File Types" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Error: Dates are equal but files are not." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "This operation is currently not possible." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Operation Not Possible" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -344,40 +344,40 @@ msgstr "" "\n" "If you know how to reproduce this, please contact the program author." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Program Error" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "An error occurred while copying.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Merge Error" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Error." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Done." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Not saved." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Unknown merge operation. (This must never happen!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Unknown merge operation." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -397,19 +397,19 @@ msgstr "" "Be aware that this program still has beta status and there is NO WARRANTY " "whatsoever! Make backups of your vital data!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Starting Merge" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Do It" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Simulate It" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -417,7 +417,7 @@ msgstr "" "The highlighted item has a different type in the different directories. " "Select what to do." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -425,7 +425,7 @@ msgstr "" "The modification dates of the file are equal but the files are not. Select " "what to do." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -433,7 +433,7 @@ msgstr "" "This operation is currently not possible because directory merge is " "currently running." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -443,275 +443,275 @@ msgstr "" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Continue merge after an error" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Continue With Last Item" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Skip Item" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Skipped." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "In progress..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Merge operation complete." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Merge Complete" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Simulated merge complete: Check if you agree with the proposed operations." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "An error occurred. Press OK to see detailed information.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "Error: While deleting %1: Creating backup failed." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "delete directory recursively( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "delete( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Error: delete dir operation failed while trying to read the directory." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Error: rmdir( %1 ) operation failed." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Error: delete operation failed." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "manual merge( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Note: After a manual merge the user should continue by pressing F7." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Error: copyLink failed: Remote links are not yet supported." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Error: copyLink failed." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Error during rename( %1 -> %2 ): Cannot delete existing destination." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Error: Rename failed." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Error during makeDir of %1. Cannot delete existing file." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Error while creating directory." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Size" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Last Modification" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Link-Destination" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "not available" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Directory Merge" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Start/Continue Directory Merge" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Run Operation for Current Item" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Compare Selected File" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Merge Current File" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Fold All Subdirs" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Unfold All Subdirs" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Choose A for All Items" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Choose B for All Items" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Choose C for All Items" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Auto-Choose Operation for All Items" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "No Operation for All Items" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 #, fuzzy msgid "Show Different Files" msgstr "Number of different files:" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Compare Selected File" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Compare Selected File" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Do Nothing" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Delete A && B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Merge to A && B" diff --git a/translations/messages/kdiff3/es.po b/translations/messages/kdiff3/es.po index 64b01eb..fc89102 100644 --- a/translations/messages/kdiff3/es.po +++ b/translations/messages/kdiff3/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2006-11-06 22:21+0100\n" "Last-Translator: santi <santi@kde-es.org>\n" "Language-Team: Español <kde-es@kybs.de>\n" @@ -31,11 +31,11 @@ msgid "" "Your emails" msgstr "carlos.mayo@hispalinux.es" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "Error al escribir los datos del portapapeles en el archivo temporal." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Desde el portapapeles" @@ -80,11 +80,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "Error interno grave" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "Linea superior" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Fin" @@ -116,40 +116,40 @@ msgstr "Falló la apertura de %1." msgid "Comparing file..." msgstr "Comparando archivo..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Error al leer de %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Nombre" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Operación" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Estado" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Sin resolver" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Resuelto" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "No blanco" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Blanco" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -157,35 +157,35 @@ msgstr "" "Actualmente está haciendo una fusión de directorio. ¿Está seguro de que " "desea abandonar la fusión y volver a leer el directorio?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Volver a buscar" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Continuar fusionando" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Falló la apertura de directorios:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Dir A «%1» no existe o no es un directorio.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Dir B «%1» no existe o no es un directorio.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Dir C «%1» no existe o no es un directorio.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Error al abrir directorio" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -195,144 +195,144 @@ msgstr "" "directorio estan fusionados.\n" "Compruebe de nuevo antes de continuar." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Advertencia en el parámetro" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Escaneando directorios ..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Leyendo directorio A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Leyendo directorio B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Leyendo directorio C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Algunos subdirectorios no se pudieron leer" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Comprobar los permisos de los subdirectorios." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Listo." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Estado de la comparación del directorio" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Número de subdirectorios:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Número de archivos iguales:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Número de archivos diferentes:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Número de fusiones manuales:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Esto afecta a todas las operaciones de fusión." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Cambiando todas las operaciones de fusión" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "C&ontinuar" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Procesando" -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Por hacer." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Copiar A a B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Copiar B a A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Eliminar A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Eliminar B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Eliminar A y B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Fusionar a A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Fusionar a B" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Fusionar a A y B" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Eliminar (si existe)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Fusionar" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Fusionar (manual)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Error: Conflicto de tipos de archivo" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Error: Las fechas son iguales pero los archivos no." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Esta operación no es posible actualmente." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Operación imposible" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -346,40 +346,40 @@ msgstr "" "\n" "Si sabe cómo reproducir esto, por favor contacte con el autor del programa." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Error de programa" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Ocurrió un error mientras se copiaba.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Error de fusión" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Error." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Hecho." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Sin guardar." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Operación de fusión desconocida. (Esto no debe ocurrir nunca)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Operación de fusión desconocida." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -398,19 +398,19 @@ msgstr "" "Tenga en cuenta que este programa todavía es una versión beta y no está " "totalmente garantizado. ¡Realice copias de seguridad de sus datos vitales!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Comenzando fusión" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Hacerlo" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Simularlo" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -418,7 +418,7 @@ msgstr "" "El elemento marcado tiene un tipo diferente en los diferentes directorios. " "Seleccione qué hacer." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -426,7 +426,7 @@ msgstr "" "Las fechas de modificación del archivo son iguales pero los archivos no. " "Seleccionar qué hacer." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -434,7 +434,7 @@ msgstr "" "Esta operación no es posible actualmente porque se esta ejecutando una " "fusión de directorios." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -444,280 +444,280 @@ msgstr "" "¿Desea continuar con el elemento que causó el error o desea omitir este " "elemento?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Continuar la fusión después de un error" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Continuar con el último elemento" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Omitir elemento" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Omitido." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "En progreso..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Operación de fusión completa." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Fusión completa" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Fusión simulada completa. Compruebe si está de acuerdo con las operaciones " "propuestas." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Ocurrió un error. Pulse OK para ver información mas detallada.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Error: Mientras se borraba %1: Falló la creación de copia de seguridad." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "eliminar directorio recursivamente( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "eliminar( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Error: la operación de eliminación de directorio falló al intentar leer el " "directorio." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Error: la operación rmdir( %1 ) falló." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Error: falló la operación de eliminación." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "fusión manual ( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Nota: Después de una fusión manual el usuario puede continuar " "presionando F7." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Error: falló la copia ( %1 -> %2 ). Fallo al eliminar destino existente." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Error: falló copyLink. Enlaces remotos no están soportados todavía." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Error: falló copyLink." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Error durante renombrar( %1 -> %2 ): No se puede eliminar un destino " "existente." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "renombrar( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Error: Fallo al renombrar." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Error durante makeDir de %1. No se puede eliminar un archivo existente." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Error al crear el directorio." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Tamaño" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Atrib" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Última modificación" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Destino del enlace" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "no disponible" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (base): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "Guardar estado del directorio de fusión como..." -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Comenzar/Continuar fusión de directorio" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Realizar operación para el elemento actual" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Comparar el archivo seleccionado" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Fusionar archivo actual" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Plegar todos los subdirectorios" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Desplegar todos los subdirectorios" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Elegir A para todos los elementos" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Elegir B para todos los elementos" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Elegir C para todos los elementos" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Auto-elegir operación para todos los elementos" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Ninguna operación para todos los elementos" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "Mostrar archivos idénticos" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "Mostrar archivos diferentes" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "Mostrar archivos solo en A" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "Mostrar archivos solo en B" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "Mostrar archivos solo en C" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "Comparar explícitamente los archivos seleccionados" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "Fusionar explícitamente los archivos seleccionados" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "No hacer nada" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Eliminar A y B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Fusionar a A y B" diff --git a/translations/messages/kdiff3/et.po b/translations/messages/kdiff3/et.po index 583cb09..20ce86d 100644 --- a/translations/messages/kdiff3/et.po +++ b/translations/messages/kdiff3/et.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2006-12-07 00:29+0300\n" "Last-Translator: Marek Laane <bald@starman.ee>\n" "Language-Team: Estonian <kde-et@linux.ee>\n" @@ -27,11 +27,11 @@ msgid "" "Your emails" msgstr "bald@starman.ee" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "Lõikepuhvri andmete kirjutamine ajutisse faili ebaõnnestus." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Lõikepuhvrist" @@ -75,11 +75,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "Tõsine seesmine viga" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "Ülarida" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Lõpp" @@ -111,40 +111,40 @@ msgstr "%1 avamine ebaõnnestus." msgid "Comparing file..." msgstr "Faili võrdlemine..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Viga %1 lugemisel" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Nimi" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Operatsioon" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Staatus" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Lahendamata" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Lahendatud" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Mitte-tühimärk" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Tühimärk" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -152,35 +152,35 @@ msgstr "" "Sul on parajasti käsil kataloogi ühendamine. Kas tõesti ühendamine " "katkestada ja kataloog uuesti läbi uurida?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Uuri uuesti läbi" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Jätka ühendamist" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Kataloogide avamine ebaõnnestus:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Kataloogi A \"%1\" ei ole olemas või ei ole see kataloog.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Kataloogi B \"%1\" ei ole olemas või ei ole see kataloog.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Kataloogi C \"%1\" ei ole olemas või ei ole see kataloog.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Kataloogi avamise viga" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -189,144 +189,144 @@ msgstr "" "Sihtkataloog ei saa kolme kataloogi ühendamisel olla sama, mis A või B.\n" "Kontrolli seda asja enne jätkamist." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Parameetri hoiatus" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Kataloogide läbiuurimine..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Kataloogi A lugemine" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Kataloogi B lugemine" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Kataloogi C lugemine" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Mõned alamkataloogid ei olnud loetavad:" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Kontrolli alamkataloogide õigusi." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Valmis." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Kataloogi võrdlemise olek" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Alamkataloogide arv:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Võrdsete failide arv:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Erinevate failide arv:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Käsitsiühendamiste arv:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "See mõjutab kõiki ühendamisoperatsioone." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Kõigi ühendamisoperatsioonide muutmine" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Jätka" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Töödeldakse " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Veel tegemata." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Kopeeri A->B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Kopeeri B->A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Kustuta A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Kustuta B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Kustuta A ja B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Ühenda A-sse" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Ühenda B-sse" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Ühenda A-sse ja B-sse" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Kustuta (kui on olemas)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Ühenda" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Ühenda (käsitsi)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Viga: failitüüpide vastuolu" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Viga: kuupäevad on samad, aga mitte failid." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "See operatsioon ei ole praegu võimalik." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Operatsioon ei ole võimalik" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -340,40 +340,40 @@ msgstr "" "\n" "Kui sa tead, kuidas seda korrata, anna sellest teada rakenduse autorile." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Rakenduse viga" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Kopeerimisel tekkis viga.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Ühendamise viga" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Viga." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Tehtud." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Ei salvestatud." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Tundmatu ühendamisoperatsioon. (Seda ei peaks kunagi ette tulema!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Tundmatu ühendamisoperatsioon." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -394,19 +394,19 @@ msgstr "" "üldse midagi juhtub või et kõik õigesti juhtub! Tee kindlasti tähtsatest " "andmetest varukoopia!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Ühendamise alustamine" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Tee ära" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Simuleeri" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -414,21 +414,21 @@ msgstr "" "Esiletõstetud element on erinevates kataloogides erineva tüübiga. Otsusta, " "mida teha." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" "Failide muutmise aeg on sama, aga failid ise mitte. Otsusta, mida teha." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" "See operatsioon ei ole praegu võimalik, sest käib kataloogide ühendamine." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -437,277 +437,277 @@ msgstr "" "Viimasel sammul tekkis viga.\n" "Kas soovid jätkata elemendiga, mis vea põhjustas, või selle vahele jätta?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Jätka ühendamist pärast viga" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Jätka viimase elemendiga" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Jäta vahele" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Vahele jäetud." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "Töös..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Ühendamisoperatsioon lõpetatud." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Ühendamine lõpetatud" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Ühendamise simulatsioon lõpetatud: märgi, kui oled pakutavate " "operatsioonidega nõus." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Tekkis viga. Lähema info saamiseks klõpsa 'OK'.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "Viga %1 kustutamisel: varukoopia loomine ebaõnnestus." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "kustuta kataloog rekursiivselt( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "kustuta( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Viga: kataloogi kustutamine ebaõnnestus juba kataloogi lugemise katsel." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Viga: operatsioon rmdir( %1 ) ebaõnnestus." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Viga: kustutamisoperatsioon ebaõnnestus." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "käsitsi ühendamine( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " Märkus: pärast käsitsi ühendamist tuleks jätkata klahviga F7." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Viga: kopeeri( %1 -> %2) ebaõnnestus, sest olemasoleva sihtkoha kustutamine " "ebaõnnestus." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "kopeeri viit( %1 -> %2)" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Viga: viida kopeerimine ebaõnnestus, sest kaugviidad ei ole veel toetatud." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Viga: viida kopeerimine ebaõnnestus." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "kopeeri( %1 -> %2)" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Viga operatsioonil 'nimeta ümber( %1 -> %2)': olemasoleva sihtkoha " "kustutamine ebaõnnestus." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "nimeta ümber( %1 -> %2)" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Viga: ümbernimetamine ebaõnnestus." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Viga kataloogi %1 loomisel: olemasoleva faili kustutamine ebaõnnestus." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "loo kataloog( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Viga kataloogi loomisel." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Sihtkoht" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Kataloog" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Tüüp" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Suurus" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Atribuut" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Viimase muutmise aeg" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Viit-sihtkoht" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "pole kättesaadav" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (sihtkoht): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (baas): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (sihtkoht): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (sihtkoht): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Sihtkoht: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "Kataloogi ühendamisoleku salvestamine..." -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Alusta/jätka kataloogi ühendamist" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Käivita operatsioon käesoleva elemendiga" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Võrdle valitud faili" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Ühenda praegune fail" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Ava kõik alamkataloogid" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Sule kõik alamkataloogid" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Vali A kõigile elementidele" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Vali B kõigile elementidele" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Vali C kõigile elementidele" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Automaatne valik kõigile elementidele" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Ei ühtki operatsiooni kõigile elementidele" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "Näita identseid faile" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "Näita erinevaid faile" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "Näita ainult A faile" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "Näita ainult B faile" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "Näita ainult C faile" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "Võrdle valitud faile" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "Ühenda valitud failid" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Ära tee midagi" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Kustuta A ja B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Ühenda A-sse ja B-sse" diff --git a/translations/messages/kdiff3/fr.po b/translations/messages/kdiff3/fr.po index 3a713af..91b2e72 100644 --- a/translations/messages/kdiff3/fr.po +++ b/translations/messages/kdiff3/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2005-02-03 21:34+0100\n" "Last-Translator: Simon Depiets <2df@tuxfamily.org>\n" "Language-Team: Français <kde-francophone@kde.org>\n" @@ -27,12 +27,12 @@ msgid "" "Your emails" msgstr "2df@tuxfamily.org" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "" "L'écriture des données du presse-papiers vers un fichier temporaire a échoué." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Depuis le Presse-papiers" @@ -77,12 +77,12 @@ msgstr "" msgid "Severe Internal Error" msgstr "Erreur interne sévère" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Première Ligne %1" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Fin" @@ -114,40 +114,40 @@ msgstr "L'ouverture de %1 a échoué." msgid "Comparing file..." msgstr "Comparaison du fichier..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Erreur de lecture de %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Nom" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Opération" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "État" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Non résolu" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Résolu" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Non blanc" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Blanc" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -155,35 +155,35 @@ msgstr "" "Vous procédez à une fusion. Confirmez-vous l'abandon de la fusion et le " "rafraîchissement du dossier ?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Rafraîchissement" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "La fusion continue" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "L'ouverture des dossiers a échoué :" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Le dossier A « %1 » n'existe pas ou n'est pas un dossier.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Le dossier B « %1 » n'existe pas ou n'est pas un dossier.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Le dossier B « %1 » n'existe pas ou n'est pas un dossier.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Erreur lors de l'ouverture du dossier" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -193,144 +193,144 @@ msgstr "" "fichiers sont fusionnés.\n" "Vérifiez avant de continuer." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Avertissement pour les paramètres" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Scan des dossiers..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Lecture du dossier A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Lecture du dossier B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Lecture du dossier C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Certains sous-dossiers ne sont pas lisibles" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Vérifiez les permissions des sous-dossiers." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Prêt." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "État de la comparaison des dossiers." -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Nombre de sous-dossiers :" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Nombre de fichiers identiques :" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Nombre de fichiers différents :" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Nombre de fusions manuelles :" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Cela affecte toutes les opérations de fusion" -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Changement de toutes les opérations de fusion" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "C&ontinuer" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "En cours " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "A faire." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Copier A vers B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Copier B vers A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Supprimer A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Supprimer B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Supprimer A et B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Fusionner vers A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Fusionner vers B" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Fusionner vers A et B" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Supprimer (si existant)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Fusion" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Fusion (Manuelle)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Erreur : conflit de types de fichiers" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Erreur : les dates sont les mêmes, mais pas les fichiers." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Cette opération n'est pas possible actuellement." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Opération impossible" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -344,40 +344,40 @@ msgstr "" "\n" "Si vous savez comment reproduire cela, veuillez contacter l'auteur." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Erreur du programme" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Une erreur est survenue lors de la copie.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Erreur de fusion" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Erreur." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Fait." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Non enregistré." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Opération de fusion inconnue. (Ceci ne devrait jamais arriver !)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Opération de fusion inconnue." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -397,19 +397,19 @@ msgstr "" "Sachez que ce programme est toujours en phase bêta et qu'il n'y a AUCUNE " "GARANTIE en aucun cas ! Enregistrez vos données vitales !" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Lancement de la fusion" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Faire" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Simuler" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -417,7 +417,7 @@ msgstr "" "L'objet surligné a un format différent dans les différents dossiers. " "Choisissez que faire." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -425,7 +425,7 @@ msgstr "" "Les dates de modification du fichier sont égales, mais pas les fichiers. " "Sélectionnez que faire." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -433,7 +433,7 @@ msgstr "" "Cette opération n'est actuellement pas possible car une fusion de dossiers " "est en cours." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -443,288 +443,288 @@ msgstr "" "Voulez-vous continuer avec l'élément ayant causé l'erreur ou voulez-vous le " "sauter ?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Continuer la fusion après une erreur" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Continuer avec le dernier élément" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Sauter l'élément" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Elément sauté." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "En cours..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Opération de fusion complète." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Fusion complète." -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Simulation de fusion complète : vérifiez si vous êtes d'accord avec les " "opérations proposées." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" "Une erreur s'est produite. Appuyez sur OK pour les informations détaillées.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Erreur : durant la suppression de %1 : échec de la création de sauvegarde." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "supprimer le dossier récursivement (%1)" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "supprimer (%1)" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Erreur : échec de la suppression d'un dossier durant la tentative de lecture " "du dossier." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Erreur : échec de la suppression du dossier (%1)" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Erreur : échec de l'opération de suppression." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "Fusion manuelle (%1, %2, %3 vers %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Note : après une fusion manuelle, l'utilisateur peut continuer avec F7." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Erreur : la copie de %1 vers %2 a échoué. La suppression de la destination " "existante a échoué." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "copier le lien (%1 vers %2)" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Erreur : la copie des liens à échoué : les liens distants ne sont pas encore " "gérés." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Erreur : échec de la copie du lien" -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "copie (%1 vers %2)" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Erreur lors du changement de nom du fichier (%1 vers %2) : impossible de " "supprimer la destination." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "changement de nom (%1 vers %2)" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Erreur : échec du changement de nom." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Erreur durant la création du dossier %1. Impossible de supprimer le fichier " "existant." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "Création du Dossier (%1)" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Erreur durant la création du dossier" -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Destination" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Dossier" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Taille" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Attributs" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Dernière modification" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Destination du lien" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "non disponible" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (Destination) : " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (Base) : " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (Destination) : " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (Destination) : " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Destination : " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Fusion de dossiers" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Commencer/Continuer la fusion des dossiers" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Lancer l'opération pour l'élément courant" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Comparer le fichier sélectionné" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Fusionner le fichier en cours" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Inclure tous les sous-dossiers" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Ne pas suivre les sous-dossiers" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Choisir A pour tous les éléments" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Choisir B pour tous les éléments" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Choisir C pour tous les éléments" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Choisir automatiquement l'opération pour tous les éléments" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Pas d'opérations pour tous les éléments" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 #, fuzzy msgid "Show Different Files" msgstr "Nombre de fichiers différents :" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Comparer le fichier sélectionné" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Comparer le fichier sélectionné" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Ne rien faire" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Supprimer A && B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Fusionner vers A && B" diff --git a/translations/messages/kdiff3/ga.po b/translations/messages/kdiff3/ga.po index 0e0a3a6..cd8b8a4 100644 --- a/translations/messages/kdiff3/ga.po +++ b/translations/messages/kdiff3/ga.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeextragear-1/kdiff3.po\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2004-12-03 14:52-0500\n" "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n" "Language-Team: ga <LL@li.org>\n" @@ -22,11 +22,11 @@ msgid "" "Your emails" msgstr "seoc at iolfree dot ie,scannell at slu dot edu" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Ón nGearrthaisce" @@ -58,11 +58,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "Earráid Throm Inmheánach" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Deireadh" @@ -94,218 +94,218 @@ msgstr "Theip ar oscailt %1." msgid "Comparing file..." msgstr "Ag cur comhad i gcomparáid..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Ainm" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Oibríocht" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Stádas" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Gan réiteach" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Réitithe" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Bán" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Athscan" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Theip ar oscailt na gcomhadlann:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Comhadlanna á scanadh..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Comhadlann A á Léamh" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Comhadlann B á Léamh" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Comhadlann C á Léamh" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Réidh." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Líon na bhFochomhadlann:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Líon na gcomhad difriúil:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Lean ar aghaidh" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Ag próiseáil " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Le déanamh." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Cóipeáil A go B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Cóipeáil B go A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Scrios A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Scrios B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Scrios A & B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Scrios (má tá sé ann)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Cumaisc" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Cumaisc (de láimh)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Earráid: Cineálacha Comhaid Contrártha" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -314,40 +314,40 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Earráid Chláir" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Tharla earráid le linn cóipeála.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Earráid." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Críochnaithe." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Gan sábháil." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -359,306 +359,306 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Déan" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Ná Bac Le Mír" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "Ar siúl..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "Earráid agus %1 á scriosadh: Theip ar chruthú cúltaca." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "scrios comhadlann go hathchúrsach( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "scrios( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Earráid: theip ar rmdir( %1 )." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Earráid: theip ar scriosadh." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "cumaisc de láimh( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "cóipeáil( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "athainmnigh( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Earráid: theip ar athainmniú." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Earráid agus comhadlann á cruthú." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Sprioc" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Cmhdlnn" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Cineál" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Méid" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Athrú Is Déanaí" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "níl ar fáil" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (Sprioc): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (Bun): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (Sprioc): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (Sprioc): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Sprioc: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Cuir Comhad Roghnaithe i gComparáid" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Cumaisc an Comhad Reatha" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "Taispeáin Comhaid Difriúla" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "Taispeáin Comhaid i A amháin" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "Taispeáin Comhaid i B amháin" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "Taispeáin Comhaid i C amháin" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Ná déan faic" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Scrios A && B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "" diff --git a/translations/messages/kdiff3/gl.po b/translations/messages/kdiff3/gl.po index 33997e2..a3d9cf2 100644 --- a/translations/messages/kdiff3/gl.po +++ b/translations/messages/kdiff3/gl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2006-06-03 21:54+0200\n" "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n" "Language-Team: Galician <trasno@ceu.fi.udc.es>\n" @@ -26,11 +26,11 @@ msgid "" "Your emails" msgstr "mvillarino@users.sourceforge.net" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "" @@ -62,11 +62,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Fin" @@ -98,218 +98,218 @@ msgstr "" msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Nome" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Estado" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Analisar de Novo" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Listo." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -318,40 +318,40 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "" -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "" -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -363,306 +363,306 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Tamaño" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "non disponíbel" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Non facer Nada" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "" diff --git a/translations/messages/kdiff3/hi.po b/translations/messages/kdiff3/hi.po index 79f43dc..4c5b901 100644 --- a/translations/messages/kdiff3/hi.po +++ b/translations/messages/kdiff3/hi.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2005-01-22 16:10+0530\n" "Last-Translator: Ravishankar Shrivastava <raviratlami@gmail.com>\n" "Language-Team: indlinux-hindi <indlinux-hindi@lists.sourceforge.net>\n" @@ -26,11 +26,11 @@ msgid "" "Your emails" msgstr "raviratlami@yahoo.com" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "क्लिपबोर्ड डाटा को अस्थाई फ़ाइल में लिखना असफल." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "क्लिपबोर्ड से" @@ -62,12 +62,12 @@ msgstr "" msgid "Severe Internal Error" msgstr "गंभीर आंतरिक त्रुटि" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "शीर्ष पंक्ति %1" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "अंत" @@ -99,218 +99,218 @@ msgstr "%1 को खोलना असफल" msgid "Comparing file..." msgstr "फ़ाइल की तुलना की जा रही है..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "%1 से पढ़ने में त्रुटि" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "नाम" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "ऑपरेशन" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "स्थिति" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "हल नहीं" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "हल कर लिया गया" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "सफेद-नहीं" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "सफेद" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "री-स्कैन" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "मिलाया जाना जारी रखें" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "डिरेक्ट्रीज़ खोलना असफल:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "डिरेक्ट्री अ \"%1\" या तो मौजूद नहीं है या फिर वह डिरेक्ट्री नहीं है.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "डिरेक्ट्री ब \"%1\" या तो मौजूद नहीं है या फिर वह डिरेक्ट्री नहीं है.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "डिरेक्ट्री स \"%1\" या तो मौजूद नहीं है या फिर वह डिरेक्ट्री नहीं है.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "डिरेक्ट्री खोलने में त्रुटि" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "पैरामीटर चेतावनी" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "डिरेक्ट्रीज़ स्कैन किया जा रहा है..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "डिरेक्ट्री अ को पढ़ा जा रहा है" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "डिरेक्ट्री ब को पढ़ा जा रहा है" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "डिरेक्ट्री स को पढ़ा जा रहा है" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "कुछ सबडिरेक्ट्रीज़ इसमें पढ़े नहीं जा सकने वाले हैं" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "सबडिरेक्ट्रीज़ की अनुमतियाँ जाँचें." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "तैयार." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "डिरेक्ट्री तुलना स्थिति" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "सबडिरेक्ट्रीज़ की संख्या:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "समान फ़ाइलों की संख्या:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "भिन्न फ़ाइलों की संख्या:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "हस्तचालित सम्मिलित करने की संख्या:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "यह सभी सम्मिलित ऑपरेशन को प्रभावित करेगा" -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "सभी सम्मिलित करने के ऑपरेशन को बदला जा रहा है" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "जारी रखें (&o)" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "प्रोसेसिंग" -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "कार्य-सूची" -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "अ की नक़ल ब में करें" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "ब की नक़ल अ में करें" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "अ को मिटाएँ" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "ब को मिटाएँ" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "अ तथा ब को मिटाएँ" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "अ में सम्मिलित करें" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "ब में सम्मिलित करें" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "अ तथा ब में सम्मिलित करें" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "मिटाएँ (यदि मौजूद है)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "सम्मिलित करें" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "सम्मिलित करें (हस्तचालित)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "त्रुटि: परस्पर विरोधी फ़ाइल क़िस्में" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "त्रुटि: तारीखें तो एक समान हैं, परंतु फ़ाइलें नहीं." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "यह ऑपरेशन वर्तमान में संभव नहीं है." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "ऑपरेशन वर्तमान में संभव नहीं" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -319,40 +319,40 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "प्रोग्राम त्रुटि" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "नक़ल करने के दौरान एक त्रुटि हुई.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "सम्मिलित करने में त्रुटि" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "त्रुटि." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "सम्पन्न." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "सहेजा नहीं गया." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "सम्मिलित करने का अज्ञात ऑपरेशन. (ऐसा कभी नहीं होना चाहिए!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "सम्मिलित करने का अज्ञात ऑपरेशन. " -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -364,311 +364,311 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "सम्मिलित करना प्रारंभ किया जा रहा है" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "इसे करें" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "इसे सिमुलेट करें" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "त्रुटि के बाद भी सम्मिलित करना जारी रखें" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "पिछली वस्तु के साथ जारी रखें" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "वस्तु छोड़ें" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "छोड़ा." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "प्रगति पर है..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "सम्मिलित करने की क्रिया पूरी हुई." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "सम्मिलित करना सम्पन्न" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "एक त्रुटि हुई. विस्तृत जानकारी देखने के लिए ठीक को दबाएँ\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "त्रुटि: %1 को मिटाने के दौरान: बैकअप बनाने में असफल." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "डिरेक्ट्री ( %1 ) को रिकर्सिवली मिटाएँ" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "मिटाएं (%1)" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "त्रुटि: डिरेक्ट्री को पढ़ने की कोशिश में डिरेक्ट्री मिटाने का कार्य असफल." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "त्रुटि: rmdir( %1 ) क्रिया असफल." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "त्रुटि: डिरेक्ट्री मिटाने का कार्य असफल." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "हस्तचालित सम्मिलित करें( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" "टीप: हस्तचालित सम्मिलित करने के बाद उपयोक्ता को F7 को दबाकर जारी रखना चाहिए." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "त्रुटि: नक़ल ( %1 -> %2 ) असफल. मौजूदा गंतव्य को मिटाना असफल." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "कापीलिंक ( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "त्रुटि: कापीलिंक असफल: रिमोट कड़ियाँ अभी समर्थित नहीं हैं." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "त्रुटि: कापीलिंक असफल." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "नक़ल( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "नाम बदलें( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "त्रुटि: नाम-बदलना असफल." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "%1 के मेकडिर के दौरान त्रुटि. मौजूदा फ़ाइल मिटा नहीं सकते." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "मेकडिर( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "डिरेक्ट्री बनाने के दौरान त्रुटि." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "गंतव्य" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "डिर." -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "क़िस्म" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "आकार" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "एट्रि." -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "अंतिम परिवर्धन" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "लिंक-गंतव्य" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "उपलब्ध नहीं" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (गंत.): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (आधार): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (गंत.): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (गंत.): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "गंतव्य:" -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 #, fuzzy msgid "Save Directory Merge State As..." msgstr "डिरेक्ट्री सम्मिलित करें" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "डिरेक्ट्री सम्मिलित करना प्रारंभ करें/जारी रखें" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "मौज़ूदा वस्तु के लिए ऑपरेशन चलाएँ" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "चयनित फ़ाइल की तुलना करें" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "मौज़ूदा फ़ाइल सम्मिलित करें" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "सभी सबडिरेक्ट्रीज फ़ोल्ड करें" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "सभी सबडिरेक्ट्रीज अनफ़ोल्ड करें" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "सभी वस्तुओं के लिए अ का चयन करें" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "सभी वस्तुओं के लिए ब का चयन करें" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "सभी वस्तुओं के लिए स का चयन करें" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "सभी वस्तुओं के लिए क्रिया स्वचालित चयन करें" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "सभी वस्तुओं के लिए कोई क्रिया नहीं" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 #, fuzzy msgid "Show Different Files" msgstr "भिन्न फ़ाइलों की संख्या:" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "चयनित फ़ाइल की तुलना करें" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "चयनित फ़ाइल की तुलना करें" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "कुछ नहीं करें" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "अ" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "ब" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "स" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "अ तथा ब को मिटाएँ" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "अ तथा ब में सम्मिलित करें" diff --git a/translations/messages/kdiff3/hu.po b/translations/messages/kdiff3/hu.po index 055d589..c89c303 100644 --- a/translations/messages/kdiff3/hu.po +++ b/translations/messages/kdiff3/hu.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: KDE 3.2\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2004-01-09 11:11+0100\n" "Last-Translator: Tamas Szanto <tszanto@mol.hu>\n" "Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n" @@ -26,11 +26,11 @@ msgid "" "Your emails" msgstr "tszanto@mol.hu" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "A vágólapról" @@ -64,12 +64,12 @@ msgstr "" msgid "Severe Internal Error" msgstr "Súlyos belső hiba történt" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Felső sor - %1" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Vég" @@ -102,40 +102,40 @@ msgstr "%1 megnyitása nem sikerült." msgid "Comparing file..." msgstr "A fájl mentése..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "%1 olvasása közben hiba történt" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Név" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Művelet" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Állapot" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -143,35 +143,35 @@ msgstr "" "Egy könyvtárösszeolvasztás még nem fejeződött be. Biztosan félbe szeretné " "szakítani a műveletet és újra be szeretné olvasni a könyvtár tartalmát?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Újraolvasás" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "A művelet folytatása" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Nem sikerült beolvasni ezeket a könyvtárakat:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Az \"A\" könyvtár (\"%1\") nem létezik vagy más típusú a bejegyzés.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "A \"B\" könyvtár (\"%1\") nem létezik vagy más típusú a bejegyzés.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "A \"C\" könyvtár (\"%1\") nem létezik vagy más típusú a bejegyzés.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Könyvtármegnyitási hiba" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -181,145 +181,145 @@ msgstr "" "könyvtár lesz összeolvasztva.\n" "Továbblépés előtt ellenőrizze az értéket." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Figyelmeztetés - paraméter" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 #, fuzzy msgid "Scanning directories..." msgstr "A könyvtárak szinkronizálása" -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Az A könyvtár beolvasása" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "A B könyvtár beolvasása" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "A C könyvtár beolvasása" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Néhány alkönyvtár beolvasása nem sikerült itt:" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Ellenőrizze az alkönyvtárak jogosultságait." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Kész." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "A könyvtárak összehasonlítási állapota" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Az alkönyvtárak száma:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "A megegyező fájlok száma:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Az eltérő fájlok száma:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "A kézi összeolvasztások száma:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Ez minden összeolvasztási műveletet érint." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Az összes összeolvasztási művelet megváltoztatása" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "F&olytatás" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Feldolgozás " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Feladat." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "A másolása B-be" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "B másolása A-ba" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "A törlése" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "B törlése" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "A és B törlése" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Beolvasztás A-ba" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Beolvasztás B-be" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Beolvasztás A és B-be" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Törlés (ha létezik)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Összeolvasztás" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Összeolvasztás (kézi)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Hiba: ütköző fájltípusok" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Hiba: a dátumok megegyeznek, de a fájlok nem." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Ez a művelet jelenleg nem lehetséges." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "A művelet nem lehetséges" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -334,42 +334,42 @@ msgstr "" "Ha tudja, hogyan kell ezt a helyzetet reprodukálni, kérem értesítse a " "szerzőt." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Programhiba" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Hiba történt másolás közben.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Összeolvasztási hiba" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Hiba." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Kész." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Nincs elmentve." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "" "Ismeretlen összeolvasztási művelet (normál körülmények között nem fordulhat " "elő)." -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Ismeretlen összeolvasztási művelet." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -389,19 +389,19 @@ msgstr "" "Ez a program még béta állapotú, ezért nincs garancia a hibátlan működésre. A " "fontos adatokról mindenképpen készítsen biztonsági másolatot!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Az összeolvasztás megkezdése" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Kezdődjön" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Szimuláció" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -409,7 +409,7 @@ msgstr "" "A kijelölt elem típusa eltérő a könyvtárakban. Válassza ki, mit szeretne " "tenni." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -417,7 +417,7 @@ msgstr "" "A két fájl utolsó módosítási dátuma megegyezik, de a fájlok tartalma nem. Mi " "történjen?" -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 #, fuzzy msgid "" "This operation is currently not possible because directory merge is " @@ -426,7 +426,7 @@ msgstr "" "Ez a művelet most nem hajtható végre, mert folyamatban van egy " "könyvtárösszeolvasztás." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -436,77 +436,77 @@ msgstr "" "Folytatni szeretné a műveletet a hiba ellenére vagy át szeretné ugrani a " "hibát okozó elemet?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Az összeolvasztás folytatása hiba esetén is" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Folytatás az utolsó elemmel" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Az elem átlépése" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Átlépve." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "Folyamatban..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Az összeolvasztási művelet befejeződött." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Az összeolvasztás befejeződött" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "A szimulált összeolvasztás befejeződött: ellenőrizze, hogy elfogadhatók-e a " "javasolt műveletek." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Hiba történt. Kattintson az OK gombra részletes tájékoztatáshoz.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Hiba történt %1 törlése közben: nem sikerült létrehozni egy biztonsági " "másolatot." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "könyvtár (%1) törlése az alkönyvtárakkal együtt" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "törlés (%1)" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Hiba történt: a könyvtártörlés során, a könyvtár beolvasásakor, hiba történt." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Hiba: egy rmdir (%1) művelet nem sikerült." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Hiba történt: a törlési művelet nem sikerült." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "kézi összeolvasztás (%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 #, fuzzy msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -514,209 +514,209 @@ msgstr "" " Megjegyzés: kézi összeolvasztás esetén a felhasználónak az F7-tel kell " "továbblépnie." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Hiba: egy másolás (%1 -> %2) nem sikerült. Nem sikerült törölni a már létező " "másolási célpontot." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "Link másolása (%1 -> %2)" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Hiba: egy link másolása nem sikerült. Távoli linkeket nem lehet használni." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Hiba történt: egy link másolása nem sikerült." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "másolás (%1 -> %2)" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Hiba történt átnevezés (%1 -> %2) közben: a célfájl nem törölhető." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "átnevezés (%1 -> %2)" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Hiba történt: egy átnevezés nem sikerült." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Hiba történt a könyvtár (%1) létrehozása közben. A már létező fájl nem " "törölhető." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "Könyvtár létrehozása (%1)" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Hiba történt egy könyvtár létrehozása közben." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Cél" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Könyvtár" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Típus" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Méret" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Attribútum" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Utolsó módosítás" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Link-Cél" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "nem áll rendelkezésre" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (cél):" -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (alap):" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (cél):" -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (cél):" -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Cél: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Könyvtárösszeolvasztás" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "A könyvtárösszeolvasztás kezdése/folytatása" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "A művelet végrehajtása az aktuális elemen" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "A kiválasztott fájl összehasonlítása" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Az aktuális fájl összeolvasztása" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Az alkönyvtárak összecsukása" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Az alkönyvtárak kibontása" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Az 'A' kiválasztása az összes elemhez" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "A 'B' kiválasztása az összes elemhez" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "A 'C' kiválasztása az összes elemhez" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Automatikus kiválasztás az összes elemnél" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Nincs művelet az összes elemre" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 #, fuzzy msgid "Show Different Files" msgstr "Az eltérő fájlok száma:" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "A kiválasztott fájl összehasonlítása" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "A kiválasztott fájl összehasonlítása" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Nem kell semmit tenni" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 #, fuzzy msgid "Delete A && B" msgstr "A és B törlése" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 #, fuzzy msgid "Merge to A && B" msgstr "Beolvasztás A és B-be" diff --git a/translations/messages/kdiff3/is.po b/translations/messages/kdiff3/is.po index 87093b0..be8c67d 100644 --- a/translations/messages/kdiff3/is.po +++ b/translations/messages/kdiff3/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -22,11 +22,11 @@ msgid "" "Your emails" msgstr "" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "" @@ -58,11 +58,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "" @@ -94,218 +94,218 @@ msgstr "" msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "" -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -314,40 +314,40 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "" -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "" -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -359,306 +359,306 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "" diff --git a/translations/messages/kdiff3/it.po b/translations/messages/kdiff3/it.po index acc5e50..b460cd7 100644 --- a/translations/messages/kdiff3/it.po +++ b/translations/messages/kdiff3/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2021-08-27 12:46+0000\n" "Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" "Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" @@ -32,11 +32,11 @@ msgid "" "Your emails" msgstr "a.celli@caltanet.it, marcello.anni@alice.it" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "È fallita la copia da appunti a file temporaneo." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Dagli appunti" @@ -80,11 +80,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "Grave errore interno" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "Riga superiore" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Fine" @@ -116,40 +116,40 @@ msgstr "Non ho potuto aprire %1." msgid "Comparing file..." msgstr "Confronto file ..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Errore nella lettura di %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Nome" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Operazione" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Stato" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Non risolto" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Risolto" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Non vuoto" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Vuoto" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -157,35 +157,35 @@ msgstr "" "Stai fondendo delle cartelle. Sei sicuro? Vuoi interrompere la fusione e " "riesaminare la cartella?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Riesamina" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Continua la fusione" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Apertura di cartelle non riuscita:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Dir A \"%1\" non esiste o non è una cartella.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Dir B \"%1\" non esiste o non è una cartella.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Dir C \"%1\" non esiste o non è una cartella.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Errore apertura cartella" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -195,144 +195,144 @@ msgstr "" "uguale ad A o B.\n" "Controlla meglio prima di continuare." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Attenzione ai parametri" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Esame cartelle in corso..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Lettura della cartella A in corso" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Lettura della cartella B in corso" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Lettura della cartella C in corso" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Alcune sotto-cartelle non erano leggibili" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Controlla i permessi per le sotto-cartelle." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Pronto." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Stato di confronto di cartelle" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Numero di sotto-cartelle:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Numero di file uguali:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Numero di file differenti:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Numero di fusioni manuali:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Questo riguarda tutte le operazioni di fusione." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Modifica tutte le operazioni di fusione" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "C&ontinua" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "in lavorazione " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Da fare." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Copia A su B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Copia B su A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Elimina A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Elimina B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Elimina A e B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Fondi con A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Fondi con B" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Fondi A e B" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Elimina (se esiste)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Fondi" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Fondi (manuale)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Errore: Tipi di file incompatibili" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Errore: le date coincidono ma i file sono diversi." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Questa operazione per ora non è implementata." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Operazione non possibile" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -346,40 +346,40 @@ msgstr "" "\n" "Se sai come riprodurlo, per favore comunicalo all'autore del programma." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Errore nel programma" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Si è verificato un errore durante la copia.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Errore nella fusione" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Errore." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Fatto." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Non salvato." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Operazione di fusione sconosciuta. (Non deve mai succedere!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Operazione di fusione sconosciuta." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -398,19 +398,19 @@ msgstr "" "Stai attento perché questo programma è ancora una \"beta\" e non c'è NESSUNA " "GARANZIA che funzioni! Fai una copia di riserva dei tuoi dati importanti!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Inizio fusione" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Procedi" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Simulazione" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -418,7 +418,7 @@ msgstr "" "Gli elementi evidenziati sono di tipo diverso nelle diverse cartelle. Scegli " "cosa fare." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -426,7 +426,7 @@ msgstr "" "Le date di modifica dei file sono uguali ma i file sono diversi. Scegli cosa " "fare." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -434,7 +434,7 @@ msgstr "" "Non si può effettuare questa operazione poiché è in corso la fusione di due " "cartelle." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -443,277 +443,277 @@ msgstr "" "Si è verificato un errore nell'ultimo passaggio.\n" "Vuoi continuare con l'elemento che ha provocato l'errore o vuoi saltarlo?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Continua fusione dopo errore" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Continua con il prossimo elemento" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Salta l'elemento" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Saltato." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "In esecuzione..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Operazione di fusione completata." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Fusione completata" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Terminata simulazione fusione: controlla se le operazioni proposte vanno " "bene." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Si è verificato un errore. Premi OK per maggiori informazioni.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "Errore: nell'eliminare %1: non ho potuto creare una copia di riserva." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "elimina cartella ricorsivamente (%1)" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "elimina (%1)" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Errore: fallita l'eleminazione della cartella durante la sua lettura." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Errore: non è riuscita l'operazione rmdir (%1)." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Errore: eliminazione fallita." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "fusione manuale (%1, %2,%3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Nota: Dopo una fusione manuale l'utente deve premere F7 per continuare." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Errore: copia da %1 a %2 non riuscita. Eliminazione destinazione esistente " "fallita." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "copiaLink(%1 -> %2)" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Errore: copiaLink impossibile: i link remoti non sono ancora supportati." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Errore: copiaLink non riuscito." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "copia(%1 -> %2)" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Errore nel cambio nome (%1 -> %2): Impossibile eliminare la destinazione " "esistente." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "cambio nome(%1 -> %2)" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Errore: cambio nome non riuscito." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Errore eseguendo makeDir di %1. Impossibile eliminare file esistente." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "makeDir(%1)" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Errore nel creare una cartella." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Dimensione" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Ultima modifica" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Collegamento di destinazione" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "non disponibile" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "Salva lo stato di fusione cartelle come..." -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Avvia/continua fusione cartelle" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Esegui operazione per questa voce" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Confronta file selezionato" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Fondi il file attuale" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Chiudi tutte le sottocartelle" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Apri tutte le sottocartelle" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Scegli A in tutti i casi" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Scegli B in tutti i casi" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Scegli C in tutti i casi" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Scelta automatica in tutti i casi" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Non fare nulla in tutti i casi" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "Mostra file uguali" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "Mostra file diversi" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "Mostra file solo in A" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "Mostra file solo in B" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "Mostra file solo in C" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "Confronta file selezionati" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "Fondi file selezionati" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Non fare nulla" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Elimina A e B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Fondi A e B" diff --git a/translations/messages/kdiff3/ja.po b/translations/messages/kdiff3/ja.po index 80613a4..ec07e23 100644 --- a/translations/messages/kdiff3/ja.po +++ b/translations/messages/kdiff3/ja.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2006-04-14 21:25+0900\n" "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n" "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n" @@ -27,11 +27,11 @@ msgid "" "Your emails" msgstr "ss@kde.gr.jp" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "クリップボードのデータを一時ファイルに書き込めませんでした。" -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "クリップボードから" @@ -65,11 +65,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "深刻な内部エラー" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "上部行" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "最後" @@ -101,40 +101,40 @@ msgstr "%1 を開けません" msgid "Comparing file..." msgstr "ファイルを比較中..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "%1 から読み込み時にエラー" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "名前" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "操作" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "状態" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "未解決" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "解決済み" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "空白以外" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "空白" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -142,35 +142,35 @@ msgstr "" "今ディレクトリマージ中です. 本当にマージを中止し、ディレクトリを再スキャンし" "ますか?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "再スキャン" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "マージを続行" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "ディレクトリオープンに失敗:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "ディレクトリ A %1 は存在しないか、ディレクトリではありません\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "ディレクトリ B %1 は存在しないか、ディレクトリではありません\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "ディレクトリ C %1 は存在しないか、ディレクトリではありません\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "ディレクトリオープンエラー" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -180,144 +180,144 @@ msgstr "" "はいけません.\n" "続行する前にもう一度調べてください" -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "パラメータ警告" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "ディレクトリをスキャン中..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "ディレクトリ A を読み込み中" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "ディレクトリ B を読み込み中" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "ディレクトリ C を読み込み中" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "いくつかのサブディレクトリが読み込み不可でした" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "サブディレクトリの許可属性を確かめてください" -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "準備完了." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "ディレクトリ比較状態" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "サブディレクトリ数:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "等しいファイルの数:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "異なるファイルの数:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "手作業でのマージ数:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "これはすべてのマージ操作に影響します" -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "すべてのマージ操作を更新中" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "続行(&O)" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "処理中" -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "To do." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "A を B にコピー" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "B を A にコピー" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "A を削除" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "B を削除" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "A と B を削除" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "A にマージ" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "B にマージ" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "A と B にマージ" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "(存在すれば)削除" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "マージ" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "マージ (手作業)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "エラー: ファイルタイプが衝突しています" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "エラー: 日付は等しいですがファイルはそうでありません" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "この操作は今はできません" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "操作不可" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -331,40 +331,40 @@ msgstr "" "\n" "再現方法がわかったならプログラム作者にコンタクトを取ってください" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "プログラムエラー" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "コピー中にエラー発生\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "マージエラー" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "エラー" -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "完了" -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "未保存" -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "不明なマージ操作 (起り得ないはず!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "不明なマージ操作" -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -384,19 +384,19 @@ msgstr "" "このプログラムはまだβ段階で何が起きても無保証だということに注意してください!" "重要なデータはバックアップをとってください!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "マージ開始" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "実行" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "試行" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -404,7 +404,7 @@ msgstr "" "強調表示された項目は異なるディレクトリの異なるタイプです.何をするか選択してく" "ださい" -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -412,13 +412,13 @@ msgstr "" "ファイルの更新日時は等しいですがファイルは異なっています. 何をするか選択して" "ください" -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "ディレクトリマージ中なのでこの操作を実行することはできません" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -427,270 +427,270 @@ msgstr "" "最終段階でエラー発生.\n" "エラーを起した項目について続行しますか? それともスキップしますか?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "エラー後にもマージ続行" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "最後の項目について続行" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "項目をスキップ" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "スキップされました" -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "進行中..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "マージ操作完了" -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "マージ完了" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "マージ試行完了: 先の操作をしてもよいか確認してください." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "エラー発生. 詳細情報を見るには OK をクリックしてください\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "エラー: %1 削除中: バックアップ作成失敗" -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "再帰的にディレクトリを削除 ( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "削除( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "エラー: ディレクトリ読み込み中にディレクトリ削除失敗" -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "エラー: rmdir( %1 ) 操作失敗" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "エラー: 削除失敗" -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "手作業でのマージ( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " 注意: 手作業でのマージ後に続行するには F7 を押してください" -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "エラー: copy( %1 -> %2 )失敗. 既存のコピー先の削除に失敗" -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "エラー: copyLink 失敗: リモートリンクは未サポートです" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "エラー: copyLink 失敗" -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "rename( %1 -> %2 ) 中にエラー: 既存のコピー先を削除できません" -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "エラー: 名称変更失敗" -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "makeDir %1 中にエラー. 既存ファイルを削除できません" -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "ディレクトリ作成中にエラー" -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "先" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "ディレクトリ" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "タイプ" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "容量" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "属性" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "最終更新" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "リンク先" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "利用不可" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (先): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (元): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (先): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (先): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "先: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 #, fuzzy msgid "Save Directory Merge State As..." msgstr "ディレクトリマージ" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "ディレクトリマージを開始/続行" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "現在の項目について操作を実行" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "選択ファイルを比較 " -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "現在のファイルをマージ " -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "すべてのサブディレクトリをたたみ込み" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "すべてのサブディレクトリを展開" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "すべての項目について A を選択" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "すべての項目について B を選択" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "すべての項目について C を選択" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "すべての項目について自動選択" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "すべての項目について操作なし" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "等しいファイルを表示" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "異なるファイルを表示" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "A にのみ存在するファイルを表示" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "B にのみ存在するファイルを表示" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "C にのみ存在するファイルを表示" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "明示的に選択したファイルを比較 " -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "明示的に選択したファイルをマージ " -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "何もしない" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "A と B を削除" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "A と B にマージ" diff --git a/translations/messages/kdiff3/ka.po b/translations/messages/kdiff3/ka.po index 48782cd..0d83e1d 100644 --- a/translations/messages/kdiff3/ka.po +++ b/translations/messages/kdiff3/ka.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2006-03-28 01:44+0400\n" "Last-Translator: Giasher <giasher@telenet.ge>\n" "Language-Team: <www.gia.ge>\n" @@ -27,11 +27,11 @@ msgid "" "Your emails" msgstr "tsiskreli@gmail.com" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "ბუფერის მონაცემის დროებით ფაილში ჩაწერა ვერ შედგა." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "გაცვლის ბუფერიდან " @@ -75,12 +75,12 @@ msgstr "" msgid "Severe Internal Error" msgstr "მკაცრი შინაგანი შეცდომა" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "ზედა ხაზი %1" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "დასასრული" @@ -112,40 +112,40 @@ msgstr "%1-ს გახსნა ვერ შედგა." msgid "Comparing file..." msgstr "ფაილების შედარება..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "%1-ს წაკითხვის შეცდომა" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "სახელი" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "ოპერაცია" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "სტატუსი" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "გადაუჭრელი" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "გადაჭრილი" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "არათეთრი" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "თეთრი" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -153,35 +153,35 @@ msgstr "" "თქვენ ახლა დირექტორიების შერწყმას ახორციელებთ.დარწმუნებული ხართ რომ გსურთ " "შერწყმის შეწყვეტა და დირექტორიის თავიდან სკანირება?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "თავიდან სკანირება" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "შერწყმის გაგრძელება" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "დირექტორიის გახსნა ვერ შედგა:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Dir A \"%1\" არ არსებობს ან არ არის დირექტორია.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Dir B \"%1\" არ არსებობს ან არ არის დირექტორია.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Dir C \"%1\" არ არსებობს ან არ არის დირექტორია.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "დირექტორიის გახსნის შეცდომა" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -191,144 +191,144 @@ msgstr "" "დირექტორიის შერწყმა.\n" "გაგრძელებამდე კიდევ შეამოწმეთ." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "გაფრთხილების პარამეტრი" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "დირექტორიების სკანირება..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "დირექტორია A-ს წაკითხვა" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "დირექტორია B-ს წაკითხვა" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "დირექტორია C-ს წაკითხვა" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "ზოგიერთი ქვედირექტორიის წაკითხვა ვერ განხორციელდა" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "ქვედირექტორიების უფლებების შემოწმება." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "მზად." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "დირექტორიის შედარების სტატუსი" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "ქვედირექტორიების რაოდენობა:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "ტოლი ფაილების რაოდენობა:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "განსხვავებული ფაილების რაოდენობა:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "ხელით შერწყმების რაოდენობა:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "ეს მოსდის ყველა შერწყმის ოპერაციას." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "ყველა შერწყმის ოპერაციების შეცვლა" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&გაგრძელება" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "მიმდინარეობა " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "გასაკეთებელი." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "A-ს ასლი B-ში" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "B-ს ასლი A-ში" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "A-ს წაშლა" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "B-ს წაშლა" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "A და B-ს წაშლა" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "შერწყმა A-სკენ" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "შერწყმა B-სკენ" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "შერწყმა A და B-სკენ" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "წაშლა (თუ არსებობს)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "შერწყმა" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "შერწყმა (ხელით)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "შეცდომა: კონფლიქტურ ფაილთა ტიპები" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "შეცდომა: თარიღები იდენტურია, მარა ფაილები არა." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "ეს ოპერაცია ახლა შეუძლებელია." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "ოპერაცია შეუძლებელია" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -342,40 +342,40 @@ msgstr "" "\n" "თუ იცით როგორ განახორციალოთ ეს, გთხოვთ დაუკავსირდეთ პროგრამის ავტორს." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "პროგრამის შეცდომა" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "ასლის გაკეთებისას შეცდომა მოხდა.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "შერწმის შეცდომა" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "შეცდომა." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "შესრულებულია." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "არაა შენახული." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "შერწყმის უცნობი ოპერაცია. (ეს არასდროს არ უნდა მომხდარიყო!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "შერწყმის უცნობი ოპერაცია." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -394,40 +394,40 @@ msgstr "" "გაითვალისწინეთ ეს პროგრამა ჯერ კიდევ ბეტაა და არანაერი გარანტია არ არსებობს! " "სასიცოცხლო მნიშვნელობის მონაცემების სარეზერვო ასლები გააკეთეთ!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "შერწყმის დაწყება" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "გააკეთე" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "სიმულაცია" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" "მარკირებული ელემენტი სხვადასხვა დირექტორიებში სხვადასხვაა. აირჩიეთ რა ქნათ." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" "ფაილის მოდიფიკაციის თარიღები იდენტურია მარა ფაილები არა. აირჩიეთ რა გააკეთოთ." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" "ოპერაცია ახლა შეუძლებელია, რადგან დირექტორიათა შერწყმა უკვე გაშვებულია." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -437,282 +437,282 @@ msgstr "" "გსურთ ამ ელემენტით გაგრძელება, რომლის გამოც გდება შეცდომა, თუ გსურთ " "გადაახტეთ მას?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "შეცდომის შემდეგ შერწმის გაგრძელება" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "უკანასკნელი ელემენტით გაგრძელება" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "ელემენტის გაცდენა" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "გაცდენილია." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "მიმდინარეობს..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "შერწყმის ოპერაცია დასრულდა." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "შერწყმა დასრულდა" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "შერწყმის სიმულაცია დასრულდა: შეამოწმეთ თუ ეთანხმებით შემოთავაზებულ " "ოპერაციებს." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "შეცდომა მოხდა. დააწკაპუნეთ OK დეტალური ცნობების სანახავად.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "შეცდომა: %1-ს წასლის დროს: სარეზერვო ასლის შექმნა ვერ შედგა." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "დირექტორიის რეკურსიულად წაშლა( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "წაშლა( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "შეცდომა: დირექტორიის წაშლის ოპერაცია ვერ შედგა წაკითხვის მცდელობისას." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "შეცდომა: rmdir( %1 ) ოპერაცია ვერ შედგა." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "შეცდომა: წაშლის ოპპერაცია ვერ შედგა." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ხელით შერწყმა( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " გაითვალისწინეთ: ხელით შერწყმის შემდეგ მომხმარებელმა უნდა გააგრძელოს F7-" "ის დაჭერით." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "შეცდომა: ასლი( %1 -> %2 ) ვერ შედგა.არსებული დანიშნულების ფაილის წაშლა ვერ " "შედგა." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "შეცდომა copyLink ვერ შედგა: დაშორებული ბმულები ჯერ არ არის მხარდაჭერილი." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "შეცდომა: copyLink ვერ შედგა." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "ასლი( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "შეცდომა სახელის გადარქმევისას( %1 -> %2 ): არსებული დანიშნულების წაშლა " "შეუძლებელია." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "შეცდომა: სახელის გადარქმევა ვერ შედგა." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "შეცდომა %1-ს makeDir-ის დროს. არსებული ფაილის წაშლა შეუძლებელია," -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "დირექტორიის შექმნისას შეცდომა." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "ტიპი" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "ზომა" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "უკანასკნელად ჩასწორებულია" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "ბმულის დანიშნულება" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "ხელმიუწვდომელია" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (ფუძე): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Dest:" -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 #, fuzzy msgid "Save Directory Merge State As..." msgstr "დირექტორიათა შერწყმა" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "დირექტორიის შერწყმის დაწყება/გაგრძელება" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "მიმდინარე ელემენტიდან ოპერაციის გაშვება" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "მონიშნული ფაილების შედარება" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "მიმდინარე ფაილის შერწყმა" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "ყველა ქვედირექტორიის ჩაკეცვა" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "ყველა ქვედირექტორიის არჩაკეცვა" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "A -თვის ყველა ელემენტების არჩევა" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "B -თვის ყველა ელემენტების არჩევა" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "C -თვის ყველა ელემენტების არჩევა" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "ყველა ელემენტების ოპერაციების ავტო-არჩევა" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "ყველა ელემენტისთვის არავითარი ოპერაცია" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 #, fuzzy msgid "Show Different Files" msgstr "განსხვავებული ფაილების რაოდენობა:" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "მონიშნული ფაილების შედარება" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "მონიშნული ფაილების შედარება" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "არაფრის არ გაკეთება" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "A და B წაშლა" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "შერწყმა A და B-სკენ" diff --git a/translations/messages/kdiff3/kdiff3.pot b/translations/messages/kdiff3/kdiff3.pot index 0040c64..c3a59ef 100644 --- a/translations/messages/kdiff3/kdiff3.pot +++ b/translations/messages/kdiff3/kdiff3.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -27,11 +27,11 @@ msgid "" "Your emails" msgstr "" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "" @@ -63,11 +63,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "" @@ -99,218 +99,218 @@ msgstr "" msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "" -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -319,40 +319,40 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "" -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "" -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -364,306 +364,306 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "" diff --git a/translations/messages/kdiff3/lt.po b/translations/messages/kdiff3/lt.po index ebbdc04..bd4900f 100644 --- a/translations/messages/kdiff3/lt.po +++ b/translations/messages/kdiff3/lt.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: ziogelis 77\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2005-02-23 01:27+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -27,11 +27,11 @@ msgid "" "Your emails" msgstr "nobody@nowhere.lt" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "" @@ -63,11 +63,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Pab" @@ -99,12 +99,12 @@ msgstr "" msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 #, fuzzy msgid "Name" msgstr "" @@ -227,11 +227,11 @@ msgstr "" "#-#-#-#-# noatun.po (noatun) #-#-#-#-#\n" "Vardas" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Operacija" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 #, fuzzy msgid "Status" msgstr "" @@ -274,92 +274,92 @@ msgstr "" "#-#-#-#-# ksirc.po (ksirc) #-#-#-#-#\n" "Būsena" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 #, fuzzy @@ -396,110 +396,110 @@ msgstr "" "#-#-#-#-# kopete.po (kopete) #-#-#-#-#\n" "Pasirengęs." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Tęsti" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -508,40 +508,40 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Klaida." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Baigta." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -553,307 +553,307 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Tipas" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Dydis" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 #, fuzzy msgid "Do Nothing" msgstr "Nieko" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "" diff --git a/translations/messages/kdiff3/nb.po b/translations/messages/kdiff3/nb.po index e486cda..0da2663 100644 --- a/translations/messages/kdiff3/nb.po +++ b/translations/messages/kdiff3/nb.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2006-06-10 22:03+0200\n" "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n" "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n" @@ -28,11 +28,11 @@ msgid "" "Your emails" msgstr "bjornst@powertech.no" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "Klarte ikke å skrive fra utklippstavla til midlertidig fil." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Fra utklippstavla" @@ -76,11 +76,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "Alvorlig intern feil" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "Øverste linje" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Slutt" @@ -112,40 +112,40 @@ msgstr "Klarte ikke åpne %1." msgid "Comparing file..." msgstr "Sammenlikner fil ..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Feil ved lesing fra %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Navn" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Handling" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Uløst" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Løst" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Ikkehvitt" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Hvitt" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -153,35 +153,35 @@ msgstr "" "Nå utfører du en mappefletting. Er du sikker på at du vil avbryte flettingen " "og lese gjennom mappa på nytt?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Les på nytt" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Fortsett fletting" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Klarte ikke åpne mapper:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Mappe A «%1» finnes ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Mappe B «%1» finnes ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Mappe C «%1» finnes ikke eller er ikke en mappe.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Feil ved åpning av mappe" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -190,144 +190,144 @@ msgstr "" "Målmappa må være en annen enn A eller B når tre mapper flettes.\n" "Kontroller igjen før du fortsetter." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Parameter-advarsel" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Leser mapper ..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Leser mappe A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Leser mappe B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Leser mappe C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Noen undermapper var ikke lesbare i" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Kontroller rettigheter på undermappene." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Klar." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Status for mappesammenlikning" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Antall undermapper:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Antall like filer:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Antall forskjellige filer:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Antall manuelle flettinger:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Dette påvirker alle flettehandlinger." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Endre alle flette-handlinger" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "F&ortsett" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Arbeider " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Gjenstår." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Kopier A til B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Kopier B til A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Slett A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Slett B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Slett A & B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Flett til A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Flett til B" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Flett til A & B" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Slett (hvis det finnes)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Flett sammen" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Flett (manuelt)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Feil: Konflikt mellom filtyper" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Feil: Datoene er like, men ikke filene." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Denne handlingen er ikke mulig nå." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Handling ikke mulig" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -341,40 +341,40 @@ msgstr "" "\n" "Hvis du vet hvordan dette kan gjenskapes, ta kontakt med programforfatteren." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Programfeil" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Det oppsto en feil under kopiering.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Flettefeil" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Feil." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Ferdig." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Ikke lagret." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Ukjent flettehandling. (Dette må aldri skje!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Ukjent flettehandling." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -393,19 +393,19 @@ msgstr "" "Vær oppmerksom på at dette programmet er i beta-status og det er OVERHODET " "INGEN GARANTI! Ta sikkerhetskopi av vitale data!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Starter fletting" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Gjør det" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Simuler det" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -413,7 +413,7 @@ msgstr "" "Det markerte elementet har forskjellig type i de forskjellige mappene. Velg " "hva som skal gjøres." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -421,13 +421,13 @@ msgstr "" "Filene er ulike men har samme dato for siste endring. Velg hva som skal " "gjøres." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "Denne handlingen er ikke mulig nå fordi en mappefletting pågår." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -436,273 +436,273 @@ msgstr "" "Det var en feil i siste steg.\n" "Vil du fortsette med elementet som ga feil, eller hoppe over det?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Fortsett fletting etter feil" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Fortsett med siste element" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Hopp over element" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Hoppet over." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "Pågår ..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Flettehandling fullført." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Fletting fullført" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Simulert fletting fullført. Se etter om du er enig i de foreslåtte " "handlingene." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Det oppsto en feil. Trykk OK for å se detaljerte opplysninger.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "Feil: Under sletting av %1: oppretting av sikkerhetskopi mislyktes." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "slett mappe rekursivt( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "slett ( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Feil: mappesletting mislyktes under forsøk på å lese mappa." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Feil: rmdir( %1 ) mislyktes." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Feil: sletting mislyktes." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "manuell fletting( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Merk: Etter en manuell fletting bør brukeren fortsette ved å trykke F7." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Feil: kopiering (%1 -> %2) mislyktes. Eksisterende mål kunne ikke slettes." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Feil: copyLink mislyktes. Det er ikke støtte for nettverkslenker ennå." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Feil: copyLink mislyktes." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "kopier(%1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Feil under navneendring( %1 -> %2 ): Kan ikke slette eksisterende mål." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "endre navn ( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Feil: navneendring mislyktes." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Feil ved oppretting av mappe %1. Kan ikke slette eksisterende fil." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "Lag mappe( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Feil under oppretting av mappe." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Mål" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Mappe" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Størrelse" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Siste endring" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Lenkemål" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "ikke tilgjengelig" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (mål): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (basis): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (mål): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (mål) :" -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Mål: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "Lagre status for mappefletting som ..." -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Start/fortsett mappefletting" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Kjør handling for gjeldende element" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Sammenlikne valgt fil" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Flett gjeldende fil" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Brett sammen alle undermapper" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Fold ut alle undermapper" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Velg A for alle elementer" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Velg B for alle elementer" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Velg C for alle elementer" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Auto-velg handling for alle elementer" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Ingen handling for alle elementer" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "Vis identiske filer" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "Vis forskjellige filer" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "Vis filer bare i A" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "Vis filer bare i B" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "Vis filer bare i C" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "Sammenlikne uttrykkelig valgte filer" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "Flett uttrykkelig valgte filer" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Ikke gjør noe" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Slett A && B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Flett til A && B" diff --git a/translations/messages/kdiff3/nl.po b/translations/messages/kdiff3/nl.po index 2f3a3fd..f2b0aa5 100644 --- a/translations/messages/kdiff3/nl.po +++ b/translations/messages/kdiff3/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2006-11-27 00:05+0100\n" "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n" "Language-Team: Dutch <kde-i18n-nl@kde.org>\n" @@ -35,11 +35,11 @@ msgid "" msgstr "" "frank_schoolmeesters@yahoo.com,rinsedevries@kde.nl,bramschoenmakers@kde.nl" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "Het opslaan van de klembordinhoud in een tijdelijk bestand is mislukt." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Van klembord" @@ -84,11 +84,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "Ernstige interne fout" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "Bovenste regel" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Einde" @@ -120,40 +120,40 @@ msgstr "Het openen van %1 is mislukt." msgid "Comparing file..." msgstr "Bestand wordt vergeleken..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Fout bij het lezen van %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Naam" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Handeling" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Niet opgelost" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Opgelost" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Niet-wit" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Wit" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -162,35 +162,35 @@ msgstr "" "werkelijk, of wilt u het samenvoegen afbreken en de directory opnieuw " "inlezen?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Opnieuw inlezen" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Doorgaan met samenvoegen" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Het openen van de directorypen is mislukt:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Directory A \"%1\" bestaat niet of is geen directory.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Directory B \"%1\" bestaat niet of is geen directory.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Directory C \"%1\" bestaat niet of is geen directory.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Fout bij openen van directory" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -200,144 +200,144 @@ msgstr "" "worden samengevoegd.\n" "Controleer dit opnieuw voordat u doorgaat." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Parameter-waarschuwing" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Directorypen worden geanalyseerd..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Inlezen van directory A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Inlezen van directory B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Inlezen van directory C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Sommige subdirectorypen waren niet leesbaar in" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Controleer de toegangsrechten van de subdirectorypen." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Gereed." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Status van directorypenvergelijking" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Aantal subdirectorypen:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Aantal identieke bestanden:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Aantal verschillende bestanden:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Aantal handmatige samenvoegingen:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Dit heeft effect op alle samenvoegingen." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Verandering van alle samenvoegingen" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "D&oorgaan" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Voortgang" -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Onvoltooid." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "A naar B kopiëren" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "B naar A kopiëren" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "A verwijderen" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "B verwijderen" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "A & B verwijderen" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Samenvoegen met A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Samenvoegen met B" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Samenvoegen met A & B" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Verwijderen (indien voorhanden)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Samenvoegen" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Samenvoegen (handmatig)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Fout: botsende bestandstypen" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Fout: de datums zijn hetzelfde, maar de bestanden niet." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Deze handeling is momenteel niet beschikbaar." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Handeling niet mogelijk" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -352,40 +352,40 @@ msgstr "" "Als u dit kunt reproduceren, neem dan contact op met de auteur van dit " "programma." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Programmafout" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Er deed zich een fout voor tijdens het kopiëren.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Fout bij samenvoegen" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Fout." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Gereed." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Niet opgeslagen." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Onbekende samenvoeging. (Dit mag niet voorkomen!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Onbekende samenvoeging." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -406,19 +406,19 @@ msgstr "" "GEEN ENKELE GARANTIE dat het programma naar behoren zal werken. Maak " "reservekopieën van uw vitale gegevens!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Samenvoeging starten" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Starten" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Simuleren" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -426,7 +426,7 @@ msgstr "" "Het gemarkeerde item is van een verschillend type in de verschillende " "directorypen. Kies wat er moet gebeuren." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -434,7 +434,7 @@ msgstr "" "De wijzigingsdatums van het bestanden zijn gelijk, maar de bestanden niet. " "Kies wat er moet gebeuren." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -442,7 +442,7 @@ msgstr "" "Deze handeling is niet mogelijk omdat er momenteel een directory wordt " "samengevoegd." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -452,283 +452,283 @@ msgstr "" "Wilt u doorgaan met het item dat de fout veroorzaakte of wilt u dit item " "overslaan?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Samenvoegen voortzetten na een foutmelding" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Verdergaan met het laatste item" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Item overslaan" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Overgeslagen." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "In uitvoering..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "De samenvoeging is voltooid." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Samenvoeging voltooid" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Samenvoegsimulatie is voltooid. Controleer of u akkoord kunt gaan met de " "voorgestelde handelingen." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Er deed zich een fout voor. Klik op OK voor meer details.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "Fout tijdens het wissen van %1: reservekopie aanmaken is mislukt." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "directory ( %1 ) recursief wissen" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "wissen ( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Fout: het wissen van de directory is mislukt omdat de directory niet kon " "worden geopend." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Fout: handeling voor directory verwijderen( %1 ) is mislukt." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Fout: wissen is mislukt." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "handmatig samenvoegen ( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Opmerking: na een handmatige samenvoeging dient de gebruiker verder te " "gaan via F7." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Fout: kopiëren( %1 -> %2 ) is mislukt. De bestaande bestemming kon niet " "gewist worden." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "Koppeling kopiëren ( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Fout: koppeling kopiëren is mislukt: externe koppelingen worden vooralsnog " "niet ondersteund." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Fout: koppeling kopiëren is mislukt." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "kopiëren ( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Fout tijdens het hernoemen ( %1 -> %2 ): de bestaande bestemming kan niet " "worden gewist." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "hernoemen( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Fout: hernoemen is mislukt." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Fout tijdens het aanmaken van de directory %1. Bestaand bestand kan niet " "worden gewist." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "Directory aanmaken( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Fout bij het aanmaken van de directory." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Doel" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Directory" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Grootte" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Laatste wijziging" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Koppelingsbestemming" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "niet beschikbaar" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (doel): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (basis): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (doel): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (doel): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Doel: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "Staat van directorypen samenvoegen opslaan als..." -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Directorysamenvoeging starten/voortzetten" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Handeling uitvoeren voor huidig item" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Geselecteerde bestand vergelijken" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Huidig bestand samenvoegen" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Alle subdirectorypen invouwen" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Alle subdirectorypen uitvouwen" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Voor alle items A kiezen" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Voor alle items B kiezen" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Voor alle items C kiezen" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Handeling voor alle items automatisch kiezen" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Geen handeling voor alle items" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "Identieke bestanden tonen" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "Verschillende bestanden tonen" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "Bestanden alleen in A tonen" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "Bestanden alleen in B tonen" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "Bestanden alleen in C tonen" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "Expliciet geselecteerde bestand vergelijken" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "Expliciet geselecteerde bestanden samenvoegen" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Niets doen" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "A && B verwijderen" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Samenvoegen met A && B" diff --git a/translations/messages/kdiff3/pl.po b/translations/messages/kdiff3/pl.po index 5826a34..ffe1efe 100644 --- a/translations/messages/kdiff3/pl.po +++ b/translations/messages/kdiff3/pl.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2005-12-30 14:10+0100\n" "Last-Translator: Robert Gomulka <rgom@o2.pl>\n" "Language-Team: polish <pl@li.org>\n" @@ -38,11 +38,11 @@ msgid "" "Your emails" msgstr "tom@w.pl" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "Błąd zapisu zawartości schowka do pliku tymczasowego." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "ze schowka" @@ -87,12 +87,12 @@ msgstr "" msgid "Severe Internal Error" msgstr "Poważny błąd wewnętrzny" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Nr pierwszej linii na ekranie: %1" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Koniec" @@ -124,40 +124,40 @@ msgstr "Otwieranie %1 nie powiodło się." msgid "Comparing file..." msgstr "Porównywanie pliku..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Błąd czytania z %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Nazwa" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Operacja" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Nierozwiązane" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Rozwiązane" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Nie biały" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Biały" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -165,35 +165,35 @@ msgstr "" "Obecnie wykonywane jest łączenie katalogów. Jesteś pewny że chcesz przerwać " "tą operację i ponownie przeskanować katalog?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Ponowne skanowanie" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Wznów łączenie" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Otwieranie katalogu nie powiodło się:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Katalog A \"%1\" nie istnieje lub nie jest katalogiem.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Katalog B \"%1\" nie istnieje lub nie jest katalogiem.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Katalog C \"%1\" nie istnieje lub nie jest katalogiem.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Błąd otwierania katalogu" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -203,144 +203,144 @@ msgstr "" "katalogi.\n" "Sprawdź ponownie zanim będziesz kontynuować." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Ostrzeżenie co do parametru" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Skanowanie katalogów ..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Czytanie katalogu A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Czytanie katalogu B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Czytanie katalogu C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Niektóre podkatalogi są nie do odczytu w" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Sprawdź prawa dostępu do podkatalogów." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Gotowe." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Status porównywania katalogów" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Liczba podkatalogów:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Liczba identycznych plików:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Liczba różniących się plików:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Liczba ręcznych połączeń:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "To wpłynie na wszystkie operacje łączenia." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Zmiana wszystkich operacji łączenia" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "K&ontynuuj" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "W trakcie " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Do zrobienia." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Kopiuj A do B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Kopiuj B do A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Usuń A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Usuń B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Usuń A i B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Połącz z A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Połącz z B" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Połącz z A i B" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Usuń (jeśli istnieje)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Połącz" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Połącz (ręcznie)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Błąd: Konflikt typów plików" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Błąd: Data identyczna ale pliki nie." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Ta operacja jest w tej chwili niemożliwa." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Niemożliwa operacja" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -354,40 +354,40 @@ msgstr "" "\n" "Jeśli wiesz jak to powtórzyć, proszę skontaktować się z autorem programu." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Błąd programu" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Wystąpił błąd w trakcie kopiowania.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Błąd połączenia" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Błąd." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Zrobione." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Niezapisane." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Nieznana operacja połączenia. (To się nigdy nie powinno wydarzyć!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Nieznana operacja łączenia." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -406,33 +406,33 @@ msgstr "" "Miej na uwadze że program nadal jest wersji beta i BRAK GWARANCJI co do " "wyników działania! Wykonaj kopie zapasowe swoich istotnych danych!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Rozpoczęcie połączenia" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Wykonaj" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Symuluj" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" "Podświetlona pozycja jest innego typu w innym katalogu. Wybierz co zrobić." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" "Data modyfikacji plików jest taka sama ale pliki nie. Wybierz co zrobić." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -440,7 +440,7 @@ msgstr "" "Ta operacja jest nie możliwa do wykonania w tej chwili gdyż obecnie " "wykonywana jest operacja połączenia katalogów." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -449,282 +449,282 @@ msgstr "" "W ostatnim kroku wystąpił błąd.\n" "Chcesz kontynuować z pozycja która powoduje błąd czy tez pominąć tą pozycję?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Kontynuuj połączenie po błędzie" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Kontynuuj z ostatnią pozycją" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Pomiń pozycję" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Pominięto." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "W trakcie..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Operacja połączenia zakończona." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Połączenie zakończone" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Symulacja połączenia zakończona. Sprawdź czy zgadzasz się na zaproponowane " "operacje." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Wystąpił błąd. Wciśnij OK aby zobaczyć szczegółowe informacje.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "Błąd: W trakcie usuwania %1: Błąd tworzenia kopii zapasowej." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "usuwaj katalogi rekursywnie( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "usuń( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Błąd: Nieudane usuwanie katalogu w momencie próby czytania katalogu." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Błąd: rmdir( %1 ) operacja nieudana." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Błąd: Nieudana operacja usuwania." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ręczne połączenie( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Uwaga: Po ręcznym połączeniu użytkownik powinien kontynuować wciskając " "F7." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Błąd: Nieudane kopiowanie( %1 -> %2 ) .Nieudane kasowanie katalogu " "docelowego." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Błąd: Nie udane copyLink: Odległe dowiązania nie są jeszcze obsługiwane." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Błąd: Nieudane copyLink." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "kopiowanie( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Błąd w czasie zmiany nazwy( %1 -> %2 ): Nie można usunąć istniejącego " "miejsca docelowego." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "zmiana nazwy( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Błąd: Nieudana zmiana nazwy." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Błąd w czasie makeDir %1. Nie można usunąć istniejącego pliku." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Błąd w trakcie tworzenia katalogu." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Cel" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Katalog" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Rozmiar" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Atrybut" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Ostatnia modyfikacja" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Dowiązanie do pliku" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "niedostępne" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (Cel): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (Podstawa): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (Cel): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (Cel): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Cel: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Połączenia katalogów" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Start/Kontynuuj Połączenie Katalogów " -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "wykonaj operację na bieżącej pozycji" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Porównaj zaznaczone pliki" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Połącz bieżący plik" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Uwzględnij podkatalogi" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Nie uwzględniaj podkatalogów" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Wybierz A dla wszystkich pozycji" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Wybierz B dla wszystkich pozycji" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Wybierz C dla wszystkich pozycji" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Automatyczny wybór dla wszystkich pozycji" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Brak operacji dla wszystkich pozycji" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 #, fuzzy msgid "Show Different Files" msgstr "Liczba różniących się plików:" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Porównaj zaznaczone pliki" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Porównaj zaznaczone pliki" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Nic nie rób" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Usuń A i B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Połącz z A i B" diff --git a/translations/messages/kdiff3/pt.po b/translations/messages/kdiff3/pt.po index 2836eed..7b8c162 100644 --- a/translations/messages/kdiff3/pt.po +++ b/translations/messages/kdiff3/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2006-11-05 14:35+0000\n" "Last-Translator: Pedro Morais <morais@kde.org>\n" "Language-Team: pt <kde-i18n-pt@kde.org>\n" @@ -26,13 +26,13 @@ msgid "" "Your emails" msgstr "jncp@netcabo.pt,morais@kde.org" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "" "A escrita de dados da área de transferência para o ficheiro temporário " "falhou." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Da Área de Transferência" @@ -73,11 +73,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "Erro Interno Grave" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "Linha de topo" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Fim" @@ -109,40 +109,40 @@ msgstr "O acesso ao %1 foi mal-sucedido." msgid "Comparing file..." msgstr "A comparar o ficheiro..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Erro ao ler de %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Nome" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Operação" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Estado" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Não resolvido" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Resolvido" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Não vazio" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Vazio" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -150,35 +150,35 @@ msgstr "" "Você está neste momento a fazer uma junção de pastas. Tem a certeza que " "deseja interromper a junção e analisar a pasta de novo?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Pesquisar de Novo" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Continuar a Junção" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "O acesso às pastas foi mal-sucedido:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "A pasta A \"%1\" não existe ou não é uma pasta.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "A pasta B \"%1\" não existe ou não é uma pasta.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "A pasta C \"%1\" não existe ou não é uma pasta.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Erro de Acesso à Pasta" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -188,144 +188,144 @@ msgstr "" "três pastas.\n" "Verifique de novo antes de continuar." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Aviso do Parâmetro" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "A pesquisar as pastas..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "A Ler a Pasta A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "A Ler a Pasta B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "A Ler a Pasta C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Algumas das sub-pastas não eram legíveis" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Verifique as permissões das sub-pastas." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Pronto." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Estado da Comparação da Pasta" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Número de sub-pastas:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Número de ficheiros iguais:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Número de ficheiros diferentes:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Número de junções manuais:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Isto afecta todas as operações de junção." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "A Mudar Todas as Operações de Junção" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "C&ontinuar" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "A processar " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "A fazer." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Copiar A para B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Copiar B para A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Apagar A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Apagar B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Apagar A e B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Juntar a A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Juntar a B" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Juntar a A e B" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Apagar (se existir)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Reunir" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Juntar (manual)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Erro: Tipos de Ficheiros em Conflito" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Erro: As datas são iguais mas os ficheiros não." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Esta operação não é possível de momento." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Operação Não Possível" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -339,40 +339,40 @@ msgstr "" "\n" "Se souber como reproduzir isto, contacte por favor o autor do programa." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Erro no Programa" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Ocorreu um erro ao copiar.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Erro na Junção" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Erro." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Terminado." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Não gravado." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Operação de junção desconhecida. (Isto nunca deve acontecer!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Operação de junção desconhecida." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -391,19 +391,19 @@ msgstr "" "Tenha em atenção que este programa está ainda em estado Beta e NÃO EXISTE " "NENHUMA GARANTIA! Faça cópias de segurança dos seus dados vitais!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "A Iniciar a Junção" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Fazê-lo" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Simulá-lo" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -411,7 +411,7 @@ msgstr "" "O item realçado tem um tipo diferente nas várias pastas. Seleccione o que " "fazer." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -419,7 +419,7 @@ msgstr "" "As datas de modificação dos ficheiros são iguais mas estes não o são. " "Seleccione o que fazer." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -427,7 +427,7 @@ msgstr "" "Esta operação não é possível de momento que a junção da pasta está a " "decorrer." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -436,276 +436,276 @@ msgstr "" "Ocorreu um erro no último passo.\n" "Deseja continuar com o item que causou o erro ou deseja saltar este item?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Continuar a junção após um erro" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Continuar com o Último Item" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Saltar o Item" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Ignorado." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "Em progresso..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "A operação de junção terminou." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Junção Completa" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "A simulação da junção terminou: Verifique se concorda com as operações " "propostas." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Ocorreu um erro. Carregue em OK para ver a informação detalhada.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "Erro: Ao tentar apagar o %1: a criação da cópia de segurança falhou." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "apagar recursivamente as pastas( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "delete( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Erro: a operação de remoção da pasta falhou ao tentar ler a pasta." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Erro: a operação rmdir( %1 ) falhou." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Erro: a operação de remoção falhou." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "junção manual( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Nota: Após uma junção manual o utilizador deve continuar com o F7." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Erro: a cópia( %1 -> %2 ) falhou. A remoção do destino existente falhou." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Erro: o copyLink falhou: As ligações remotas ainda não são suportadas." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Erro: o copyLink falhou." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "cópia( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Erro durante o rename( %1 -> %2 ): Não é possível remover o destino " "existente." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Erro: A mudança de nome falhou." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Erro durante o makeDir do %1. Não é possível remover o ficheiro existente." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Erro ao criar a pasta." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Tamanho" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Atrib" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Última Modificação" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Ligação-Destino" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "não disponível" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Dest: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "Gravar o Estado da Junção de Pastas Como..." -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Iniciar/Continuar a Junção da Pasta" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Executar a Operação no Item Actual" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Comparar o Ficheiro Seleccionado" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Juntar o Ficheiro Actual" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Fechar Todas as Sub-Pasta" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Expandir Todas as Sub-Pastas" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Seleccionar Todos os Itens do A" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Seleccionar Todos os Itens do B" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Seleccionar Todos os Itens do C" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Escolher Automaticamente a Operação para Todos os Itens" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Nenhuma Operação para Todos os Itens" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "Mostrar os Ficheiros Idênticos" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "Mostrar os Ficheiros Diferentes" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "Mostrar os Ficheiros Apenas no A" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "Mostrar os Ficheiros Apenas no B" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "Mostrar os Ficheiros Apenas no C" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "Comparar os Ficheiros Seleccionados Explicitamente" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "Juntar os Ficheiros Seleccionados Explicitamente" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Não Fazer Nada" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Apagar A e B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Juntar a A e B" diff --git a/translations/messages/kdiff3/pt_BR.po b/translations/messages/kdiff3/pt_BR.po index 936267e..6725ed9 100644 --- a/translations/messages/kdiff3/pt_BR.po +++ b/translations/messages/kdiff3/pt_BR.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2007-01-30 20:41-0200\n" "Last-Translator: Diniz Bortolotto <diniz.bb@gmail.com>\n" "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n" @@ -41,13 +41,13 @@ msgid "" "Your emails" msgstr "diniz.bb@gmail.com, phalkmin@yahoo.com.br" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "" "A gravação de dados da área de transferência para o arquivo temporário " "falhou." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Da Área de Transferência" @@ -92,11 +92,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "Erro Interno Grave" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "Linha de topo" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Fim" @@ -128,40 +128,40 @@ msgstr "O acesso a %1 falhou." msgid "Comparing file..." msgstr "Comparando arquivo..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Erro ao ler de %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Nome" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Operação" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Não resolvido" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Resolvido" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Não vazio" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Vazio" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -169,35 +169,35 @@ msgstr "" "Você está neste momento fazendo uma mesclagem de diretórios. Tem certeza que " "deseja interromper a mesclagem e analisar o diretório de novo?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Pesquisar de Novo" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Continuar Mesclando" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Abertura de diretórios falhou:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Dir A \"%1\" não existe ou não é um diretório.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Dir B \"%1\" não existe ou não é um diretório.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Dir C \"%1\" não existe ou não é um diretório.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Erro na abertura do Diretório" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -207,144 +207,144 @@ msgstr "" "três diretórios.\n" "Verifique de novo antes de continuar." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Aviso de Parâmetro" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Pesquisando diretórios..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Lendo Diretório A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Lendo Diretório B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Lendo Diretório C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Alguns sub-diretórios não eram legíveis" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Verifique as permissões dos sub-diretórios." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Pronto." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Status da Comparação de Diretório" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Número de sub-diretórios:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Número de arquivos iguais:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Número de arquivos diferentes:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Número de mesclagens manuais:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Isto afeta todas as operações de mesclagem." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Mudando Todas as Operações de Mesclagem" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "C&ontinuar" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Processando " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Fazer." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Copiar A para B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Copiar B para A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Apagar A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Apagar B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Apagar A e B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Mesclar com A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Mesclar com B" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Mesclar com A e B" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Apagar (se existir)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Mesclar" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Mesclar (manual)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Erro: Tipos de Arquivos em Conflito" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Erro: As datas são iguais mas os arquivos não." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Esta operação não é possível no momento." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Operação Não Possível" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -358,40 +358,40 @@ msgstr "" "\n" "Se souber como reproduzir isto, contate por favor o autor do programa." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Erro no Programa" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Ocorreu um erro ao copiar.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Erro na Mesclagem" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Erro." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Terminado." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Não salvo." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Operação de mesclagem desconhecida. (Isto nunca deve acontecer!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Operação de mesclagem desconhecida." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -410,19 +410,19 @@ msgstr "" " Saiba que esse programa ainda está em fase beta, e NÃO HÁ GARANTIA alguma! " "Faça backups dos seus dados!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Iniciando Mesclagem" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Faça" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Simular" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -430,7 +430,7 @@ msgstr "" "O item selecionado tem um tipo diferente nos diferentes diretórios. " "Selecione o que fazer." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -438,7 +438,7 @@ msgstr "" "As datas de modificação do arquivo são iguais mas os arquivos não são. " "Selecione o que fazer." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -446,7 +446,7 @@ msgstr "" "Esta operação não é possível no momento porque uma mesclagem de diretório " "está em execução." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -455,278 +455,278 @@ msgstr "" "Houve um erro no último passo.\n" "Você quer continuar com o item que causou o erro ou prefere pular esse item?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Continuar mesclagem após um erro" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Continuar com o Último Item" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Pular Item" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Ignorado." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "Em progresso..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Operação de mesclagem completa." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Mesclagem completa." -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "A simulação de mesclagem terminou: Verifique se concorda com as operações " "propostas." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Ocorreu um erro. Pressione OK para ver informações detalhadas.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "Erro: Ao tentar apagar %1: Criação da cópia de segurança falhou." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "apagar diretório recursivamente( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "apagar( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Erro: a operação de remoção de diretório falhou quando tentava ler o " "diretório." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Erro: rmdir( %1 ) operação falhou." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Erro: a operação de remoção falhou." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "mesclagem manual( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Nota: Após uma mesclagem manual o usuário deve continuar pressionando " "F7." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "Erro: cópia( %1 -> %2 ) falhou. Remoção do destino existente falhou." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Erro: copyLink falhou: Ligações remotas ainda não são suportadas." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Erro: copyLink falhou." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "cópia( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Erro durante renomear( %1 -> %2 ): Não é possível remover o destino " "existente." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "renomear( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Erro: Renomear falhou." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Erro durante makeDir de %1. Não foi possível remover o arquivo existente." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Erro ao criar diretório." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Destino" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Tamanho" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Atributos" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Última modificação" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Ligação-Destino" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "não disponível" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (Destino):" -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (Destino): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Destino: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "Salvar o Estado da Mesclagem de Diretório Como..." -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Iniciar/Continuar Mesclagem de Diretório" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Executar Operação para o Item Atual" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Comparar Arquivo Selecionado" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Mesclar Arquivo Atual" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Fechar Todos Sub-diretórios" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Expandir Todos Sub-diretórios" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Selecionar Todos os Itens de A" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Selecionar Todos os Itens de B" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Selecionar Todos os Itens de C" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Escolher Automaticamente a Operação para Todos os Itens" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Nenhuma Operação para Todos os Itens" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "Mostrar Arquivos Idênticos" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "Mostrar os Arquivos Diferentes" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "Mostrar Arquivos apenas em A" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "Mostrar Arquivos apenas em B" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "Mostrar Arquivos apenas em C" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "Comparar Explicitamente os Arquivos Selecionados" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "Mesclar Explicitamente os Arquivos Selecionados" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Não Faça Nada" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Apagar A e B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Mesclar para A e B" diff --git a/translations/messages/kdiff3/ro.po b/translations/messages/kdiff3/ro.po index a99582d..b5453b5 100644 --- a/translations/messages/kdiff3/ro.po +++ b/translations/messages/kdiff3/ro.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: @PACKAGE\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2003-11-08 18:45+0200\n" "Last-Translator: Claudiu Costin <claudiuc@kde.org>\n" "Language-Team: Romanian <ro-kde@egroups.com>\n" @@ -27,11 +27,11 @@ msgid "" "Your emails" msgstr "claudiuc@kde.org" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "" @@ -63,11 +63,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "" @@ -99,218 +99,218 @@ msgstr "" msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "" -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -319,40 +319,40 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "" -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "" -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -364,306 +364,306 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "" diff --git a/translations/messages/kdiff3/ru.po b/translations/messages/kdiff3/ru.po index 2b69011..db0a7b7 100644 --- a/translations/messages/kdiff3/ru.po +++ b/translations/messages/kdiff3/ru.po @@ -1,13 +1,13 @@ # KDE3 - kdiff3.pot Russian translation. # KDE3 - kdeextragear-1/kdiff3.po Russian translation. # Nick Shaforostoff <shafff@ukr.net>, 2004-2005. -# +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" -"PO-Revision-Date: 2020-01-05 16:07+0000\n" -"Last-Translator: Serg Bormant <bormant@mail.ru>\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" +"PO-Revision-Date: 2023-12-01 21:13+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" "projects/applications/kdiff3/ru/>\n" "Language: ru\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 3.10\n" +"X-Generator: Weblate 4.17\n" #. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" @@ -30,11 +30,11 @@ msgid "" "Your emails" msgstr "linux@l10n.org.ua" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "Сбой записи буфера обмена во временный файл." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Из буфера обмена" @@ -66,12 +66,12 @@ msgstr "Потеря данных.\n" msgid "Severe Internal Error" msgstr "Внутренняя ошибка" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Первая строка %1" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Конец" @@ -103,40 +103,40 @@ msgstr "Не удалось открыть %1." msgid "Comparing file..." msgstr "Сравнивание файла..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Ошибка чтения из %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Имя" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Действие" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Состояние" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Неразрешённый" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Разрешённый" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Чёрный" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Белый" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -144,179 +144,179 @@ msgstr "" "Сейчас программа работает в режиме объединения каталогов. Действительно " "отменить объединение и пересканировать каталог?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Пересканировать" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Продолжить" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Не удалось открыть каталоги:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Каталог A \"%1\" не существует.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Каталог B \"%1\" не существует.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Каталог C \"%1\" не существует.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Ошибка чтения каталога" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "Путь к конечному каталогу не должен совпадать с A или B." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Неправильный параметр" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Сканирование каталогов..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Чтение каталога A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Чтение каталога B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Чтение каталога C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Не удалось почитать некоторые подкаталоги в" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Проверьте права этих каталогов." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Готово." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Состояние сравнения каталогов" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Количество подкаталогов:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Количество одинаковых файлов:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Количество разных файлов:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Количество объединений вручную:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Это влияет на все объединения" -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Изменение всех объединений" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Продолжить" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Обработка " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Осталось сделать." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Копировать A в B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Копировать B в A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Удалить A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Удалить B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Удалить A и B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Объединить в A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Объединить в B" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Объединить в A & B" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Удалить (если существует)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Объединить" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Объединить (вручную)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Ошибка: Несовместимые типы файлов" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Ошибка: Время совпадает, а содержимое файлов - нет." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Пока невозможно" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Пока невозможно" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -328,40 +328,40 @@ msgstr "" "\n" "Если вы знаете в чём причина, сообщите автору." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Ошибка программы" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Ошибка копирования.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Ошибка объединения" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Ошибка." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Готово." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Не сохранено." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Неизвестное объединение" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Неизвестное объединение" -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -379,26 +379,26 @@ msgstr "" "\n" "Мы советуем всегда делать резервные копии данных перед объединением!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Начало объединения" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Выполнить" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Эмулировать" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" "Выделенный файл имеет разный тип в каждом каталоге. Выберите что делать." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -406,13 +406,13 @@ msgstr "" "Даты последнего изменения файлов одинаковы, о содержимое - нет. Выберите что " "делать." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "Сейчас выполняется объединение каталогов" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -421,275 +421,275 @@ msgstr "" "На текущем этапе произошла ошибка.\n" "Продолжить или пропустить?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Продолжить после ошибки" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Продолжить" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Пропустить" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Пропущено." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "Идёт работа..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Объединение завершено." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Объединение завершено" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "Объединение завершено. Вы согласны с предлагаемыми изменениями?" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Произошла ошибка. Нажмите OK для подробностей.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "Не удалось создать резервную копию %1." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "удалить каталог рекурсивно(%1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "удалить( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Не удалось удалить каталог" -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Ошибка rmdir( %1 )." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Не удалось удалить." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "объединение вручную( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " После завершения объединения вручную нажмите F7." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Не удалось скопировать %1 в %2. Не удалось удалить существующее назначение." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "символическая ссылка( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Ошибка: Удалённые ссылки не поддерживаются." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Не удалось создать ссылку." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "копировать( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Не удалось переименовать %1 в%2. Не удалось удалить существующее назначение." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "переименовать( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Не удалось переименовать" -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Не удалось создать каталог %1. Не удалось удалить существующий файл." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "создать каталог( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Не удалось создать каталог" -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Назначение" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Каталог" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Тип" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Размер" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Атрибуты" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Последнее изменение" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Объект ссылки" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "не доступно" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (назначение): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (исходное): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (назначение): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (назначение): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Назначение: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Объединение каталогов" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Начать/продолжить объединение каталогов" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Выполнить для текущего пункта" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Сравнить выделенный файл" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Объединить текущий файл" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Включая все подкаталоги" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Исключая все подкаталоги" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Выбрать A для всех" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Выбрать B для всех" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Выбрать C для всех" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Автоматически выбирать тип действия для всех" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Убрать действия для всех" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 #, fuzzy msgid "Show Different Files" msgstr "Количество разных файлов:" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Сравнить выделенный файл" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Сравнить выделенный файл" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Ничего" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Удалить A и B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Объединить в A & B" @@ -2178,7 +2178,7 @@ msgstr "" #: pdiff.cpp:981 msgid "Abort" -msgstr "Стоп" +msgstr "Прервать" #: pdiff.cpp:987 pdiff.cpp:1084 msgid "Opening files..." diff --git a/translations/messages/kdiff3/rw.po b/translations/messages/kdiff3/rw.po index 64370ab..e5d07ba 100644 --- a/translations/messages/kdiff3/rw.po +++ b/translations/messages/kdiff3/rw.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3 3.4\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2005-05-25 18:07-0600\n" "Last-Translator: Steve Murphy <murf@e-tools.com>\n" "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n" @@ -40,12 +40,12 @@ msgstr "" "muvia1@yahoo.fr, ngenda_denis@yahoo.co.uk, akiberwa@yahoo.co.uk, " "ndonatienuk@yahoo.co.uk" -#: diff.cpp:247 +#: diff.cpp:248 #, fuzzy msgid "Writing clipboard data to temp file failed." msgstr "Ububikokoporora Ibyatanzwe Kuri Idosiye Byanze . " -#: diff.cpp:251 +#: diff.cpp:252 #, fuzzy msgid "From Clipboard" msgstr "Ububikokoporora" @@ -94,12 +94,12 @@ msgstr "" msgid "Severe Internal Error" msgstr "Ikosa " -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Umurongo: %1 " -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Impera" @@ -138,85 +138,85 @@ msgstr "%1 Byanze . " msgid "Comparing file..." msgstr "Idosiye ... " -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, fuzzy, c-format msgid "Error reading from %1" msgstr "Ikosa Kuva: %1 " -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Izina" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Igikorwa" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Imimerere" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 #, fuzzy msgid "Unsolved" msgstr "Kidakoreshwa" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 #, fuzzy msgid "Solved" msgstr "Gikomeye" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 #, fuzzy msgid "Nonwhite" msgstr "Nta na kimwe" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Umweru" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 #, fuzzy msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "A Ububiko Gukomatanya . , Kuri Kureka i Gukomatanya na i Ububiko ? " -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 #, fuzzy msgid "Rescan" msgstr "Urukiramende" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 #, fuzzy msgid "Continue Merging" msgstr "Gukomeza " -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 #, fuzzy msgid "Opening of directories failed:" msgstr "Bya ububiko bw'amaderese Byanze : " -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 #, fuzzy msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "A \" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 #, fuzzy msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "\" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 #, fuzzy msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "\" %1 \" OYA Cyangwa ni OYA A Ububiko . \n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 #, fuzzy msgid "Directory Open Error" msgstr "Gufungura Ikosa " -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 #, fuzzy msgid "" "The destination directory must not be the same as A or B when three " @@ -226,174 +226,174 @@ msgstr "" "Ishyika: Ububiko OYA i Nka A Cyangwa Ryari: ububiko bw'amaderese . \n" "Nanone Mbere . " -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 #, fuzzy msgid "Parameter Warning" msgstr "Kuburira bijyanye na mucapyi" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 #, fuzzy msgid "Scanning directories..." msgstr "ububiko bw'amaderese ... " -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 #, fuzzy msgid "Reading Directory A" msgstr "A " -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 #, fuzzy msgid "Reading Directory B" msgstr "Guhanga ububiko " -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 #, fuzzy msgid "Reading Directory C" msgstr "Guhanga ububiko " -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 #, fuzzy msgid "Some subdirectories were not readable in" msgstr "Ububiko bwungirije OYA in " -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 #, fuzzy msgid "Check the permissions of the subdirectories." msgstr "i Uruhushya Bya i Ububiko bwungirije . " -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Cyiteguye." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 #, fuzzy msgid "Directory Comparison Status" msgstr "Inzira y'ububiko" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 #, fuzzy msgid "Number of subdirectories:" msgstr "Bya Ububiko bwungirije : " -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 #, fuzzy msgid "Number of equal files:" msgstr "Bya bingana Idosiye : " -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 #, fuzzy msgid "Number of different files:" msgstr "Bya Idosiye : " -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 #, fuzzy msgid "Number of manual merges:" msgstr "Bya Bikorwa : " -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 #, fuzzy msgid "This affects all merge operations." msgstr "Byose Gukomatanya Ibikorwa: . " -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 #, fuzzy msgid "Changing All Merge Operations" msgstr "Ibikorerwa Ishusho" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "Komeza" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 #, fuzzy msgid "Processing " msgstr "Inonosora" -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 #, fuzzy msgid "To do." msgstr "Gukora" -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 #, fuzzy msgid "Copy A to B" msgstr "A Kuri " -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 #, fuzzy msgid "Copy B to A" msgstr "Kuri A " -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 #, fuzzy msgid "Delete A" msgstr "A " -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 #, fuzzy msgid "Delete B" msgstr "Gusiba #" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 #, fuzzy msgid "Delete A & B" msgstr "A & " -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 #, fuzzy msgid "Merge to A" msgstr "Kuri A " -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 #, fuzzy msgid "Merge to B" msgstr "Kuri " -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 #, fuzzy msgid "Merge to A & B" msgstr "Kuri A & " -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 #, fuzzy msgid "Delete (if exists)" msgstr "( NIBA ) " -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Gukomatanya" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 #, fuzzy msgid "Merge (manual)" msgstr "( Bikorwa ) " -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 #, fuzzy msgid "Error: Conflicting File Types" msgstr "Ikosa : Idosiye " -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 #, fuzzy msgid "Error: Dates are equal but files are not." msgstr "Ikosa : bingana Idosiye OYA . " -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 #, fuzzy msgid "This operation is currently not possible." msgstr "Igikorwa ni OYA . " -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 #, fuzzy msgid "Operation Not Possible" msgstr "Igikorwa nticyashobotse" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 #, fuzzy msgid "" "This should never happen: \n" @@ -406,46 +406,46 @@ msgstr "" "\n" ": = Kuri iyi , Umuntu i Porogaramu Umwanditsi: . " -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 #, fuzzy msgid "Program Error" msgstr "Ikosa " -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 #, fuzzy msgid "An error occurred while copying.\n" msgstr "Ikosa Gukoporora . \n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 #, fuzzy msgid "Merge Error" msgstr "Ikosa " -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Ikosa." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Byakozwe." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 #, fuzzy msgid "Not saved." msgstr "Bidasangiwe" -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 #, fuzzy msgid "Unknown merge operation. (This must never happen!)" msgstr "Gukomatanya Igikorwa . ( Nta na rimwe ! ) " -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 #, fuzzy msgid "Unknown merge operation." msgstr "Gukomatanya Igikorwa . " -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 #, fuzzy msgid "" "The merge is about to begin.\n" @@ -464,43 +464,43 @@ msgstr "" "\n" "iyi Porogaramu beta Imimerere na ni ! Ibyashyinguwe Bya Ibyatanzwe ! " -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 #, fuzzy msgid "Starting Merge" msgstr "Gutangiza serivise" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 #, fuzzy msgid "Do It" msgstr "Akadomo" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 #, fuzzy msgid "Simulate It" msgstr "Kwigana Igaragaza" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 #, fuzzy msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "Ikintu A Ubwoko: in i ububiko bw'amaderese . Kuri . " -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 #, fuzzy msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "Amatariki Bya i Idosiye bingana i Idosiye OYA . Kuri . " -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 #, fuzzy msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "Igikorwa ni OYA Ububiko Gukomatanya ni . " -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 #, fuzzy msgid "" "There was an error in the last step.\n" @@ -510,320 +510,320 @@ msgstr "" "Ikosa in i Iheruka Intera . \n" "Kuri Gukomeza Na: i Ikintu i Ikosa Cyangwa Kuri Gusimbuka iyi Ikintu ? " -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 #, fuzzy msgid "Continue merge after an error" msgstr "Gukomeza Gukomatanya Nyuma Ikosa " -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 #, fuzzy msgid "Continue With Last Item" msgstr "Gukomeza " -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 #, fuzzy msgid "Skip Item" msgstr "Ibigize by'ilisiti" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 #, fuzzy msgid "Skipped." msgstr "Byoherejwe ku" -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 #, fuzzy msgid "In progress..." msgstr "Aho bigeze: ... " -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 #, fuzzy msgid "Merge operation complete." msgstr "Igikorwa Byuzuye . " -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 #, fuzzy msgid "Merge Complete" msgstr "Gushyira ku gihe byarangiye" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 #, fuzzy msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "Gukomatanya Byuzuye : NIBA Na: i Ibikorwa: . " -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 #, fuzzy msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Habayemoikosa." -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 #, fuzzy msgid "Error: While deleting %1: Creating backup failed." msgstr "Ikosa : Gusiba %1 : Inyibutsa Byanze . " -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 #, fuzzy msgid "delete directory recursively( %1 )" msgstr "Gusiba Ububiko ( %1 ) " -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 #, fuzzy msgid "delete( %1 )" msgstr "Gusiba" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 #, fuzzy msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Ikosa : Gusiba Igikorwa Byanze Kuri Soma i Ububiko . " -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 #, fuzzy msgid "Error: rmdir( %1 ) operation failed." msgstr "Ikosa : ( %1 ) Igikorwa Byanze . " -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 #, fuzzy msgid "Error: delete operation failed." msgstr "Ikosa : Gusiba Igikorwa Byanze . " -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 #, fuzzy msgid "manual merge( %1, %2, %3 -> %4)" msgstr "Bikorwa Gukomatanya ( %1 , %2 , %3 - > %4 ) " -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 #, fuzzy msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "icyitonderwa : A Bikorwa Gukomatanya i Umukoresha Gukomeza ku . " -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 #, fuzzy msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "Ikosa : Gukoporora ( %1 - > %2 ) Byanze . Ishyika: Byanze . " -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 #, fuzzy msgid "copyLink( %1 -> %2 )" msgstr "Ihuza ku %1 (%2)" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 #, fuzzy msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Ikosa : Byanze : amahuza OYA . " -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 #, fuzzy msgid "Error: copyLink failed." msgstr "Ikosa : Byanze . " -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 #, fuzzy msgid "copy( %1 -> %2 )" msgstr "Gukoporora" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 #, fuzzy msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Ikosa Guhindura izina ( %1 - > %2 ) : Gusiba Ishyika: . " -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 #, fuzzy msgid "rename( %1 -> %2 )" msgstr "Guhindura izina" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 #, fuzzy msgid "Error: Rename failed." msgstr "Ikosa : Byanze . " -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 #, fuzzy msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Ikosa Bya %1 . Gusiba Idosiye . " -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 #, fuzzy msgid "Error while creating directory." msgstr "Ikosa Kurema Ububiko . " -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 #, fuzzy msgid "Dest" msgstr "Kugogora" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 #, fuzzy msgid "Dir" msgstr "Muhamagazatelefoni" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Ubwoko" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Ingano" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 #, fuzzy msgid "Attr" msgstr "Nyuma" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 #, fuzzy msgid "Last Modification" msgstr "Iherutse guhindurwa" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 #, fuzzy msgid "Link-Destination" msgstr "Ishyika" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 #, fuzzy msgid "not available" msgstr "Ntibonetse" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 #, fuzzy msgid "A (Dest): " msgstr "A ( ) : " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 #, fuzzy msgid "A (Base): " msgstr "A ( Base ) : " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 #, fuzzy msgid "Dest: " msgstr "Ibiro: %1" -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Seriveri y'ububiko:" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 #, fuzzy msgid "Start/Continue Directory Merge" msgstr "Gutangira /Gukomeza " -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 #, fuzzy msgid "Run Operation for Current Item" msgstr "ya: " -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 #, fuzzy msgid "Compare Selected File" msgstr "Idosiye " -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 #, fuzzy msgid "Merge Current File" msgstr "Idosiye " -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 #, fuzzy msgid "Fold All Subdirs" msgstr "Amajwi Yose" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 #, fuzzy msgid "Choose A for All Items" msgstr "A ya: " -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 #, fuzzy msgid "Choose B for All Items" msgstr "ya: " -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 #, fuzzy msgid "Choose C for All Items" msgstr "ya: " -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 #, fuzzy msgid "Auto-Choose Operation for All Items" msgstr "- ya: " -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 #, fuzzy msgid "No Operation for All Items" msgstr "ya: " -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 #, fuzzy msgid "Show Different Files" msgstr "Bya Idosiye : " -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Idosiye " -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Idosiye " -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Ntugire icyo Ukora" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 #, fuzzy msgid "Delete A && B" msgstr "A & & " -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 #, fuzzy msgid "Merge to A && B" msgstr "Kuri A & & " diff --git a/translations/messages/kdiff3/sk.po b/translations/messages/kdiff3/sk.po index 94d910c..6af5ff0 100644 --- a/translations/messages/kdiff3/sk.po +++ b/translations/messages/kdiff3/sk.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2006-09-15 18:02+0200\n" "Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n" "Language-Team: Slovak <sk@li.org>\n" @@ -27,11 +27,11 @@ msgid "" "Your emails" msgstr "" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "" -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "" @@ -63,11 +63,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "" @@ -99,218 +99,218 @@ msgstr "" msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "" -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "" -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "" -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -319,40 +319,40 @@ msgid "" "If you know how to reproduce this, please contact the program author." msgstr "" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "" -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "" -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -364,306 +364,306 @@ msgid "" "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "" -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "" diff --git a/translations/messages/kdiff3/sr.po b/translations/messages/kdiff3/sr.po index 550b410..fb6e7ac 100644 --- a/translations/messages/kdiff3/sr.po +++ b/translations/messages/kdiff3/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2005-02-26 19:41+0100\n" "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n" "Language-Team: Serbian\n" @@ -28,11 +28,11 @@ msgid "" "Your emails" msgstr "caslav.ilic@gmx.net,simicsl@verat.net" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "Уписивање података из клипборда у привремени фајл није успело." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Из клипборда" @@ -76,12 +76,12 @@ msgstr "" msgid "Severe Internal Error" msgstr "Озбиљна унутрашња грешка" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Највиша линија %1" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Крај" @@ -113,40 +113,40 @@ msgstr "Отварање фајла %1 није успело." msgid "Comparing file..." msgstr "Упоређујем фајл..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Грешка при читању из %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Име" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Операција" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Статус" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Нерешен" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Решен" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Не-бело" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Бело" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -154,35 +154,35 @@ msgstr "" "Тренутно стапате директоријуме. Желите ли заиста да прекинете стапање и " "поново скенирате директоријум?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Поново скенирај" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Настави стапање" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Отварање директоријума није успело:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Дир. А „%1“ не постоји или није директоријум.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Дир. Б „%1“ не постоји или није директоријум.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Дир. Ц „%1“ не постоји или није директоријум.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Грешка при отварању директоријума" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -192,144 +192,144 @@ msgstr "" "директоријума.\n" "Проверите поново пре него наставите." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Упозорење о параметрима" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Прегледам директоријуме..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Читам директоријум А" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Читам директоријум Б" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Читам директоријум Ц" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Неки поддиректоријуми нису били читљиви у" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Проверите дозволе поддиректоријума." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Спреман." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Статус поређења директоријума" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Број поддиректоријума:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Број једнаких фајлова:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Број различитих фајлова:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Број ручних стапања:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Ово утиче на све операције стапања." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Мењам све операције стапања" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Настави" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Обрађујем " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Урадити." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Копирај А у Б" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Копирај Б у А" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Обриши А" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Обриши Б" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Обриши А и Б" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Стопи у А" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Стопи у Б" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Стопи А и Б" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Обриши (ако постоји)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Стопи" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Стопи (ручно)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Грешка: Сукобљени типови фајлова" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Грешка: Датуми су једнаки али фајлови нису." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Ова операција тренутно није могућа." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Операција није могућа" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -341,40 +341,40 @@ msgstr "" "\n" "Ако знате како ово да поновите, контактирајте аутора програма." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Програмска грешка" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Дошло је до грешке у току копирања.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Грешка стапања" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Грешка." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Готово." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Није снимљено." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Непозната операција стапања. (Ово никад не сме да се деси!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Непозната операција стапања." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -393,19 +393,19 @@ msgstr "" "Пазите да програм још увек има бета статус и нема НИКАКВИХ ГАРАНЦИЈА уопште! " "Направите резерву својих најважнијих података!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Почињем стапање" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Уради" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Симулирај" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -413,21 +413,21 @@ msgstr "" "Истакнута ставка има различит тип у различитим директоријумима. Изаберите " "шта је чинити." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" "Датуми измене фајла су једнаки али фајлови нису. Изаберите шта је чинити." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" "Ова операција тренутно није могућа зато што је стапање директоријума у току." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -437,286 +437,286 @@ msgstr "" "Желите ли да наставите са ставком која је изазвала грешку или желите да је " "прескочите?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Настави стапање после грешке" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Настави са последњом ставком" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Прескочи ставку" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Прескочено." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "У току..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Операција стапања је завршена." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Стапање је завршено" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Симулирано стапање је завршено: Проверите да ли се слажете са предложеним " "операцијама." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" "Дошло је до грешке. Притисните „У реду“ да бисте видели детаљне " "информације.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "Грешка: У току брисања %1: Прављење резерве није успело." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "обриши директоријум рекурзивно( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "обриши( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Грешка: Операција брисања директоријума није успела у току покушаја да се " "директоријум прочита." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Грешка: Операција rmdir( %1 ) није успела." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Грешка: Операција брисања није успела." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ручно стапање( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Напомена: После ручног стапања корисник би требало да настави помоћу F7." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Грешка: Копирање( %1 -> %2 ) није успело. Брисање постојећег одредишта није " "успело." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "копирање везе( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Грешка: Копирање везе није успело: Удаљене везе још увек нису подржане." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Грешка: Копирање везе није успело." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "копирај( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Грешка у току преименовања( %1 -> %2 ): Не могу да обришем постојеће " "одредиште." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "преименуј( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Грешка: Преименовање није успело." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Грешка у току прављења директоријума %1. Не могу да обришем постојећи фајл." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "направи директоријум( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Грешка у току прављења директоријума." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Одр." -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Дир." -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Тип" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Вел." -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Атр." -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Последња измена" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Веза-одредиште" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "није доступно" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "А (одр.): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "А (база): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "Б (одр.): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "Ц (одр.): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Одр.: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Стапање директоријума" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Покрени/настави стапање директоријума" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Покрени операцију за текућу ставку" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Упореди изабрани фајл" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Стопи текући фајл" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Сажми све поддиректоријуме" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Рашири све поддиректоријуме" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Изабери А за све ставке" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Изабери Б за све ставке" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Изабери Ц за све ставке" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Аутоматски изабери операцију за све ставке" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Нема операције за све ставке" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 #, fuzzy msgid "Show Different Files" msgstr "Број различитих фајлова:" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Упореди изабрани фајл" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Упореди изабрани фајл" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Не ради ништа" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "А" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "Б" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "Ц" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Обриши А и Б" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Стопи у А и Б" diff --git a/translations/messages/kdiff3/sr@Latn.po b/translations/messages/kdiff3/sr@Latn.po index 1b676a9..074c6c7 100644 --- a/translations/messages/kdiff3/sr@Latn.po +++ b/translations/messages/kdiff3/sr@Latn.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2005-02-26 19:41+0100\n" "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n" "Language-Team: Serbian\n" @@ -28,11 +28,11 @@ msgid "" "Your emails" msgstr "caslav.ilic@gmx.net,simicsl@verat.net" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "Upisivanje podataka iz klipborda u privremeni fajl nije uspelo." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Iz klipborda" @@ -76,12 +76,12 @@ msgstr "" msgid "Severe Internal Error" msgstr "Ozbiljna unutrašnja greška" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Najviša linija %1" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Kraj" @@ -113,40 +113,40 @@ msgstr "Otvaranje fajla %1 nije uspelo." msgid "Comparing file..." msgstr "Upoređujem fajl..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Greška pri čitanju iz %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Ime" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Operacija" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Nerešen" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Rešen" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Ne-belo" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Belo" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -154,35 +154,35 @@ msgstr "" "Trenutno stapate direktorijume. Želite li zaista da prekinete stapanje i " "ponovo skenirate direktorijum?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Ponovo skeniraj" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Nastavi stapanje" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Otvaranje direktorijuma nije uspelo:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Dir. A „%1“ ne postoji ili nije direktorijum.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Dir. B „%1“ ne postoji ili nije direktorijum.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Dir. C „%1“ ne postoji ili nije direktorijum.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Greška pri otvaranju direktorijuma" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -192,144 +192,144 @@ msgstr "" "direktorijuma.\n" "Proverite ponovo pre nego nastavite." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Upozorenje o parametrima" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Pregledam direktorijume..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Čitam direktorijum A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Čitam direktorijum B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Čitam direktorijum C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Neki poddirektorijumi nisu bili čitljivi u" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Proverite dozvole poddirektorijuma." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Spreman." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Status poređenja direktorijuma" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Broj poddirektorijuma:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Broj jednakih fajlova:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Broj različitih fajlova:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Broj ručnih stapanja:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Ovo utiče na sve operacije stapanja." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Menjam sve operacije stapanja" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Nastavi" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Obrađujem " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Uraditi." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Kopiraj A u B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Kopiraj B u A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Obriši A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Obriši B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Obriši A i B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Stopi u A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Stopi u B" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Stopi A i B" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Obriši (ako postoji)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Stopi" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Stopi (ručno)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Greška: Sukobljeni tipovi fajlova" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Greška: Datumi su jednaki ali fajlovi nisu." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Ova operacija trenutno nije moguća." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Operacija nije moguća" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -341,40 +341,40 @@ msgstr "" "\n" "Ako znate kako ovo da ponovite, kontaktirajte autora programa." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Programska greška" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Došlo je do greške u toku kopiranja.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Greška stapanja" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Greška." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Gotovo." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Nije snimljeno." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Nepoznata operacija stapanja. (Ovo nikad ne sme da se desi!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Nepoznata operacija stapanja." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -393,19 +393,19 @@ msgstr "" "Pazite da program još uvek ima beta status i nema NIKAKVIH GARANCIJA uopšte! " "Napravite rezervu svojih najvažnijih podataka!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Počinjem stapanje" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Uradi" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Simuliraj" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -413,21 +413,21 @@ msgstr "" "Istaknuta stavka ima različit tip u različitim direktorijumima. Izaberite " "šta je činiti." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" "Datumi izmene fajla su jednaki ali fajlovi nisu. Izaberite šta je činiti." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" "Ova operacija trenutno nije moguća zato što je stapanje direktorijuma u toku." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -437,287 +437,287 @@ msgstr "" "Želite li da nastavite sa stavkom koja je izazvala grešku ili želite da je " "preskočite?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Nastavi stapanje posle greške" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Nastavi sa poslednjom stavkom" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Preskoči stavku" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Preskočeno." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "U toku..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Operacija stapanja je završena." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Stapanje je završeno" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Simulirano stapanje je završeno: Proverite da li se slažete sa predloženim " "operacijama." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "" "Došlo je do greške. Pritisnite „U redu“ da biste videli detaljne " "informacije.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "Greška: U toku brisanja %1: Pravljenje rezerve nije uspelo." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "obriši direktorijum rekurzivno( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "obriši( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Greška: Operacija brisanja direktorijuma nije uspela u toku pokušaja da se " "direktorijum pročita." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Greška: Operacija rmdir( %1 ) nije uspela." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Greška: Operacija brisanja nije uspela." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ručno stapanje( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Napomena: Posle ručnog stapanja korisnik bi trebalo da nastavi pomoću " "F7." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Greška: Kopiranje( %1 -> %2 ) nije uspelo. Brisanje postojećeg odredišta " "nije uspelo." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "kopiranje veze( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Greška: Kopiranje veze nije uspelo: Udaljene veze još uvek nisu podržane." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Greška: Kopiranje veze nije uspelo." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "kopiraj( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Greška u toku preimenovanja( %1 -> %2 ): Ne mogu da obrišem postojeće " "odredište." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "preimenuj( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Greška: Preimenovanje nije uspelo." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Greška u toku pravljenja direktorijuma %1. Ne mogu da obrišem postojeći fajl." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "napravi direktorijum( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Greška u toku pravljenja direktorijuma." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Odr." -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Dir." -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Tip" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Vel." -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Atr." -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Poslednja izmena" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Veza-odredište" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "nije dostupno" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (odr.): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (baza): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (odr.): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (odr.): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Odr.: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Stapanje direktorijuma" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Pokreni/nastavi stapanje direktorijuma" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Pokreni operaciju za tekuću stavku" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Uporedi izabrani fajl" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Stopi tekući fajl" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Sažmi sve poddirektorijume" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Raširi sve poddirektorijume" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Izaberi A za sve stavke" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Izaberi B za sve stavke" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Izaberi C za sve stavke" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Automatski izaberi operaciju za sve stavke" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Nema operacije za sve stavke" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 #, fuzzy msgid "Show Different Files" msgstr "Broj različitih fajlova:" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Uporedi izabrani fajl" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Uporedi izabrani fajl" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Ne radi ništa" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Obriši A i B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Stopi u A i B" diff --git a/translations/messages/kdiff3/sv.po b/translations/messages/kdiff3/sv.po index 966f618..ce458f1 100644 --- a/translations/messages/kdiff3/sv.po +++ b/translations/messages/kdiff3/sv.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2006-11-05 16:50+0100\n" "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -27,11 +27,11 @@ msgid "" "Your emails" msgstr "stefan.asserhall@comhem.se" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "Skrivning av klippbordsdata till tillfällig fil misslyckades." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Från klippbord" @@ -76,11 +76,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "Allvarligt internt fel" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "Övre rad" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Slut" @@ -112,40 +112,40 @@ msgstr "Öppna %1 misslyckades." msgid "Comparing file..." msgstr "Jämför fil..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Fel vid läsning från %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Namn" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Åtgärd" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Olöst" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Löst" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Inte blank" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Blank" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -153,35 +153,35 @@ msgstr "" "Du håller för närvarande på med att sammanfoga kataloger. Är du säker på att " "du vill avbryta den och avsöka katalogen igen?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Avsök igen" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Fortsätt sammanfoga" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Öppna katalogerna misslyckades:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Katalog A \"%1\" finns inte eller är inte en katalog.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Katalog B \"%1\" finns inte eller är inte en katalog.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Katalog C \"%1\" finns inte eller är inte en katalog.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Fel vid öppna katalog" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -191,144 +191,144 @@ msgstr "" "sammanfogas.\n" "Kontrollera igen innan du fortsätter." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Parametervarning" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Söker i kataloger..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Läser katalog A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Läser katalog B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Läser katalog C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Vissa underkataloger kunde inte läsas i" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Kontrollera rättigheter för underkatalogerna." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Klar." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Status för katalogjämförelse" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Antal underkataloger:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Antal likadana filer:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Antal olika filer:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Antal manuella sammanfogningar:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Det här påverkar alla sammanfogningsåtgärder." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Ändra alla sammanfogningsåtgärder" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "F&ortsätt" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Behandlar " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Att göra." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Kopiera A till B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Kopiera B till A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Ta bort A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Ta bort B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Ta bort A och B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Sammanfoga till A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Sammanfoga till B" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Sammanfoga till A och B" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Ta bort (om den finns)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Sammanfoga" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Sammanfoga (manuellt)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Fel: Konflikt i filtyper" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Fel: Datum är lika men filerna är det inte." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Den här åtgärden är för närvarande inte möjlig att utföra." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Åtgärd inte möjlig" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -342,40 +342,40 @@ msgstr "" "\n" "Om du vet hur du kan upprepa detta, kontakta programmets upphovsman." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Programfel" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Ett fel uppstod vid kopiering.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Sammanfogningsfel" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Fel." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Klar." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Inte sparad." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Okänd sammanfogningsåtgärd. (Det här får aldrig inträffa!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Okänd sammanfogningsåtgärd." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -395,19 +395,19 @@ msgstr "" "finns INGA GARANTIER överhuvudtaget! Gör säkerhetskopior av viktig " "information!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Startar sammanfogning" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Gör det" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Simulera det" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -415,7 +415,7 @@ msgstr "" "Det markerade objektet har olika typ i de olika katalogerna. Välj vad du " "vill göra." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -423,7 +423,7 @@ msgstr "" "Ändringsdatum för filerna är samma, men filerna är det inte. Välj vad du " "vill göra." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -431,7 +431,7 @@ msgstr "" "Den här åtgärden är för närvarande inte möjlig eftersom katalogsammanfogning " "för närvarande kör." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -441,276 +441,276 @@ msgstr "" "Vill du fortsätta med objektet som orsakade felet, eller vill du hoppa över " "objektet?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Fortsätt sammanfoga efter ett fel" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Fortsätt med sista objekt" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Hoppa över objekt" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Överhoppad." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "Pågår..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Sammanfogningsåtgärd färdig." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Sammanfogning färdig" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Simulerad sammanfogning färdig. Kontrollera om du håller med om de " "föreslagna åtgärderna." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Ett fel uppstod. Tryck på Ok för att se detaljerad information.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "Fel: Vid borttagning av %1: Misslyckades skapa säkerhetskopia." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "Ta bort katalog rekursivt (%1)" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "Ta bort (%1)" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Fel: Borttagningsåtgärd för katalog misslyckades när katalogen skulle läsas." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Fel: Åtgärden rmdir (%1) misslyckades." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Fel: Borttagningsåtgärden misslyckades." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "Manuell sammanfogning (%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Observera: Efter en manuell sammanfogning bör användaren fortsätta " "genom att trycka på F7." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Fel: Kopiering (%1 -> %2) misslyckades. Borttagning av befintlig fil " "misslyckades." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "Kopiera länk (%1 -> %2)" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Fel: Kopiera länk misslyckades: Fjärrlänkar stöds inte ännu." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Fel: Kopiera länk misslyckades." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "Kopiera (%1 -> %2)" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Fel vid namnbyte (%1 -> %2): Kan inte ta bort befintlig fil." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "Byt namn (%1 -> %2)" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Fel: Namnbyte misslyckades." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Fel när katalogen %1 skulle skapas: Kan inte ta bort befintlig fil." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "Skapa katalog (%1)" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Fel vid skapa katalog." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Mål" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Katalog" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Storlek" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Egenskap" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Senast ändrad" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Länkmål" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "Ej tillgänglig" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (mål): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (bas): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (mål): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (mål): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Mål: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "Spara tillstånd för katalogsammanfogning som..." -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Starta eller fortsätt katalogsammanfogning" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Utför åtgärd för aktuellt objekt" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Jämför markerade filer" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Sammanfoga markerade filer" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Dra ihop alla underkataloger" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Expandera alla underkataloger" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Välj A för alla objekt" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Välj B för alla objekt" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Välj C för alla objekt" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Välj automatiskt åtgärd för alla objekt" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Ingen åtgärd för något objekt" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "Visa identiska filer" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "Visa olika filer" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "Visa bara filer i A" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "Visa bara filer i B" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "Visa bara filer i C" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "Jämför explicit markerade filer" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "Sammanfoga explicit markerade filer" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Gör ingenting" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Ta bort A och B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Sammanfoga till A och B" diff --git a/translations/messages/kdiff3/ta.po b/translations/messages/kdiff3/ta.po index 10f7199..e34551e 100644 --- a/translations/messages/kdiff3/ta.po +++ b/translations/messages/kdiff3/ta.po @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2004-08-24 04:28+0530\n" "Last-Translator: I. Felix <ifelix25@yahoo.co.in>\n" "Language-Team: <ta@li.org>\n" @@ -45,11 +45,11 @@ msgid "" "Your emails" msgstr "prem4ever_1983@yahoo.com" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "க்ளிப்போர்டின் எழுத்தின் தரத்தில் உள்ள டெம்ப் கோப்பு தவறு." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "கிளிப் போர்டிலிருந்து." @@ -93,12 +93,12 @@ msgstr "" msgid "Severe Internal Error" msgstr "கடுமையான உள்சார்ந்த தவறு." -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "மேல் வரி %1." -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "முடிவு" @@ -131,40 +131,40 @@ msgstr "திறப்பதற்கு %1 இயலவில்லை." msgid "Comparing file..." msgstr "கோப்பினை ஒப்பிடுகிறது...." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "%1னிலிருந்து படிக்கும் பிழை" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "பெயர்." -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "இயக்கம்." -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "நிலை." -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Unsolved" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Solved" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Nonwhite" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "White" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -172,35 +172,35 @@ msgstr "" "நீங்கள் தற்பொழுது ஒன்றாக சேர்க்கப்பட்ட அடைவை பயன்படுத்திக் கொண்டிருக்கிறீர்கள். நீங்கள் நிச்சயமாக " "ஒன்று சேர்ப்பதை நிறுத்திவிட்டு அடைவை மறுவருடலை விரும்புகிறீர்களா?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "மறுவருடல்" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "தொடர்ந்து ஒன்றாக சேர்." -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "அடைவு திறக்க இயலவில்லை:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "அடைவு எ \"%1\" இல்லை அல்லது அது ஒரு அடைவு இல்லை.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "அடைவு B \"%1\" உபயோகத்தில் இல்லை (அ) அது ஒரு அடைவே அல்ல.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "அடைவு C \"%1\" உபயோகத்தில் இல்லை (அ) அது ஒரு அடைவே அல்ல.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "திறந்த தகவல் தளம் தவறு." -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -209,145 +209,145 @@ msgstr "" "மூன்று அடைவுகள் ஒன்று சேரும் பொழுது, சேரும் அடைவு A (அ) B போன்று இருக்கக் கூடாது.\n" "தொடர்வதற்கு முன் மீண்டும் சரிபார்க்கவும்." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "அளவுருக்கள் எச்சிரிகை." -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 #, fuzzy msgid "Scanning directories..." msgstr "Scanning directories ..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "தகவல் தளம் 'ஏ'வை படிக்கவும்." -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "தகவல் தளம் 'பி'ஐ படிக்கவும்." -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "தகவல் தளம் 'சி'ஐ படிக்கவும்." -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "சில துணை அடைவுகளை படிக்க இயலவில்லை" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "துணை அடைவுகளின் அனுமதிகளை சரிபார்க்கவும்." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "தயார்." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "அடைவு ஒப்பிடும் நிலை" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "உப அடைவுகளின் எண்ணிக்கை:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "சம கோப்புகளின் எண்ணிக்கை:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "வேறு விதமான கோப்புகளின் எண்ணிக்கை:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "கைமுறை ஒன்று சேர்க்கையின் எண்ணிக்கை:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "இது அனைத்து ஒன்றுசேர் இயக்கங்களை பாதிக்கிறது." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "அனைத்து ஒன்றுசேர் இயக்கங்களை மாற்றிக்கொண்டிருக்கிறது" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "தொடர்தல்" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "செயலாக்குதல்" -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "அதை செய்." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr " A to B படியெடு" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "படியெடு B to A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr " A ஐ நீக்கு" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "B ஐ நீக்கு" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "A & Bஐ நீக்கு " -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr " A ஐ ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr " 'பி' ஐ ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "A & B ஐ ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "நீக்கு." -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "பிழை: குழப்ப கோப்பு வகைகள்" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "பிழை: தேதிகள் சமம் ஆனால் கோப்புகள் இல்லை." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "இந்த இயக்கம் தற்போது சாத்தியமில்லை." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "இயக்கம் சாதியமில்லை" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -361,40 +361,40 @@ msgstr "" "\n" "இதை மறு ஆக்கம் செய்ய தெரிந்தால், நிரல் எழுதியவரை அணுகவும்." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "நிரல் பிழை" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "நகலெடுக்கும்போது பிழை ஏற்பட்டுள்ளது.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "ஒன்றுசேர் பிழை" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "பிழை." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "முடிந்த." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "கோப்பு" -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "தெரியாத ஒன்றுசேர் இயக்கம்.( இது ஒருபோதும் நிகழக்கூடாது)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "தெரியாத ஒன்றுசேர் இயக்கம்." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -415,19 +415,19 @@ msgstr "" "உத்திரவாதமும் கிடையாது! தங்களது இன்றியமையாத தகவல்களுக்கு பின்னணி " "அமைக்க! " -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "ஒன்று சேர்ப்பைத் துவக்குதல்" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "இதை செய்க" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "இதை போன்று நட" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -435,7 +435,7 @@ msgstr "" "பலவிதமான அடைவுகளில் பலவகையாக தனிப்படுத்தப்பட்ட விவரம் உள்ளது. எதை செய்வதென்பதை " "தேர்ந்தெடுக்க." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -443,7 +443,7 @@ msgstr "" "கோப்புகளின் திருத்திய தேதிகள் ஒன்றாக உள்ளது, ஆனால் கோப்புகள் இல்லை. எதை செய்வதென்பதை " "தேர்ந்தெடுக்க. " -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." @@ -451,7 +451,7 @@ msgstr "" "இந்த செயற்பாடு தற்போது சாத்தியமில்லை ஏனென்றால் அடைவு ஒற்றினை தற்போது " "இயங்கிக்கொண்டிருக்கின்றது" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -461,276 +461,276 @@ msgstr "" "இந்த பிழையை ஏற்படுத்திய விவரத்துடன் தொடர விரும்புகிறீர்களா அல்லது அதை தவிர்க்க " "விரும்புகிறீர்களா?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "பிழைக்குப் பிறகு ஒன்று சேர்த்தலை தொடர்க" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "கடைசி விவரத்துடன் தொடர்க" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "விவரத்தை தவிர்க்க" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "தவிர்த்தது." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "செயல்பாட்டில் உள்ளது..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "ஒன்றுசேர் இயக்கம் முடிந்தது" -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "ஒன்றுசேர்ப்பு முடிந்தது" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "போலியான ஒன்றுசேர்ப்பு முடிந்தது: முன்மொழிந்த இயக்கங்களுடன் நீங்கள் ஒத்துப்போகிறீர்களா என்பதை " "சரிபார்க்கவும்." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "பிழை ஏற்பட்டுள்ளது. விரிவான விவரங்களுக்கு சரி என்பதை அழுத்துக.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "பிழை: %1 நீக்கும்போது: பின்னணி உருவாக்கம் தோல்வியடைந்தது." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "அடைவு சூழ்நிலை நீக்கு நீக்கு(%1)" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "நீக்கு( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "பிழை: அடைவை படிக்கும்போது நீக்க இயலவில்லை." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr " rmdir( %1 } பிழை: இயக்க இயலவில்லை" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "பிழை: நீக்கும் இயக்கம் தோல்வியடைந்தது." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "கைமுறை ஒன்றினை(%1, %2,%3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "குறிப்பு: கையேடு ஒன்றினையின் பிறகு உபயோகிப்பவர் F7 வழியாக தொடர வேண்டும்." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "பிழை:நகல்( %1 -> %2 ) தோல்வி அடைந்தது. இருக்கும் சேரிடம் நீக்கம் தோல்வி அடைந்தது" -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "நகல் இணை( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "பிழை:தொடர்புப் படியெடு தோல்வியடைந்தது: தூரத் தொடர்பு இன்னும் ஆதரிக்கப்படவில்லை" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "பிழை: நகல் இணை தோல்வியடைந்தது." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "நகல்( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "மறுபெயரிடும் போது பிழை( %1 -> %2 ): தற்போதுள்ள சேருமிடத்தை நீக்க இயலாது." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "மறுபெயர்( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "பிழை: மறுபெயர் தோல்வி அடைந்தது." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "%1அடைவை உருவாக்கும் போது பிழை: தற்போதைய கோப்பினை நீக்க இயலாது." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "( %1 )அடைவை உருவாக்கு" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "அடைவை உருவாக்கும் போது பிழை" -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "சேருமிடம்" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "அடைவு" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "விதம்" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "அளவு" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "தன்மை" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "கடைசி திருத்தம்" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "இணை-சேருமிடம்" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "கிடைக்கவில்லை" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (சேருமிடம்): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (அடித்தளம்):" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (சேருமிடம்): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (சேருமிடம்):" -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "சேருமிடம்: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 #, fuzzy msgid "Save Directory Merge State As..." msgstr "அடைவுச் சேர்க்கை" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "அடைவை சேர்க்கத் துவங்கு" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "நிகழ் உருப்படிக்காக செயற்பாடு இயங்கு" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "தேர்ந்தெடுத்த கோப்பினை ஒப்பிடு" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "தற்போதைய கோப்பினை ஒன்றுசேர்" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "அனைத்து உபஅடைவுகளையும் மடி" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "அனைத்து உபஅடைவுகளையும் பிரி" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "எல்லா விவரங்களுக்கும் Aவைத் தேர்ந்தெடு" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "எல்லா விவரங்களுக்கும் Bவைத் தேர்ந்தெடு" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "எல்லா விவரங்களுக்கும் Cவைத் தேர்ந்தெடு" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "எல்லா விவரங்களுக்கும் தானியக்கத்தேர்வு" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "எல்லா விவரங்களுக்கும் இயக்கமில்லை" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 #, fuzzy msgid "Show Different Files" msgstr "வேறு விதமான கோப்புகளின் எண்ணிக்கை:" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "தேர்ந்தெடுத்த கோப்பினை ஒப்பிடு" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "தேர்ந்தெடுத்த கோப்பினை ஒப்பிடு" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "ஒன்றும் செய்யாதே" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 #, fuzzy msgid "Delete A && B" msgstr "A & Bஐ நீக்கு " -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 #, fuzzy msgid "Merge to A && B" msgstr "A & B ஐ ஒன்றாகச் சேர்." diff --git a/translations/messages/kdiff3/tg.po b/translations/messages/kdiff3/tg.po index 3c521e0..a73dbca 100644 --- a/translations/messages/kdiff3/tg.po +++ b/translations/messages/kdiff3/tg.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2005-09-17 13:29+0500\n" "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n" "Language-Team: Tajik\n" @@ -34,11 +34,11 @@ msgid "" "Your emails" msgstr "youth_opportunities@tajik.net erkin_pulatov@mail.ru" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "Дар силули мухобиротӣ навиштани таърих ва суръати файл." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Аз буфери иваз" @@ -83,12 +83,12 @@ msgstr "" msgid "Severe Internal Error" msgstr "Хатогии даруни" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Сатри яккум%1" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Охир" @@ -121,40 +121,40 @@ msgstr "Кушодан %1 нашуд." msgid "Comparing file..." msgstr "Нигоҳ доштани файл ..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Хатогӣ дар вақти хониш аз %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Ном" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Амал" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Вазъият" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Иҷозат дода нашуд" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Иҷозат дода шуда" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Сиёҳ" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Сафед" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -163,35 +163,35 @@ msgstr "" "ҳақиқат мехоҳед, ки ҳамаи тағйиротҳоро нест кунед ва таркиби каталогро ан " "нав кунед?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Дигар кардан" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Давом додан" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Наметавонам каталогҳоро кушоям:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Каталоги А \"%1\" вуҷуд надорад.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Каталоги В \"%1\" вуҷуд надорад.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Каталоги C \"%1\" вуҷуд надорад.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Хатогӣ дар вақти хониши каталог" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -201,145 +201,145 @@ msgstr "" "шуданд.\n" "Санҷед бори дигар пеш аз давомкуни." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Параметри нодуруст" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 #, fuzzy msgid "Scanning directories..." msgstr "Мушоҳидакунии каталогҳо..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Хониши каталоги А" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Хониши каталоги В" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Хониши каталоги С" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Наметавонам баъзе зеркаталогҳоро хонам дар" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Ҳуқуқҳои ин каталогҳоро тафтиш кунед." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Тайёр аст." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Ҳолати муқоисакунии каталогҳо" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Миқдори зеркаталогҳо:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Миқдори файлҳои якхела:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Миқдори файлҳои ҳархела:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Миқдори якҷошавии дастӣ:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Ин ба ҳамаи якҷошавӣ таъсир мерасонад." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Тағйироти ҳамаи якҷошавиҳо" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "&Давом додан" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Коркард " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Кардан." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Нусха кардан А ба В" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Нусха кардан В ба А" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Нест кардани А" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Нест кардани В" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Нест кардани А ва В" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Пайваст кардан ба A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Пайваст кардан ба В" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Пайваст кардан ба A & В" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Нест кардан (агар вуҷуд дорад)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Пайваст кардан" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Пайваст кардан (дастӣ)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Хатогӣ: Якҷоянашавандаи шакли файлҳо" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Хатогӣ: Вақт мувофиқ аст, лекин файлҳо нет." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Ҳоло номумкин аст." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Пайваст кардан" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -350,40 +350,40 @@ msgstr "" "mergeResultSaved: m_pMFI=0\n" "Агар шумо сабабро донед, ба муаллиф муроҷиат кунед." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Хатогии барнома" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Хатогии нусхакунӣ.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Хатогии якҷояшавӣ" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Хатогӣ." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Тайёр аст." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Захира нашуд." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Пайвастшавии номаълум" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Пайвастшавии номаълум." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -401,19 +401,19 @@ msgstr "" "\n" "Мо малиҳат медиҳем, ки доимо пеш аз якҷояшавӣ нусхаҳои захиравиро кунед!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Оғози якҷояшавӣ" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Ҳал кардан" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Моделсозӣ" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -421,7 +421,7 @@ msgstr "" "Файли интихобшуда дар ҳар каталог шкли гуногун дорад. Чӣ кор карданро " "интихоб кунед." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -429,13 +429,13 @@ msgstr "" "Маълумотҳои охирини тағйироти файлҳо якхела ҳастанд, вале таркиб нест. Чӣ " "кор карданро интихоб кунед." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "Ҳоло якҷояшавии каталогҳо ҳал карда мешавад." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -444,280 +444,280 @@ msgstr "" "Дар этапи ҷорӣ хатогие ба амал омад.\n" "Давом додан ё сар додан?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Давом додан баъди хатогӣ" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Давом додан" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Сар додан" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Са дода шуд." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "Кор рафта истодааст..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Якҷояшавӣ ба анҷом расид." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Якҷояшавӣ ба анҷом расид" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "Якҷояшавӣ ба анҷом расид. Оё шумо бо тағйиротҳои додашуда розӣ ҳастед?" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Хатогӣ ба амал омад. Барои ахбороти илова OK-ро пахш кунед.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "Хатогӣ: Наметавонам нусхаи захираро эҷод кунам %1." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "нест кардани каталог рекурсивӣ( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "нест кардан( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Хатогӣ: наметавонам каталогро нест кунам." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Хатогӣ: хатогии rmdir( %1 )." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Хатогӣ: наметавонам нест кунам." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "якҷояшавии дастӣ( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " Қайд: Баъди анҷоми якҷояшавии дастӣ F7-ро пахш кунед." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Хатогӣ: наметавонам( %1 -> %2 ) нусха кунам. Нест кардани муайяни вуҷулшуда " "муяссар карда нашуд." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "бадарғаи нишонавӣ( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Хатогӣ: Бадарғаҳои нестшуда пуштибонӣ карда намешаванд." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Хатогӣ: наметавонам бадарғаро эҷод кунам." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "нусха кардани ( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Хатогӣ дар вақти тағйири ном( %1 -> %2 ): Наметавонам муайяни вуҷудшударо " "нест кунам." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "тағйири ном( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Хатогӣ: Наметавонам тағйири номро кунам." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Хатогӣ дар вақти эҷод кардани каталоги %1. Файли вуҷудшуда нест карда " "намешавад." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "эҷоди каталог( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Хатогӣ дар вақти эҷод кардани каталог." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Муайяншуда" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Каталог" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Шакл" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Андоза" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Хусусиятҳо" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Тағйироти охирон" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Бадарғаи-объект" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "дастрас нест" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (муайяншуда): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (баромад): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (муайяншуда): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (муайяншуда): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Муаяйншуда: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Хатогӣ дар вақти хониши каталог" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Сар кардан/давом додани якҷояшаии каталогҳо" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Ба кор даровардан барои нуқтаи ҷорӣ" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Муқоисаи файли интихобшуда" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Якҷоя кардани файли ҷорӣ" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Дохили ҳамаи зеркаталогҳо" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Дохилнашудаи ҳамаи зеркаталогҳо" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Интихоби A барои ҳама" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Интихоби B барои ҳама" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Интихоби C барои ҳама" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Худ-интихобкунии шакли амал барои ҳама" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Гирифтани амалҳо барои ҳама" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 #, fuzzy msgid "Show Different Files" msgstr "Миқдори файлҳои ҳархела:" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Муқоисаи файли интихобшуда" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Муқоисаи файли интихобшуда" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Ягон чиз" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 #, fuzzy msgid "Delete A && B" msgstr "Нест кардани А ва В" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 #, fuzzy msgid "Merge to A && B" msgstr "Пайваст кардан ба A & В" diff --git a/translations/messages/kdiff3/tr.po b/translations/messages/kdiff3/tr.po index e06fc85..fcb9a88 100644 --- a/translations/messages/kdiff3/tr.po +++ b/translations/messages/kdiff3/tr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2022-03-02 16:11+0000\n" "Last-Translator: Mehmet Dokuz <madanadam@gmail.com>\n" "Language-Team: Turkish <https://mirror.git.trinitydesktop.org/weblate/" @@ -35,11 +35,11 @@ msgid "" "Your emails" msgstr "gorkem@kde.org engincagatay@yahoo.com aalpersen@gmail.com" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "Geçici dosyaya pano verisi yazma başarısız." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "Panodan" @@ -83,12 +83,12 @@ msgstr "" msgid "Severe Internal Error" msgstr "Ciddi Dahili Hata" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "Üst satır %1" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Son" @@ -120,40 +120,40 @@ msgstr "%1 açılamadı." msgid "Comparing file..." msgstr "Dosya karşılaştırılıyor..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "%1 konumundan okunamıyor" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "İsim" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "İşlem" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Durum" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Çözülmemiş" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Çözülmüş" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Beyaz değil" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Beyaz" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -161,35 +161,35 @@ msgstr "" "Şu anda bir dizin birleştirmesi yapıyorsunuz. Birleştirmeden çıkmak ve " "dizini yeniden taramak istediğinizden emin misiniz?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Yeniden Tara" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Birleştirmeye Devam Et" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Dizinler açılamadı:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "A Dizini \"%1\" mevcut değil ya da bu bir dizin değil.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "B Dizini \"%1\" mevcut değil ya da bu bir dizin değil.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "C Dizini \"%1\" mevcut değil ya da bu bir dizin değil.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Dizin Açma Hatası" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -198,144 +198,144 @@ msgstr "" "3 dizin birleştirilirken hedef dizin A ya da B ile aynı olmamalıdır.\n" "Devam etmeden önce kontrol ediniz." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Parametre Uyarısı" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Dizinler taranıyor..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "A Dizini Okunuyor" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "B Dizini Okunuyor" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "C Dizini Okunuyor" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Bazı altdizinler okunabilir değildi" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Altdizinlerin izinlerini kontrol ediniz." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Hazır." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Dizin Karşılaştırma Durumu" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Altdizinlerin sayısı:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Eşit dosyaların sayısı:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Farklı dosyaların sayısı:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "El ile birleştirmelerin sayısı:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Bu, tüm birleştirme işlemlerini etkiler." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Tüm Birleştirme İşlemleri Değiştiriliyor" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "D&evam Et" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "İşleniyor" -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Yapılacak." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "A'yı B'ye kopyala" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "B'yi A'ya kopyala" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "A'yı Sil" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "B'yi Sil" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "A ve B'yi Sil" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "A ile Birleştir" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "B ile Birleştir" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "A ve B ile Birleştir" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "(varsa) Sil" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Birleştir" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Birleştir (el ile)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Hata: Çakışan Dosya Türleri" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Hata: Tarihler aynı fakat dosyalar aynı değil." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Bu işlem şu anda yapılabilir değil." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "İşlem Yapılabilir Değil" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -350,40 +350,40 @@ msgstr "" "Bu durumun nasıl tekrarlanacağını biliyorsanız, lütfen uygulamanın yazarıyla " "iletişime geçin." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Uygulama Hatası" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Koplayanırken hata oluştu.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Birleştirme Hatası" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Hata." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Tamamlandı." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Kaydedilmedi." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Bilinmeyen birleştirme işlemi. (Bu, hiçbir zaman oluşmamalı!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Bilinmeyen birleştirme işlemi." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -402,19 +402,19 @@ msgstr "" "Bu uygulama hala beta durumundadır ve ne olursa olsun hiçbir GARANTİSİ " "YOKTUR! Önemli verilerinizin yedeğini alın!!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Birleştirme Başlıyor" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Yap" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Dene" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." @@ -422,7 +422,7 @@ msgstr "" "Renklendirilmiş nesne, değişik dizinlerde değişik dosya türüne sahip. Ne " "yapılacağını seçiniz." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." @@ -430,14 +430,14 @@ msgstr "" "Dosyaların değiştirilme tarihleri aynı fakat dosyalar aynı değil. Ne " "yapılacağını seçiniz." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 #, fuzzy msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "Bu işlem şu anda yapılamıyor, çünkü birleştirme hala devam ediyor." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -447,278 +447,278 @@ msgstr "" "Hata oluşturan nesne ile devam etmek mi yoksa bu nesneyi atlamak mı " "istiyorsunuz?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Bir hatadan sonra birleştirmeye devam et" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Son Nesne ile Devam Et" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Nesneyi Atla" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Atlandı" -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "Uygulanıyor..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Birleştirme işlemi tamamlandı." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Birleştirme Tamamlandı" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Bir hata oluştu. Detaylı bilgi görmek için TAMAM'a basınız.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "Hata: %1 silinirken oluştu: Yedek alınamadı." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "sil( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Hata: dizin okunmaya çalışırken dizini silme işlemi başarısız oldu." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Hata: rmdir( %1 ) işlemi başarısız oldu." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Hata: silme işlemi başarısız oldu." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "el ile birleştir( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 #, fuzzy msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Not: El ile birleştirmeden sonra kullanıcı F7 ile devam etmelidir." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Hata: kopyala( %1 -> %2) başarısız oldu. Mevcut hedefin silinmesi başarısız " "oldu." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "BağıKopyala( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Hata: BağıKopyala başarısız oldu: Uzak bağlar henüz desteklenmiyor." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Hata: BağıKopyala başarısız oldu." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "kopyala( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Yeniden isimlendirilirken ( %1 -> %2 ) hata oluştu: Mevcut hedef silinemiyor." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "yeniden isimlendir( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Hata: Yeniden isimlendirme başarısız oldu." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "%1 klasörü oluşturulurken hata: Mevcut dosya silinemiyor." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "dizin oluştur( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Dizin oluşturulması sırasında hata oluştu." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Hedef" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Dizin" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Tür" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Boyut" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Özellikler" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Son Değiştirme" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Bağ-Hedefi" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "mümkün değil" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (Hedef):" -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (Temel): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (Hedef): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (Hedef): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Hedef: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 #, fuzzy msgid "Save Directory Merge State As..." msgstr "Dizin Birleştirmesi" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Dizin Birleştirmesini Başlat/Devam Et" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Mevcut Nesne için İşlem Başlat" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Seçili Dosyayı Karşılaştır" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Mevcut Dosyayı Birleştir" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Tüm Alt Dizinleri Kapat" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Tüm Alt Dizinleri Aç" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Tüm Nesneler için A'yı Seç" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Tüm Nesneler için B'yi Seç" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Tüm Nesneler için C'yi Seç" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Tüm Nesneler için Atomatik-Seçim İşlemi" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Tüm Nesneler için Hiçbir Seçim" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 #, fuzzy msgid "Show Different Files" msgstr "Farklı dosyaların sayısı:" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "Seçili Dosyayı Karşılaştır" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "Seçili Dosyayı Karşılaştır" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Bir Şey Yapma" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "A && B'yi Sil" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "A && B ile Birleştir" diff --git a/translations/messages/kdiff3/uk.po b/translations/messages/kdiff3/uk.po index 1ad7af8..9c2d44a 100644 --- a/translations/messages/kdiff3/uk.po +++ b/translations/messages/kdiff3/uk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2022-06-17 08:12+0000\n" "Last-Translator: Roman Savochenko <roman@oscada.org>\n" "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/" @@ -30,11 +30,11 @@ msgid "" "Your emails" msgstr "ivanpetrouchtchak@yahoo.com,roman@oscada.org" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "Помилка запису даних кишені у тимчасовий файл." -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "З кишені" @@ -79,11 +79,11 @@ msgstr "" msgid "Severe Internal Error" msgstr "Критична внутрішня помилка" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 msgid "Top line" msgstr "Верхній рядок" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "Кінець" @@ -115,40 +115,40 @@ msgstr "Помилка відкриття %1." msgid "Comparing file..." msgstr "Порівняння файла..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "Помилка читання з %1" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "Назва" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "Дія" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "Стан" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "Не розв'язано" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "Розв'язано" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "Не-білий" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "Білий" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" @@ -156,35 +156,35 @@ msgstr "" "Наразі ви виконуєте поєднання тек. Ви певні у бажані перервати поєднання та " "пересканувати теку?" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "Пересканувати" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "Продовжити об'єднання" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "Помилка відкриття каталогів:" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Каталог А \"%1\" не існує або це не каталог.\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Каталог В \"%1\" не існує або це не каталог.\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Каталог С \"%1\" не існує або це не каталог.\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "Помилка відкриття каталогу" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -194,144 +194,144 @@ msgstr "" "тек.\n" "Ще раз перевірте перед продовженням." -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "Параметр Попередження" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "Сканування каталогів..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "Читання каталогу A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "Читання каталогу B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "Читання каталогу C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "Деякі підтеки не читаються" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "Перевірити права доступу підтек." -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "Готове." -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "Стан порівняння каталогів" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "Кількість підкаталогів:" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "Кількість однакових файлів:" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "Кількість відмінних файлів:" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "Кількість ручних поєднань:" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "Це впливає на всі операції поєднання." -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "Зміна Всіх Операцій Поєднання" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "Пр&одовжити" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "Опрацювання " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "Зробити." -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "Копіювати A у B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "Копіювати B у A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "Видалити A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "Видалити B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "Видалити A & B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "Приєднати до A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "Приєднати до B" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "Приєднати до A & B" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "Видалити (якщо існує)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "Поєднати" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "Поєднати (вручну)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "Помилка: Конфліктуючі Типи Файлів" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "Помилка: Дати однакові але файли ні." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "Ця операція наразі неможлива." -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "Операція Неможлива" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -345,40 +345,40 @@ msgstr "" "\n" "Будь ласка, зв'яжіться із автором якщо знаєте як це відтворити." -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "Помилка Програми" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "Під час копіювання виникла помилка.\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "Помилка Поєднання" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "Помилка." -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "Виконано." -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "Не збережено." -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "Невідома операція поєднання. (Цього ніколи не має відбуватися!)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "Невідома операція поєднання." -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -397,39 +397,39 @@ msgstr "" "Майте на увазі, ця програма все ще у бета статусі та тут ЖОДНОЇ ГАРАНТІЇ до " "будь-чого! Зробіть резервні копії ваших важливих даних!" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "Запуск Поєднання" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "Здійснити це" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "Симулювати це" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" "Підсвітлений елемент має відмінний тип у різних теках. Оберіть що робити." -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "Дати модифікації файлу однакові але файли ні. Оберіть що робити." -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" "Ця операція наразі неможлива оскільки поєднання тек наразі відбувається." -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -439,278 +439,278 @@ msgstr "" "Чи ви бажаєте продовжити із елементом який призвів до помилки або пропустити " "його?" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "Продовжити поєднання після помилки" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "Продовжити Із Останнього Елементу" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "Пропустити Елемент" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "Пропущено." -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "У процесі..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "Операцію поєднання завершено." -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "Поєднання Завершено" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Симуляційне поєднання завершене: Перевірте чи ви згодні із запропонованими " "операціями." -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "Виникла помилка. Натисніть OK для перегляду детальної інформації.\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "Помилка: При видалені %1: Невдале створення резервної копії." -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "видалення теки рекурсивно( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "видалення( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Помилка: невдала операція видалення теки при спробі читання теки." -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "Помилка: невдала операція rmdir( %1 )." -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "Помилка: невдала операція видалення." -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ручне поєднання( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Примітка: Після ручного поєднання користувач має продовжити натиснувши " "F7." -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Помилка: невдале копіювання( %1 -> %2 ). Невдале видалення наявного " "призначення." -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "копіяПосилання( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Помилка: Невдала копіяПосилання: Віддалені посилання ще не підтримуються." -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "Помилка: Невдала копіяПосилання." -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "копія( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Помилка під час перейменування( %1 -> %2 ): Не можу видалити наявне " "призначення." -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "перейменування( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "Помилка: Невдале перейменування." -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Помилка під час створенняТеки %1. Не можу видалити наявний файл." -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "створенняТеки( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "Помилка під час створення теки." -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "Призн" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "Тека" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "Тип" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "Розмір" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "Атриб" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "Остання Модифікація" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "Призначення-Посилання" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "недоступний" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (Призн): " -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A (Основа): " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (Призн): " -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (Призн): " -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "Призн: " -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 msgid "Save Directory Merge State As..." msgstr "Зберегти Стан Поєднання Теки Як..." -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "Почати/Продовжити Поєднання Теки" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "Виконати Операцію до Поточного Елементу" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "Порівняти Обраний Файл" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "Поєднати Обраний Файл" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "Скласти Всі Підтеки" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "Розкласти Всі Підтеки" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "Обрати A для Всіх Елементів" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "Обрати B для Всіх Елементів" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "Обрати C для Всіх Елементів" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "Авто-Обрання Операцій для Всіх Елементів" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "Жодної Операції для Всіх Елементів" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "Показати Ідентичні Файли" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 msgid "Show Different Files" msgstr "Показати Відмінні Файли" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "Показати Файли Лише в A" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "Показати Файли Лише в B" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "Показати Файли Лише в C" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 msgid "Compare Explicitly Selected Files" msgstr "Порівняти Явно Обрані Файли" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 msgid "Merge Explicitly Selected Files" msgstr "Поєднати Явно Обрані Файли" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "Нічого Не Робити" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "Видалити A && B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "Поєднати до A && B" diff --git a/translations/messages/kdiff3/zh_CN.po b/translations/messages/kdiff3/zh_CN.po index 4e28c81..7a032a0 100644 --- a/translations/messages/kdiff3/zh_CN.po +++ b/translations/messages/kdiff3/zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"POT-Creation-Date: 2021-07-07 18:26+0000\n" +"POT-Creation-Date: 2023-11-26 18:16+0000\n" "PO-Revision-Date: 2005-02-07 10:03+0800\n" "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n" "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n" @@ -27,11 +27,11 @@ msgid "" "Your emails" msgstr "i18n-translation@list.linux.net.cn" -#: diff.cpp:247 +#: diff.cpp:248 msgid "Writing clipboard data to temp file failed." msgstr "将剪贴板数据写入临时文件失败。" -#: diff.cpp:251 +#: diff.cpp:252 msgid "From Clipboard" msgstr "从剪贴板" @@ -75,12 +75,12 @@ msgstr "" msgid "Severe Internal Error" msgstr "严重内部错误" -#: difftextwindow.cpp:1644 kdiff3.cpp:772 +#: difftextwindow.cpp:1643 kdiff3.cpp:772 #, fuzzy msgid "Top line" msgstr "顶端行数 %1" -#: difftextwindow.cpp:1654 +#: difftextwindow.cpp:1653 msgid "End" msgstr "末尾" @@ -112,74 +112,74 @@ msgstr "打开 %1 失败。" msgid "Comparing file..." msgstr "正在比较文件..." -#: directorymergewindow.cpp:233 directorymergewindow.cpp:239 +#: directorymergewindow.cpp:229 directorymergewindow.cpp:235 #, c-format msgid "Error reading from %1" msgstr "读取 %1 时错误" -#: directorymergewindow.cpp:297 +#: directorymergewindow.cpp:293 msgid "Name" msgstr "名称" -#: directorymergewindow.cpp:301 +#: directorymergewindow.cpp:297 msgid "Operation" msgstr "操作" -#: directorymergewindow.cpp:302 +#: directorymergewindow.cpp:298 msgid "Status" msgstr "状态" -#: directorymergewindow.cpp:303 +#: directorymergewindow.cpp:299 msgid "Unsolved" msgstr "未解决的" -#: directorymergewindow.cpp:304 +#: directorymergewindow.cpp:300 msgid "Solved" msgstr "已解决的" -#: directorymergewindow.cpp:305 +#: directorymergewindow.cpp:301 msgid "Nonwhite" msgstr "非空白" -#: directorymergewindow.cpp:306 +#: directorymergewindow.cpp:302 msgid "White" msgstr "空白" -#: directorymergewindow.cpp:334 +#: directorymergewindow.cpp:330 msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "您当前正在合并目录。您确定要放弃合并，重新扫描目录吗？" -#: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 +#: directorymergewindow.cpp:331 directorymergewindow.cpp:2926 msgid "Rescan" msgstr "重新扫描" -#: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 +#: directorymergewindow.cpp:331 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" msgstr "继续合并" -#: directorymergewindow.cpp:507 +#: directorymergewindow.cpp:503 msgid "Opening of directories failed:" msgstr "打开目录失败" -#: directorymergewindow.cpp:510 +#: directorymergewindow.cpp:506 msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "目录 A “%1”不存在或者不是目录。\n" -#: directorymergewindow.cpp:513 +#: directorymergewindow.cpp:509 msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "目录 B “%1”不存在或者不是目录。\n" -#: directorymergewindow.cpp:516 +#: directorymergewindow.cpp:512 msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "目录 C “%1”不存在或者不是目录。\n" -#: directorymergewindow.cpp:518 +#: directorymergewindow.cpp:514 msgid "Directory Open Error" msgstr "打开目录错误" -#: directorymergewindow.cpp:526 +#: directorymergewindow.cpp:522 msgid "" "The destination directory must not be the same as A or B when three " "directories are merged.\n" @@ -188,144 +188,144 @@ msgstr "" "当三个目录合并时，目标目录不能是 A 或者 B。\n" "在继续进行前，请再核对一遍。" -#: directorymergewindow.cpp:528 +#: directorymergewindow.cpp:524 msgid "Parameter Warning" msgstr "参数警告" -#: directorymergewindow.cpp:533 +#: directorymergewindow.cpp:529 msgid "Scanning directories..." msgstr "正在扫描目录..." -#: directorymergewindow.cpp:582 +#: directorymergewindow.cpp:578 msgid "Reading Directory A" msgstr "读取目录 A" -#: directorymergewindow.cpp:604 +#: directorymergewindow.cpp:600 msgid "Reading Directory B" msgstr "读取目录 B" -#: directorymergewindow.cpp:626 +#: directorymergewindow.cpp:622 msgid "Reading Directory C" msgstr "读取目录 C" -#: directorymergewindow.cpp:652 +#: directorymergewindow.cpp:648 msgid "Some subdirectories were not readable in" msgstr "不能进入读取一些子目录" -#: directorymergewindow.cpp:657 +#: directorymergewindow.cpp:653 msgid "Check the permissions of the subdirectories." msgstr "检查子目录权限。" -#: directorymergewindow.cpp:691 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 +#: directorymergewindow.cpp:687 kdiff3.cpp:568 kdiff3.cpp:655 kdiff3.cpp:680 #: kdiff3.cpp:953 kdiff3.cpp:974 pdiff.cpp:1070 pdiff.cpp:1142 pdiff.cpp:1180 #: pdiff.cpp:1196 pdiff.cpp:1226 pdiff.cpp:1237 msgid "Ready." msgstr "就绪。" -#: directorymergewindow.cpp:705 +#: directorymergewindow.cpp:701 msgid "Directory Comparison Status" msgstr "目录比较状态" -#: directorymergewindow.cpp:706 +#: directorymergewindow.cpp:702 msgid "Number of subdirectories:" msgstr "子目录数：" -#: directorymergewindow.cpp:707 +#: directorymergewindow.cpp:703 msgid "Number of equal files:" msgstr "相同文件数：" -#: directorymergewindow.cpp:708 +#: directorymergewindow.cpp:704 msgid "Number of different files:" msgstr "不同文件数：" -#: directorymergewindow.cpp:711 +#: directorymergewindow.cpp:707 msgid "Number of manual merges:" msgstr "手动合并数：" -#: directorymergewindow.cpp:867 +#: directorymergewindow.cpp:863 msgid "This affects all merge operations." msgstr "这将影响全部合并操作。" -#: directorymergewindow.cpp:868 +#: directorymergewindow.cpp:864 msgid "Changing All Merge Operations" msgstr "更改全部合并操作" -#: directorymergewindow.cpp:868 mergeresultwindow.cpp:287 +#: directorymergewindow.cpp:864 mergeresultwindow.cpp:287 msgid "C&ontinue" msgstr "继续(&o)" -#: directorymergewindow.cpp:1236 +#: directorymergewindow.cpp:1232 msgid "Processing " msgstr "处理 " -#: directorymergewindow.cpp:1710 directorymergewindow.cpp:1716 +#: directorymergewindow.cpp:1706 directorymergewindow.cpp:1712 msgid "To do." msgstr "执行。" -#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2961 +#: directorymergewindow.cpp:1815 directorymergewindow.cpp:2957 msgid "Copy A to B" msgstr "复制 A 到 B" -#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 +#: directorymergewindow.cpp:1816 directorymergewindow.cpp:2958 msgid "Copy B to A" msgstr "复制 B 到 A" -#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 +#: directorymergewindow.cpp:1817 directorymergewindow.cpp:2959 msgid "Delete A" msgstr "删除 A" -#: directorymergewindow.cpp:1822 directorymergewindow.cpp:2964 +#: directorymergewindow.cpp:1818 directorymergewindow.cpp:2960 msgid "Delete B" msgstr "删除 B" -#: directorymergewindow.cpp:1823 +#: directorymergewindow.cpp:1819 msgid "Delete A & B" msgstr "删除 A 和 B" -#: directorymergewindow.cpp:1824 directorymergewindow.cpp:2966 +#: directorymergewindow.cpp:1820 directorymergewindow.cpp:2962 msgid "Merge to A" msgstr "合并到 A" -#: directorymergewindow.cpp:1825 directorymergewindow.cpp:2967 +#: directorymergewindow.cpp:1821 directorymergewindow.cpp:2963 msgid "Merge to B" msgstr "合并到 B" -#: directorymergewindow.cpp:1826 +#: directorymergewindow.cpp:1822 msgid "Merge to A & B" msgstr "合并到 A 和 B" -#: directorymergewindow.cpp:1830 directorymergewindow.cpp:2958 +#: directorymergewindow.cpp:1826 directorymergewindow.cpp:2954 msgid "Delete (if exists)" msgstr "删除(如果存在)" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 -#: directorymergewindow.cpp:2957 optiondialog.cpp:800 smalldialogs.cpp:102 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 +#: directorymergewindow.cpp:2953 optiondialog.cpp:800 smalldialogs.cpp:102 msgid "Merge" msgstr "合并" -#: directorymergewindow.cpp:1831 directorymergewindow.cpp:1832 +#: directorymergewindow.cpp:1827 directorymergewindow.cpp:1828 msgid "Merge (manual)" msgstr "合并(手动)" -#: directorymergewindow.cpp:1833 +#: directorymergewindow.cpp:1829 msgid "Error: Conflicting File Types" msgstr "错误：文件类型冲突" -#: directorymergewindow.cpp:1834 +#: directorymergewindow.cpp:1830 msgid "Error: Dates are equal but files are not." msgstr "错误：日期相同但是文件不同。" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 msgid "This operation is currently not possible." msgstr "现在不能执行此操作。" -#: directorymergewindow.cpp:1861 directorymergewindow.cpp:1890 -#: directorymergewindow.cpp:1915 directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:1857 directorymergewindow.cpp:1886 +#: directorymergewindow.cpp:1911 directorymergewindow.cpp:2168 msgid "Operation Not Possible" msgstr "操作不可行" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "" "This should never happen: \n" "\n" @@ -339,40 +339,40 @@ msgstr "" "\n" "如果您知道如何重现错误，请联系程序作者。" -#: directorymergewindow.cpp:1954 +#: directorymergewindow.cpp:1950 msgid "Program Error" msgstr "程序错误" -#: directorymergewindow.cpp:1965 +#: directorymergewindow.cpp:1961 msgid "An error occurred while copying.\n" msgstr "复制时发生错误。\n" -#: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372 +#: directorymergewindow.cpp:1962 directorymergewindow.cpp:2368 msgid "Merge Error" msgstr "合并错误" -#: directorymergewindow.cpp:1971 directorymergewindow.cpp:2377 +#: directorymergewindow.cpp:1967 directorymergewindow.cpp:2373 msgid "Error." msgstr "错误。" -#: directorymergewindow.cpp:1976 directorymergewindow.cpp:2268 -#: directorymergewindow.cpp:2308 +#: directorymergewindow.cpp:1972 directorymergewindow.cpp:2264 +#: directorymergewindow.cpp:2304 msgid "Done." msgstr "完成。" -#: directorymergewindow.cpp:1999 +#: directorymergewindow.cpp:1995 msgid "Not saved." msgstr "未保存。" -#: directorymergewindow.cpp:2034 +#: directorymergewindow.cpp:2030 msgid "Unknown merge operation. (This must never happen!)" msgstr "未知合并操作。(绝不可以发生！)" -#: directorymergewindow.cpp:2066 +#: directorymergewindow.cpp:2062 msgid "Unknown merge operation." msgstr "未知合并操作。" -#: directorymergewindow.cpp:2081 +#: directorymergewindow.cpp:2077 msgid "" "The merge is about to begin.\n" "\n" @@ -390,37 +390,37 @@ msgstr "" "\n" "注意此程序依然处于 beta 状态，没有任何保证！备份您的重要数据！" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Starting Merge" msgstr "开始合并" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Do It" msgstr "执行" -#: directorymergewindow.cpp:2086 +#: directorymergewindow.cpp:2082 msgid "Simulate It" msgstr "模拟" -#: directorymergewindow.cpp:2112 +#: directorymergewindow.cpp:2108 msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "高亮的项目在不同的目录有不同类型。选择做什么。" -#: directorymergewindow.cpp:2121 +#: directorymergewindow.cpp:2117 msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "文件的修改日期相同但是文件不同。选择做什么。" -#: directorymergewindow.cpp:2172 +#: directorymergewindow.cpp:2168 msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "此操作当前不可行，因为目录合并正在运行。" -#: directorymergewindow.cpp:2232 +#: directorymergewindow.cpp:2228 msgid "" "There was an error in the last step.\n" "Do you want to continue with the item that caused the error or do you want " @@ -429,273 +429,273 @@ msgstr "" "最后一步有错误。\n" "您要继续进行导致错误的项目还是跳过该项？" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue merge after an error" msgstr "出错后继续合并" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Continue With Last Item" msgstr "继续进行上一项" -#: directorymergewindow.cpp:2234 +#: directorymergewindow.cpp:2230 msgid "Skip Item" msgstr "跳过项目" -#: directorymergewindow.cpp:2268 +#: directorymergewindow.cpp:2264 msgid "Skipped." msgstr "已跳过。" -#: directorymergewindow.cpp:2275 directorymergewindow.cpp:2501 +#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2497 msgid "In progress..." msgstr "进行中..." -#: directorymergewindow.cpp:2323 +#: directorymergewindow.cpp:2319 msgid "Merge operation complete." msgstr "合并操作完成。" -#: directorymergewindow.cpp:2323 directorymergewindow.cpp:2326 +#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2322 msgid "Merge Complete" msgstr "合并完成" -#: directorymergewindow.cpp:2335 +#: directorymergewindow.cpp:2331 msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "模拟合并完成：核对您是否赞同被提议的操作。" -#: directorymergewindow.cpp:2371 +#: directorymergewindow.cpp:2367 msgid "An error occurred. Press OK to see detailed information.\n" msgstr "错误发生。按 OK 看详细信息。\n" -#: directorymergewindow.cpp:2414 +#: directorymergewindow.cpp:2410 msgid "Error: While deleting %1: Creating backup failed." msgstr "错误：在删除 %1 时：创建备份失败。" -#: directorymergewindow.cpp:2421 +#: directorymergewindow.cpp:2417 msgid "delete directory recursively( %1 )" msgstr "递归删除目录( %1 )" -#: directorymergewindow.cpp:2423 +#: directorymergewindow.cpp:2419 msgid "delete( %1 )" msgstr "删除( %1 )" -#: directorymergewindow.cpp:2438 +#: directorymergewindow.cpp:2434 msgid "Error: delete dir operation failed while trying to read the directory." msgstr "错误：在试图读取目录时删除目录操作失败。" -#: directorymergewindow.cpp:2457 +#: directorymergewindow.cpp:2453 msgid "Error: rmdir( %1 ) operation failed." msgstr "错误：rmdir( %1 )操作失败。" -#: directorymergewindow.cpp:2467 +#: directorymergewindow.cpp:2463 msgid "Error: delete operation failed." msgstr "错误：删除操作失败。" -#: directorymergewindow.cpp:2493 +#: directorymergewindow.cpp:2489 msgid "manual merge( %1, %2, %3 -> %4)" msgstr "手动合并( %1，%2，%3 -> %4)" -#: directorymergewindow.cpp:2496 +#: directorymergewindow.cpp:2492 msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " 注意：在手动合并之后用户应该按 F7 继续。" -#: directorymergewindow.cpp:2519 +#: directorymergewindow.cpp:2515 msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "错误：复制( %1 -> %2 )失败。删除现存目标失败。" -#: directorymergewindow.cpp:2529 +#: directorymergewindow.cpp:2525 msgid "copyLink( %1 -> %2 )" msgstr "复制链接( %1 -> %2 )" -#: directorymergewindow.cpp:2540 +#: directorymergewindow.cpp:2536 msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "错误：复制链接失败：远程链接尚未支持。" -#: directorymergewindow.cpp:2546 +#: directorymergewindow.cpp:2542 msgid "Error: copyLink failed." msgstr "错误：复制链接失败。" -#: directorymergewindow.cpp:2566 +#: directorymergewindow.cpp:2562 msgid "copy( %1 -> %2 )" msgstr "复制( %1 -> %2 )" -#: directorymergewindow.cpp:2592 +#: directorymergewindow.cpp:2588 msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "重命名( %1 -> %2 )错误：无法删除现存目标。" -#: directorymergewindow.cpp:2598 +#: directorymergewindow.cpp:2594 msgid "rename( %1 -> %2 )" msgstr "重命名( %1 -> %2 )" -#: directorymergewindow.cpp:2607 +#: directorymergewindow.cpp:2603 msgid "Error: Rename failed." msgstr "错误：重命名失败。" -#: directorymergewindow.cpp:2625 +#: directorymergewindow.cpp:2621 msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "建立目录 %1 出错。无法删除现存文件。" -#: directorymergewindow.cpp:2641 +#: directorymergewindow.cpp:2637 msgid "makeDir( %1 )" msgstr "建立目录( %1 )" -#: directorymergewindow.cpp:2651 +#: directorymergewindow.cpp:2647 msgid "Error while creating directory." msgstr "创建目录时出错。" -#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2787 +#: directorymergewindow.cpp:2670 directorymergewindow.cpp:2783 msgid "Dest" msgstr "目标" -#: directorymergewindow.cpp:2678 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2674 directorymergewindow.cpp:2708 msgid "Dir" msgstr "目录" -#: directorymergewindow.cpp:2679 +#: directorymergewindow.cpp:2675 msgid "Type" msgstr "类型" -#: directorymergewindow.cpp:2680 +#: directorymergewindow.cpp:2676 msgid "Size" msgstr "大小" -#: directorymergewindow.cpp:2681 +#: directorymergewindow.cpp:2677 msgid "Attr" msgstr "属性" -#: directorymergewindow.cpp:2682 +#: directorymergewindow.cpp:2678 msgid "Last Modification" msgstr "上次修改" -#: directorymergewindow.cpp:2683 +#: directorymergewindow.cpp:2679 msgid "Link-Destination" msgstr "链接目标" -#: directorymergewindow.cpp:2729 +#: directorymergewindow.cpp:2725 msgid "not available" msgstr "不可用" -#: directorymergewindow.cpp:2749 +#: directorymergewindow.cpp:2745 msgid "A (Dest): " msgstr "A (目标)：" -#: directorymergewindow.cpp:2752 +#: directorymergewindow.cpp:2748 msgid "A (Base): " msgstr "A 基准" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2754 msgid "B (Dest): " msgstr "B (目标)：" -#: directorymergewindow.cpp:2766 +#: directorymergewindow.cpp:2762 msgid "C (Dest): " msgstr "C (目标)：" -#: directorymergewindow.cpp:2772 +#: directorymergewindow.cpp:2768 msgid "Dest: " msgstr "目标：" -#: directorymergewindow.cpp:2837 +#: directorymergewindow.cpp:2833 #, fuzzy msgid "Save Directory Merge State As..." msgstr "目录合并" -#: directorymergewindow.cpp:2924 +#: directorymergewindow.cpp:2920 msgid "Start/Continue Directory Merge" msgstr "开始/继续目录合并" -#: directorymergewindow.cpp:2925 +#: directorymergewindow.cpp:2921 msgid "Run Operation for Current Item" msgstr "开始当前项目操作" -#: directorymergewindow.cpp:2926 +#: directorymergewindow.cpp:2922 msgid "Compare Selected File" msgstr "比较所选文件" -#: directorymergewindow.cpp:2927 +#: directorymergewindow.cpp:2923 msgid "Merge Current File" msgstr "合并当前文件" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2924 msgid "Fold All Subdirs" msgstr "折叠全部子文件夹" -#: directorymergewindow.cpp:2929 +#: directorymergewindow.cpp:2925 msgid "Unfold All Subdirs" msgstr "打开全部子文件夹" -#: directorymergewindow.cpp:2933 +#: directorymergewindow.cpp:2929 msgid "Choose A for All Items" msgstr "选择 A 的全部项目" -#: directorymergewindow.cpp:2934 +#: directorymergewindow.cpp:2930 msgid "Choose B for All Items" msgstr "选择 B 的全部项目" -#: directorymergewindow.cpp:2935 +#: directorymergewindow.cpp:2931 msgid "Choose C for All Items" msgstr "选择 C 的全部项目" -#: directorymergewindow.cpp:2936 +#: directorymergewindow.cpp:2932 msgid "Auto-Choose Operation for All Items" msgstr "为全部项目自动选择操作" -#: directorymergewindow.cpp:2937 +#: directorymergewindow.cpp:2933 msgid "No Operation for All Items" msgstr "全部项目无操作" -#: directorymergewindow.cpp:2942 +#: directorymergewindow.cpp:2938 msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:2943 +#: directorymergewindow.cpp:2939 #, fuzzy msgid "Show Different Files" msgstr "不同文件数：" -#: directorymergewindow.cpp:2944 +#: directorymergewindow.cpp:2940 msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:2945 +#: directorymergewindow.cpp:2941 msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:2946 +#: directorymergewindow.cpp:2942 msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:2950 +#: directorymergewindow.cpp:2946 #, fuzzy msgid "Compare Explicitly Selected Files" msgstr "比较所选文件" -#: directorymergewindow.cpp:2951 +#: directorymergewindow.cpp:2947 #, fuzzy msgid "Merge Explicitly Selected Files" msgstr "比较所选文件" -#: directorymergewindow.cpp:2953 directorymergewindow.cpp:2960 +#: directorymergewindow.cpp:2949 directorymergewindow.cpp:2956 msgid "Do Nothing" msgstr "什么也不做" -#: directorymergewindow.cpp:2954 +#: directorymergewindow.cpp:2950 msgid "A" msgstr "A" -#: directorymergewindow.cpp:2955 +#: directorymergewindow.cpp:2951 msgid "B" msgstr "B" -#: directorymergewindow.cpp:2956 +#: directorymergewindow.cpp:2952 msgid "C" msgstr "C" -#: directorymergewindow.cpp:2965 +#: directorymergewindow.cpp:2961 msgid "Delete A && B" msgstr "删除 A 和 B" -#: directorymergewindow.cpp:2968 +#: directorymergewindow.cpp:2964 msgid "Merge to A && B" msgstr "合并到 A 和 B" diff --git a/translations/messages/kdiff3_plugin/zh_Hans.po b/translations/messages/kdiff3_plugin/zh_Hans.po index fa1231a..ef47e99 100644 --- a/translations/messages/kdiff3_plugin/zh_Hans.po +++ b/translations/messages/kdiff3_plugin/zh_Hans.po @@ -16,14 +16,12 @@ msgstr "" "X-Generator: Weblate 4.13.1\n" #. Instead of a literal translation, add your name to the end of the list (separated by a comma). -#, ignore-inconsistent msgid "" "_: NAME OF TRANSLATORS\n" "Your names" msgstr "您的名字" #. Instead of a literal translation, add your email to the end of the list (separated by a comma). -#, ignore-inconsistent msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" |