From dea29f2cd04650b849260fc4e88f69c61befe7e0 Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Mon, 29 Jun 2020 15:05:21 -0400 Subject: [PATCH] Update all the translation files with latest POT --- CHANGELOG.md | 1 + translations/cs.po | 1578 ++++++++++++++++++++--------------------- translations/de.po | 407 ++++++----- translations/es.po | 408 ++++++----- translations/it.po | 502 ++++++------- translations/ja.po | 493 ++++++------- translations/ko.po | 481 ++++++------- translations/pl.po | 489 ++++++------- translations/pt.po | 1557 ++++++++++++++++++++-------------------- translations/ru.po | 493 ++++++------- translations/sv.po | 497 ++++++------- translations/th.po | 1526 +++++++++++++++++++-------------------- translations/zh_CN.po | 460 ++++++------ translations/zh_TW.po | 448 ++++++------ 14 files changed, 4454 insertions(+), 4886 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb5ddb7..30ed9c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - updated copyrights years and authors - improve Spanish translation - convert translation README to MarkDown +- updated all the translation files ### Fixed - fixed wrong icons directory for gtk-update-icon-cache diff --git a/translations/cs.po b/translations/cs.po index e3d1b11..69f975e 100644 --- a/translations/cs.po +++ b/translations/cs.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-08 18:50+0100\n" -"PO-Revision-Date: 2013-04-08 19:24+0100\n" +"POT-Creation-Date: 2020-06-29 14:49-0400\n" +"PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Jindřich Šesták \n" "Language-Team: NONE \n" "Language: cs\n" @@ -22,31 +22,657 @@ msgstr "" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" -#: diffuse:68 -msgid "Copyright © 2006-2019 Derrick Moser" -"Copyright © 2015-2020 Romain Failliot" -msgstr "Copyright © 2006-2019 Derrick Moser" -"Copyright © 2015-2020 Romain Failliot" +#: ../src/usr/bin/diffuse:911 +msgid "\"co\" command" +msgstr "příkaz \"co\"" -#: diffuse:86 +#: ../src/usr/bin/diffuse:912 +msgid "\"rlog\" command" +msgstr "příkaz \"rlog\"" + +#: ../src/usr/bin/diffuse:7305 +#, python-format +msgid "A file named %s already exists. Do you want to overwrite it?" +msgstr "Soubor s názvem %s již existuje. Chcete ho přepsat?" + +#: ../src/usr/bin/diffuse:4820 +msgid "Align with Selection" +msgstr "Zarovnat s výběrem" + +#: ../src/usr/bin/diffuse:843 +msgid "Alignment" +msgstr "Zarovnání" + +#: ../src/usr/bin/diffuse:860 +msgid "Always show the tab bar" +msgstr "Vždy zobrazovat lištu s panely" + +#: ../src/usr/bin/diffuse:733 +msgid "Auto Detect" +msgstr "Automaticky rozpoznat" + +#: ../src/usr/bin/diffuse:853 +msgid "Auto indent" +msgstr "Automaticky odsazovat" + +#: ../src/usr/bin/diffuse:7551 +msgid "C_lear Edits" +msgstr "_Smazat úpravy" + +#: ../src/usr/bin/diffuse:8116 +msgid "Choose Folder With Commit" +msgstr "Vyberte adresář se zapsanou revizí" + +#: ../src/usr/bin/diffuse:8096 +msgid "Choose Folder With Modified Files" +msgstr "Vyberte adresář se změněnými soubory" + +#: ../src/usr/bin/diffuse:4829 ../src/usr/bin/diffuse:7653 +msgid "Clear Edits" +msgstr "Smazat úpravy" + +#: ../src/usr/bin/diffuse:6853 +msgid "Close Tab" +msgstr "Zavřít panel" + +#: ../src/usr/bin/diffuse:7802 +msgid "Close _Without Saving" +msgstr "Zavřít _bez uložení" + +#: ../src/usr/bin/diffuse:6714 +#, python-format +msgid "Closing this tab will quit %s." +msgstr "Zavřením tohoto panelu ukončíte %s." + +#: ../src/usr/bin/diffuse:914 +msgid "Command" +msgstr "Příkaz" + +#: ../src/usr/bin/diffuse:7597 +msgid "Convert Leading Spaces To _Tabs" +msgstr "Nah_radit úvodní mezery tabulátory" + +#: ../src/usr/bin/diffuse:7596 +msgid "Convert Tabs To _Spaces" +msgstr "_Nahradit tabulátory mezerami" + +#: ../src/usr/bin/diffuse:7604 +msgid "Convert To Uni_x Format" +msgstr "Převést na Uni_x formát" + +#: ../src/usr/bin/diffuse:7602 +msgid "Convert To _DOS Format" +msgstr "Převést na _DOS formát" + +#: ../src/usr/bin/diffuse:7590 +msgid "Convert To _Lower Case" +msgstr "Převést na _malá písmena" + +#: ../src/usr/bin/diffuse:7603 +msgid "Convert To _Mac Format" +msgstr "Převést na Ma_c formát" + +#: ../src/usr/bin/diffuse:7589 +msgid "Convert To _Upper Case" +msgstr "Převést na _velká písmena" + +#: ../src/usr/bin/diffuse:4825 ../src/usr/bin/diffuse:7651 +msgid "Copy" +msgstr "Kopírovat" + +#: ../src/usr/bin/diffuse:7643 +msgid "Copy Left Into Selection" +msgstr "Kopírovat zleva do výběru" + +#: ../src/usr/bin/diffuse:7610 +msgid "Copy Left _Into Selection" +msgstr "Ko_pírovat zleva do výběru" + +#: ../src/usr/bin/diffuse:7611 +msgid "Copy Right I_nto Selection" +msgstr "Kopí_rovat zprava do výběru" + +#: ../src/usr/bin/diffuse:7644 +msgid "Copy Right Into Selection" +msgstr "Kopírovat zprava do výběru" + +#: ../src/usr/bin/diffuse:7642 +msgid "Copy Selection Left" +msgstr "Kopírovat výběr doleva" + +#: ../src/usr/bin/diffuse:7641 +msgid "Copy Selection Right" +msgstr "Kopírovat výběr doprava" + +#: ../src/usr/bin/diffuse:7608 +msgid "Copy Selection _Left" +msgstr "K_opírovat výběr doleva" + +#: ../src/usr/bin/diffuse:7607 +msgid "Copy Selection _Right" +msgstr "_Kopírovat výběr doprava" + +#: ../src/usr/bin/diffuse:70 +msgid "Copyright" +msgstr "" + +#: ../src/usr/bin/diffuse:7546 +msgid "Cu_t" +msgstr "_Vyjmout" + +#: ../src/usr/bin/diffuse:4824 ../src/usr/bin/diffuse:7650 +msgid "Cut" +msgstr "Vyjmout" + +#: ../src/usr/bin/diffuse:889 +msgid "Cygdrive prefix" +msgstr "Předpona cygdrive" + +#: ../src/usr/bin/diffuse:886 +msgid "Cygwin" +msgstr "Cygwin" + +#: ../src/usr/bin/diffuse:7600 +msgid "De_crease Indenting" +msgstr "Zmenši_t odsazení" + +#: ../src/usr/bin/diffuse:865 +msgid "Default codec" +msgstr "Výchozí kódování" + +#: ../src/usr/bin/diffuse:859 +msgid "Default panes" +msgstr "Výchozí počet podoken" + +#: ../src/usr/bin/diffuse:6810 +msgid "Diffuse is a graphical tool for merging and comparing text files." +msgstr "Diffuse je grafický nástroj pro slučování a porovnávání textových souborů." + +#: ../src/usr/bin/diffuse:829 +msgid "Display" +msgstr "Zobrazení" + +#: ../src/usr/bin/diffuse:851 +msgid "Editor" +msgstr "Editor" + +#: ../src/usr/bin/diffuse:6736 +msgid "Encoding: " +msgstr "Kódování: " + +#: ../src/usr/bin/diffuse:7351 +#, python-format +msgid "Error encoding to %s." +msgstr "Při změně kódování do %s došlo k chybě." + +#: ../src/usr/bin/diffuse:2657 +#, python-format +msgid "Error parsing %s." +msgstr "Při analýze %s došlo k chybě." + +#: ../src/usr/bin/diffuse:8498 +msgid "Error parsing line number." +msgstr "Při analýze čísla řádku došlo k chybě." + +#: ../src/usr/bin/diffuse:1655 ../src/usr/bin/diffuse:2272 +#: ../src/usr/bin/diffuse:2416 +#, python-format +msgid "Error parsing revision %s." +msgstr "Při analýze revize %s došlo k chybě." + +#: ../src/usr/bin/diffuse:8515 +#, python-format +msgid "Error processing argument \"%s\". Directory not expected." +msgstr "Při zpracování parametru \"%s\" došlo k chybě. Adresář nebyl očekáván." + +#: ../src/usr/bin/diffuse:714 +#, python-format +msgid "Error processing line %(line)d of %(file)s." +msgstr "Při zpracování řádku %(line)d souboru %(file)s došlo k chybě." + +#: ../src/usr/bin/diffuse:7186 ../src/usr/bin/diffuse:8417 +#, python-format +msgid "Error reading %s." +msgstr "Při čtení souboru %s došlo k chybě." + +#: ../src/usr/bin/diffuse:7184 +#, python-format +msgid "Error reading revision %(rev)s of %(file)s." +msgstr "Při čtení revize %(rev)s souboru %(file)s došlo k chybě." + +#: ../src/usr/bin/diffuse:8016 +#, python-format +msgid "Error retrieving commits for %s." +msgstr "Revize pro %s se nepodařilo načíst." + +#: ../src/usr/bin/diffuse:8047 +#, python-format +msgid "Error retrieving modifications for %s." +msgstr "Při načítání změn %s došlo k chybě." + +#: ../src/usr/bin/diffuse:1026 ../src/usr/bin/diffuse:7355 +#, python-format +msgid "Error writing %s." +msgstr "Při ukládání %s došlo k chybě." + +#: ../src/usr/bin/diffuse:854 +msgid "Expand tabs to spaces" +msgstr "Nahradit tabulátory mezerami" + +#: ../src/usr/bin/diffuse:7588 +msgid "F_ormat" +msgstr "F_ormát" + +#: ../src/usr/bin/diffuse:7913 +#, python-format +msgid "File Merge %d" +msgstr "Slučování %d" + +#: ../src/usr/bin/diffuse:7556 +msgid "Find Pre_vious" +msgstr "Najít _předchozí" + +#: ../src/usr/bin/diffuse:7555 +msgid "Find _Next" +msgstr "Najít _další" + +#: ../src/usr/bin/diffuse:6662 +msgid "Find..." +msgstr "Najít..." + +#: ../src/usr/bin/diffuse:7580 +msgid "Fir_st Tab" +msgstr "Prv_ní panel" + +#: ../src/usr/bin/diffuse:7636 +msgid "First Difference" +msgstr "První rozdíl" + +#: ../src/usr/bin/diffuse:831 +msgid "Font" +msgstr "Písmo" + +#: ../src/usr/bin/diffuse:7385 +msgid "Go To Line..." +msgstr "Přejít na řádek..." + +#: ../src/usr/bin/diffuse:840 +msgid "Ignore blank line differences" +msgstr "Ignorovat prázdné řádky" + +#: ../src/usr/bin/diffuse:848 +msgid "Ignore blank lines" +msgstr "Ignorovat prázdné řádky" + +#: ../src/usr/bin/diffuse:845 +msgid "Ignore case" +msgstr "Ignorovat velikost písmen" + +#: ../src/usr/bin/diffuse:837 +msgid "Ignore case differences" +msgstr "Ignorovat velikost písmen" + +#: ../src/usr/bin/diffuse:839 ../src/usr/bin/diffuse:847 +msgid "Ignore changes to white space" +msgstr "Ignorovat znaky mezer" + +#: ../src/usr/bin/diffuse:849 +msgid "Ignore end of line characters" +msgstr "Ignorovat znaky konce řádku" + +#: ../src/usr/bin/diffuse:841 +msgid "Ignore end of line differences" +msgstr "Ignorovat znaky konce řádku" + +#: ../src/usr/bin/diffuse:846 +msgid "Ignore white space" +msgstr "Ignorovat netisknutelné znaky" + +#: ../src/usr/bin/diffuse:838 +msgid "Ignore white space differences" +msgstr "Ignorovat netisknutelné znaky" + +#: ../src/usr/bin/diffuse:4821 +msgid "Isolate" +msgstr "Izolovat" + +#: ../src/usr/bin/diffuse:7583 +msgid "Las_t Tab" +msgstr "Posl_ední panel" + +#: ../src/usr/bin/diffuse:7639 +msgid "Last Difference" +msgstr "Poslední rozdíl" + +#: ../src/usr/bin/diffuse:916 +msgid "Launch from a Bash login shell" +msgstr "Spustit z příkazové řádky terminálu Bash" + +#: ../src/usr/bin/diffuse:7385 +msgid "Line Number: " +msgstr "Řádek číslo: " + +#: ../src/usr/bin/diffuse:7613 +msgid "M_erge From Right Then Left" +msgstr "S_loučit zprava a poté zleva" + +#: ../src/usr/bin/diffuse:6695 +msgid "Match Case" +msgstr "Rozlišovat velikost písmen" + +#: ../src/usr/bin/diffuse:7645 +msgid "Merge From Left Then Right" +msgstr "Sloučit zleva a poté zprava" + +#: ../src/usr/bin/diffuse:7646 +msgid "Merge From Right Then Left" +msgstr "Sloučit zprava a poté zleva" + +#: ../src/usr/bin/diffuse:4822 +msgid "Merge Selection" +msgstr "Sloučit výběr" + +#: ../src/usr/bin/diffuse:7632 +msgid "New 2-Way File Merge" +msgstr "Nové 2směrné slučování" + +#: ../src/usr/bin/diffuse:7633 +msgid "New 3-Way File Merge" +msgstr "Nové 3směrné slučování" + +#: ../src/usr/bin/diffuse:8165 +msgid "New N-Way File Merge..." +msgstr "Nové Nsměrné slučování" + +#: ../src/usr/bin/diffuse:7534 +msgid "New _2-Way File Merge" +msgstr "Nové _2směrné slučování" + +#: ../src/usr/bin/diffuse:7535 +msgid "New _3-Way File Merge" +msgstr "Nové _3směrné slučování" + +#: ../src/usr/bin/diffuse:7536 +msgid "New _N-Way File Merge..." +msgstr "Nové _Nsměrné slučování" + +#: ../src/usr/bin/diffuse:7638 +msgid "Next Difference" +msgstr "Další rozdíl" + +#: ../src/usr/bin/diffuse:7582 +msgid "Next _Tab" +msgstr "D_alší panel" + +#: ../src/usr/bin/diffuse:8129 +msgid "No committed files found." +msgstr "Nebyly nalezeny žádné zapsané soubory." + +#: ../src/usr/bin/diffuse:8109 +msgid "No modified files found." +msgstr "Nebyly nalezeny žádné změněné soubory." + +#: ../src/usr/bin/diffuse:7561 +msgid "None" +msgstr "Nic" + +#: ../src/usr/bin/diffuse:8165 +msgid "Number of panes: " +msgstr "Počet podoken: " + +#: ../src/usr/bin/diffuse:7527 +msgid "Open Commi_t..." +msgstr "Otevřít _revizi..." + +#: ../src/usr/bin/diffuse:7209 +msgid "Open File" +msgstr "Otevřít soubor" + +#: ../src/usr/bin/diffuse:8080 +msgid "Open File In New Tab" +msgstr "Otevřít soubor v novém panelu" + +#: ../src/usr/bin/diffuse:7525 +msgid "Open File In New _Tab..." +msgstr "Otevřít soubor v novém _panelu..." + +#: ../src/usr/bin/diffuse:6908 +msgid "Open File..." +msgstr "Otevřít soubor..." + +#: ../src/usr/bin/diffuse:7526 +msgid "Open _Modified Files..." +msgstr "Otevřít změněné soubory..." + +#: ../src/usr/bin/diffuse:866 +msgid "Order of codecs used to identify encoding" +msgstr "Pořadí kodeků pro rozpoznání kódování" + +#: ../src/usr/bin/diffuse:7791 +msgid "Pane" +msgstr "Podokno" + +#: ../src/usr/bin/diffuse:4826 ../src/usr/bin/diffuse:7652 +msgid "Paste" +msgstr "Vložit" + +#: ../src/usr/bin/diffuse:8230 +msgid "Phrase not found. Continue from the end of the file?" +msgstr "Hledaný výraz nebyl nalezen. Pokračovat v hledání od konce souboru?" + +#: ../src/usr/bin/diffuse:8232 +msgid "Phrase not found. Continue from the start of the file?" +msgstr "Hledaný výraz nebyl nalezen. Pokračovat v hledání od začátku souboru?" + +#: ../src/usr/bin/diffuse:7559 +msgid "Pr_eferences..." +msgstr "Př_edvolby..." + +#: ../src/usr/bin/diffuse:7581 +msgid "Pre_vious Tab" +msgstr "Předch_ozí panel" + +#: ../src/usr/bin/diffuse:986 +msgid "Preferences" +msgstr "Předvolby" + +#: ../src/usr/bin/diffuse:7411 +msgid "Press the enter key or double click to edit. Press the space bar or use the RMB menu to manually align." +msgstr "Pro aktivaci úprav stiskněte klávesu Enter, nebo na řádek dvakrát klikněte myší. Pro ruční zarovnání stiskněte Mezerník, nebo použijte místní nabídku dostupnou po kliknutí pravým tlačítkem myši." + +#: ../src/usr/bin/diffuse:7413 +msgid "Press the escape key to finish editing." +msgstr "Editaci ukončíte pomocí klávesy escape." + +#: ../src/usr/bin/diffuse:7637 +msgid "Previous Difference" +msgstr "Předchozí rozdíl" + +#: ../src/usr/bin/diffuse:7572 +msgid "Re_align All" +msgstr "Znovu _zarovnat" + +#: ../src/usr/bin/diffuse:7635 +msgid "Realign All" +msgstr "Znovu zarovnat" + +#: ../src/usr/bin/diffuse:7649 +msgid "Redo" +msgstr "Znovu" + +#: ../src/usr/bin/diffuse:863 +msgid "Regional Settings" +msgstr "Místní nastavení" + +#: ../src/usr/bin/diffuse:6909 +msgid "Reload File" +msgstr "Znovu načíst soubor" + +#: ../src/usr/bin/diffuse:7595 +msgid "Remove Trailing _White Space" +msgstr "_Odstranit mezery na koncích řádků" + +#: ../src/usr/bin/diffuse:6746 +msgid "Revision: " +msgstr "Revize: " + +#: ../src/usr/bin/diffuse:834 +msgid "Right margin" +msgstr "Pravý okraj" + +#: ../src/usr/bin/diffuse:888 +msgid "Root directory" +msgstr "Kořenový adresář" + +#: ../src/usr/bin/diffuse:7279 +#, python-format +msgid "Save %(title)s Pane %(pane)d" +msgstr "Uložit podokno %(pane)d %(title)s" + +#: ../src/usr/bin/diffuse:7532 +msgid "Save A_ll" +msgstr "Uložit _vše" + +#: ../src/usr/bin/diffuse:6910 +msgid "Save File" +msgstr "Uložit soubor" + +#: ../src/usr/bin/diffuse:6911 +msgid "Save File As..." +msgstr "Uložit soubor jako..." + +#: ../src/usr/bin/diffuse:7531 +msgid "Save File _As..." +msgstr "Uložit soubor ­_jako..." + +#: ../src/usr/bin/diffuse:7056 +msgid "Save changes before loading the new file?" +msgstr "Uložit změny před načtením nového souboru?" + +#: ../src/usr/bin/diffuse:6700 +msgid "Search Backwards" +msgstr "Hledat od konce" + +#: ../src/usr/bin/diffuse:6670 +msgid "Search For: " +msgstr "Vyhledat: " + +#: ../src/usr/bin/diffuse:4828 +msgid "Select All" +msgstr "Vybrat vše" + +#: ../src/usr/bin/diffuse:7550 +msgid "Select _All" +msgstr "V_ybrat vše" + +#: ../src/usr/bin/diffuse:7415 +msgid "Select target line and press the space bar to align. Press the escape key to cancel." +msgstr "Vyberte cílový řádek a proveďte zarovnání stisknutím klávesy Mezerník. Pro zrušení stiskněte klávesu Escape." + +#: ../src/usr/bin/diffuse:7586 +msgid "Shift Pane _Left" +msgstr "Přesunout podokno do_leva" + +#: ../src/usr/bin/diffuse:7585 +msgid "Shift Pane _Right" +msgstr "Přesunout podokno dop_rava" + +#: ../src/usr/bin/diffuse:835 +msgid "Show line numbers" +msgstr "Zobrazit čísla řádků" + +#: ../src/usr/bin/diffuse:833 +msgid "Show right margin" +msgstr "Zobrazit pravý okraj" + +#: ../src/usr/bin/diffuse:836 +msgid "Show white space characters" +msgstr "Zobrazit netisknutelné znaky" + +#: ../src/usr/bin/diffuse:8508 +#, python-format +msgid "Skipping unknown argument \"%s\"." +msgstr "Ignorován neznámý parametr \"%s\"." + +#: ../src/usr/bin/diffuse:855 +msgid "Soft tab width" +msgstr "Šířka tabulátoru" + +#: ../src/usr/bin/diffuse:7773 +msgid "Some files have unsaved changes. Select the files to save before closing." +msgstr "Některé změněné soubory nebyly uloženy. Vyberte soubory, které chcete před zavřením uložit." + +#: ../src/usr/bin/diffuse:7593 +msgid "Sort Lines In D_escending Order" +msgstr "Seřadit řádky _sestupně" + +#: ../src/usr/bin/diffuse:7592 +msgid "Sort Lines In _Ascending Order" +msgstr "Seřadit řádky v_zestupně" + +#: ../src/usr/bin/diffuse:4831 +msgid "Swap with Selected Pane" +msgstr "Prohodit s vybraným podoknem" + +#: ../src/usr/bin/diffuse:7786 +msgid "Tab" +msgstr "Panel" + +#: ../src/usr/bin/diffuse:832 +msgid "Tab width" +msgstr "Šířka tabulátoru" + +#: ../src/usr/bin/diffuse:857 +msgid "Tabs" +msgstr "Panely" + +#: ../src/usr/bin/diffuse:7259 +#, python-format +msgid "The file %s changed on disk. Do you want to reload the file?" +msgstr "Soubor %s byl změněn. Chcete ho znovu načíst?" + +#: ../src/usr/bin/diffuse:7310 +#, python-format +msgid "The file %s has been modified by another process since reading it. If you save, all the external changes could be lost. Save anyways?" +msgstr "Soubor %s byl od načtení změněn jiným procesem. Pokud ho nyní uložíte, změny provedené tímto externím procesem mohou být ztraceny. Chcete ho přesto uložit?" + +#: ../src/usr/bin/diffuse:6818 +msgid "" +"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License along with this program. You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n" +msgstr "" +"Tento program je svobodný software. Můžete ho upravovat a distribuovat za podmínky dodržení pravidel licence GNU General Public License verze 2 (dále jen GPL), nebo (pokud chcete) některé z jejích novějších verzí.\n" +"\n" +"Tento program je distribuován v naději, že bude užitečný, ale BEZ JAKÉKOLIV ZÁRUKY, tedy ani implicitní záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO URČITÝ ÚČEL. Další podrobnosti získáte přečtením GPL.\n" +"\n" +"Spolu s tímto programem by jste měli obdržet i kopii GPL. GPL můžete také získat na domovských stránkách Free Software Foundation (http://www.fsf.org/), nebo můžete zaslat dopis na adresu Free Software Foundation, Inc., 51 Franclin St, Fifth Floor, Boston, MA 02110-1301 USA\n" + +#: ../src/usr/bin/diffuse:7648 +msgid "Undo" +msgstr "Zpět" + +#: ../src/usr/bin/diffuse:918 +msgid "Update paths for Cygwin" +msgstr "Upravit cesty pro Cygwin" + +#: ../src/usr/bin/diffuse:81 msgid "" "Usage:\n" " diffuse [ [OPTION...] [FILE...] ]...\n" " diffuse ( -h | -? | --help | -v | --version )\n" "\n" -"Diffuse is a graphical tool for merging and comparing text files. Diffuse " -"is\n" -"able to compare an arbitrary number of files side-by-side and gives users " -"the\n" -"ability to manually adjust line matching and directly edit files. Diffuse " -"can\n" +"Diffuse is a graphical tool for merging and comparing text files. Diffuse is\n" +"able to compare an arbitrary number of files side-by-side and gives users the\n" +"ability to manually adjust line matching and directly edit files. Diffuse can\n" "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n" "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n" "\n" "Help Options:\n" " ( -h | -? | --help ) Display this usage information\n" -" ( -v | --version ) Display version and copyright " -"information\n" +" ( -v | --version ) Display version and copyright information\n" "\n" "Configuration Options:\n" " --no-rcfile Do not read any resource files\n" @@ -61,6 +687,7 @@ msgid "" " ( -r | --revision ) File revision \n" " ( -s | --separate ) Create a new tab for each file\n" " ( -t | --tab ) Start a new tab\n" +" ( -V | --vcs ) Version control system search order\n" " --line Start with line selected\n" " --null-file Create a blank file comparison pane\n" "\n" @@ -75,14 +702,10 @@ msgstr "" " diffuse [ [PARAMETR...] [SOUBOR...] ]...\n" " diffuse ( -h | -? | --help | -v | --version )\n" "\n" -"Diffuse je grafický nástroj pro slučování a porovnávání textových souborů. " -"Diffuse\n" -"dokáže porovnat libovolný počet souborů a nabízí uživatelům možnost ručně " -"upravit\n" -"zarovnání řádků a přímo upravovat porovnávané soubory. Diffuse také umí " -"načíst k\n" -"porovnání a slučování revize souborů přímo z repozitářů Bazaar, CVS, Darcs, " -"Git,\n" +"Diffuse je grafický nástroj pro slučování a porovnávání textových souborů. Diffuse\n" +"dokáže porovnat libovolný počet souborů a nabízí uživatelům možnost ručně upravit\n" +"zarovnání řádků a přímo upravovat porovnávané soubory. Diffuse také umí načíst k\n" +"porovnání a slučování revize souborů přímo z repozitářů Bazaar, CVS, Darcs, Git,\n" "Mercurial, Monotone,RCS, Subversion, a SVK.\n" "\n" "Nápověda:\n" @@ -94,832 +717,155 @@ msgstr "" " --rcfile Použije zadaný zdrojový soubor\n" "\n" "Obecné:\n" -" ( -c | --commit ) Revize souboru ve formátu a " -"\n" +" ( -c | --commit ) Revize souboru ve formátu a \n" " ( -D | --close-if-same ) Zavře panely s identickým obsahem\n" -" ( -e | --encoding ) Použije pro čtení a zápis souborů uvedený " -"\n" -" ( -L | --label ) Místo názvu soboru zobrazí uvedený " -"\n" -" ( -m | --modified ) Vytvoří pro každý změněný soubor nový " -"panel\n" +" ( -e | --encoding ) Použije pro čtení a zápis souborů uvedený \n" +" ( -L | --label ) Místo názvu soboru zobrazí uvedený \n" +" ( -m | --modified ) Vytvoří pro každý změněný soubor nový panel\n" " ( -r | --revision ) Revize souboru \n" -" ( -s | --separate ) Vytvoří pro každý soubor samostatný " -"panel\n" +" ( -s | --separate ) Vytvoří pro každý soubor samostatný panel\n" " ( -t | --tab ) Vytvoří nový panel\n" +" ( -V | --vcs ) Version control system search order\n" " --line <řádek> Po spuštění přejde na <řádek>\n" -" --null-file Vytvoří prázdné podokno pro porovnání " -"souborů\n" +" --null-file Vytvoří prázdné podokno pro porovnání souborů\n" "\n" "Zobrazení:\n" -" ( -b | --ignore-space-change ) Bude ignorovat změny, pokud jde o znaky " -"mezer\n" -" ( -B | --ignore-blank-lines ) Bude ignorovat změny pokud, jde o prázdné " -"řádky\n" -" ( -E | --ignore-end-of-line ) Bude ignorovat změny pokud, jde o znaky " -"konců řádek\n" -" ( -i | --ignore-case ) Bude ignorovat změny pokud, jde jen o " -"změnu velikosti písmen\n" -" ( -w | --ignore-all-space ) Bude ignorovat změny pokud, jde o " -"netisknutelné znaky" +" ( -b | --ignore-space-change ) Bude ignorovat změny, pokud jde o znaky mezer\n" +" ( -B | --ignore-blank-lines ) Bude ignorovat změny pokud, jde o prázdné řádky\n" +" ( -E | --ignore-end-of-line ) Bude ignorovat změny pokud, jde o znaky konců řádek\n" +" ( -i | --ignore-case ) Bude ignorovat změny pokud, jde jen o změnu velikosti písmen\n" +" ( -w | --ignore-all-space ) Bude ignorovat změny pokud, jde o netisknutelné znaky" -#: diffuse:706 -#, python-format -msgid "Error processing line %(line)d of %(file)s." -msgstr "Při zpracování řádku %(line)d souboru %(file)s došlo k chybě." +#: ../src/usr/bin/diffuse:922 +msgid "Version Control" +msgstr "Správa verzí" -#: diffuse:725 -msgid "Auto Detect" -msgstr "Automaticky rozpoznat" +#: ../src/usr/bin/diffuse:905 +msgid "Version control system search order" +msgstr "" -#: diffuse:821 -msgid "Display" -msgstr "Zobrazení" - -#: diffuse:823 -msgid "Font" -msgstr "Písmo" - -#: diffuse:824 -msgid "Tab width" -msgstr "Šířka tabulátoru" - -#: diffuse:825 -msgid "Show right margin" -msgstr "Zobrazit pravý okraj" - -#: diffuse:826 -msgid "Right margin" -msgstr "Pravý okraj" - -#: diffuse:827 -msgid "Show line numbers" -msgstr "Zobrazit čísla řádků" - -#: diffuse:828 -msgid "Show white space characters" -msgstr "Zobrazit netisknutelné znaky" - -#: diffuse:829 -msgid "Ignore case differences" -msgstr "Ignorovat velikost písmen" - -#: diffuse:830 -msgid "Ignore white space differences" -msgstr "Ignorovat netisknutelné znaky" - -#: diffuse:831 diffuse:839 -msgid "Ignore changes to white space" -msgstr "Ignorovat znaky mezer" - -#: diffuse:832 -msgid "Ignore blank line differences" -msgstr "Ignorovat prázdné řádky" - -#: diffuse:833 -msgid "Ignore end of line differences" -msgstr "Ignorovat znaky konce řádku" - -#: diffuse:835 -msgid "Alignment" -msgstr "Zarovnání" - -#: diffuse:837 -msgid "Ignore case" -msgstr "Ignorovat velikost písmen" - -#: diffuse:838 -msgid "Ignore white space" -msgstr "Ignorovat netisknutelné znaky" - -#: diffuse:840 -msgid "Ignore blank lines" -msgstr "Ignorovat prázdné řádky" - -#: diffuse:841 -msgid "Ignore end of line characters" -msgstr "Ignorovat znaky konce řádku" - -#: diffuse:843 -msgid "Editor" -msgstr "Editor" - -#: diffuse:845 -msgid "Auto indent" -msgstr "Automaticky odsazovat" - -#: diffuse:846 -msgid "Expand tabs to spaces" -msgstr "Nahradit tabulátory mezerami" - -#: diffuse:847 -msgid "Soft tab width" -msgstr "Šířka tabulátoru" - -#: diffuse:849 -msgid "Tabs" -msgstr "Panely" - -#: diffuse:851 -msgid "Default panes" -msgstr "Výchozí počet podoken" - -#: diffuse:852 -msgid "Always show the tab bar" -msgstr "Vždy zobrazovat lištu s panely" - -#: diffuse:853 +#: ../src/usr/bin/diffuse:861 #, python-format msgid "Warn me when closing a tab will quit %s" msgstr "Zobrazit upozornění, pokud zavření panelu ukončí %s" -#: diffuse:855 -msgid "Regional Settings" -msgstr "Místní nastavení" - -#: diffuse:857 -msgid "Default codec" -msgstr "Výchozí kódování" - -#: diffuse:858 -msgid "Order of codecs used to identify encoding" -msgstr "Pořadí kodeků pro rozpoznání kódování" - -#: diffuse:878 -msgid "Cygwin" -msgstr "Cygwin" - -#: diffuse:880 -msgid "Root directory" -msgstr "Kořenový adresář" - -#: diffuse:881 -msgid "Cygdrive prefix" -msgstr "Předpona cygdrive" - -#: diffuse:901 -msgid "\"co\" command" -msgstr "příkaz \"co\"" - -#: diffuse:902 -msgid "\"rlog\" command" -msgstr "příkaz \"rlog\"" - -#: diffuse:904 -msgid "Command" -msgstr "Příkaz" - -#: diffuse:906 -msgid "Launch from a Bash login shell" -msgstr "Spustit z příkazové řádky terminálu Bash" - -#: diffuse:908 -msgid "Update paths for Cygwin" -msgstr "Upravit cesty pro Cygwin" - -#: diffuse:911 -msgid "Version Control" -msgstr "Správa verzí" - -#: diffuse:975 -msgid "Preferences" -msgstr "Předvolby" - -#: diffuse:1013 diffuse:7276 -#, python-format -msgid "Error writing %s." -msgstr "Při ukládání %s došlo k chybě." - -#: diffuse:1630 diffuse:2193 diffuse:2321 -#, python-format -msgid "Error parsing revision %s." -msgstr "Při analýze revize %s došlo k chybě." - -#: diffuse:2528 -#, python-format -msgid "Error parsing %s." -msgstr "Při analýze %s došlo k chybě." - -#: diffuse:4737 -msgid "Align with Selection" -msgstr "Zarovnat s výběrem" - -#: diffuse:4738 -msgid "Isolate" -msgstr "Izolovat" - -#: diffuse:4739 -msgid "Merge Selection" -msgstr "Sloučit výběr" - -#: diffuse:4741 diffuse:7563 -msgid "Cut" -msgstr "Vyjmout" - -#: diffuse:4742 diffuse:7564 -msgid "Copy" -msgstr "Kopírovat" - -#: diffuse:4743 diffuse:7565 -msgid "Paste" -msgstr "Vložit" - -#: diffuse:4745 -msgid "Select All" -msgstr "Vybrat vše" - -#: diffuse:4746 diffuse:7566 -msgid "Clear Edits" -msgstr "Smazat úpravy" - -#: diffuse:4748 -msgid "Swap with Selected Pane" -msgstr "Prohodit s vybraným podoknem" - -#: diffuse:6597 -msgid "Find..." -msgstr "Najít..." - -#: diffuse:6603 -msgid "Search For: " -msgstr "Vyhledat: " - -#: diffuse:6628 -msgid "Match Case" -msgstr "Rozlišovat velikost písmen" - -#: diffuse:6633 -msgid "Search Backwards" -msgstr "Hledat od konce" - -#: diffuse:6647 -#, python-format -msgid "Closing this tab will quit %s." -msgstr "Zavřením tohoto panelu ukončíte %s." - -#: diffuse:6659 -msgid "Encoding: " -msgstr "Kódování: " - -#: diffuse:6669 -msgid "Revision: " -msgstr "Revize: " - -#: diffuse:6733 -msgid "Diffuse is a graphical tool for merging and comparing text files." -msgstr "" -"Diffuse je grafický nástroj pro slučování a porovnávání textových souborů." - -#: diffuse:6736 -msgid "Derrick Moser " -msgstr "Derrick Moser " - -#: diffuse:6737 -msgid "translator-credits" -msgstr "Jindřich Šesták " - -#: diffuse:6740 -msgid "" -"This program is free software; you can redistribute it and/or modify it " -"under the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the licence, or (at your option) " -"any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful, but WITHOUT " -"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " -"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for " -"more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along with " -"this program. You may also obtain a copy of the GNU General Public License " -"from the Free Software Foundation by visiting their web site (http://www.fsf." -"org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, " -"Fifth Floor, Boston, MA 02110-1301 USA\n" -msgstr "" -"Tento program je svobodný software. Můžete ho upravovat a distribuovat za " -"podmínky dodržení pravidel licence GNU General Public License verze 2 (dále " -"jen GPL), nebo (pokud chcete) některé z jejích novějších verzí.\n" -"\n" -"Tento program je distribuován v naději, že bude užitečný, ale BEZ JAKÉKOLIV " -"ZÁRUKY, tedy ani implicitní záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO " -"URČITÝ ÚČEL. Další podrobnosti získáte přečtením GPL.\n" -"\n" -"Spolu s tímto programem by jste měli obdržet i kopii GPL. GPL můžete také " -"získat na domovských stránkách Free Software Foundation (http://www.fsf." -"org/), nebo můžete zaslat dopis na adresu Free Software Foundation, Inc., 51 " -"Franclin St, Fifth Floor, Boston, MA 02110-1301 USA\n" - -#: diffuse:6774 -msgid "Close Tab" -msgstr "Zavřít panel" - -#: diffuse:6829 -msgid "Open File..." -msgstr "Otevřít soubor..." - -#: diffuse:6830 -msgid "Reload File" -msgstr "Znovu načíst soubor" - -#: diffuse:6831 -msgid "Save File" -msgstr "Uložit soubor" - -#: diffuse:6832 -msgid "Save File As..." -msgstr "Uložit soubor jako..." - -#: diffuse:6912 -#, python-format -msgid "Column %d" -msgstr "Sloupec %d" - -#: diffuse:6977 -msgid "Save changes before loading the new file?" -msgstr "Uložit změny před načtením nového souboru?" - -#: diffuse:7105 -#, python-format -msgid "Error reading revision %(rev)s of %(file)s." -msgstr "Při čtení revize %(rev)s souboru %(file)s došlo k chybě." - -#: diffuse:7107 diffuse:8322 -#, python-format -msgid "Error reading %s." -msgstr "Při čtení souboru %s došlo k chybě." - -#: diffuse:7130 -msgid "Open File" -msgstr "Otevřít soubor" - -#: diffuse:7180 -#, python-format -msgid "The file %s changed on disk. Do you want to reload the file?" -msgstr "Soubor %s byl změněn. Chcete ho znovu načíst?" - -#: diffuse:7200 -#, python-format -msgid "Save %(title)s Pane %(pane)d" -msgstr "Uložit podokno %(pane)d %(title)s" - -#: diffuse:7226 -#, python-format -msgid "A file named %s already exists. Do you want to overwrite it?" -msgstr "Soubor s názvem %s již existuje. Chcete ho přepsat?" - -#: diffuse:7231 -#, python-format -msgid "" -"The file %s has been modified by another process since reading it. If you " -"save, all the external changes could be lost. Save anyways?" -msgstr "" -"Soubor %s byl od načtení změněn jiným procesem. Pokud ho nyní uložíte, změny " -"provedené tímto externím procesem mohou být ztraceny. Chcete ho přesto " -"uložit?" - -#: diffuse:7272 -#, python-format -msgid "Error encoding to %s." -msgstr "Při změně kódování do %s došlo k chybě." - -#: diffuse:7306 -msgid "Go To Line..." -msgstr "Přejít na řádek..." - -#: diffuse:7306 -msgid "Line Number: " -msgstr "Řádek číslo: " - -#: diffuse:7332 -msgid "" -"Press the enter key or double click to edit. Press the space bar or use the " -"RMB menu to manually align." -msgstr "" -"Pro aktivaci úprav stiskněte klávesu Enter, nebo na řádek dvakrát klikněte " -"myší. Pro ruční zarovnání stiskněte Mezerník, nebo použijte místní nabídku " -"dostupnou po kliknutí pravým tlačítkem myši." - -#: diffuse:7334 -msgid "Press the escape key to finish editing." -msgstr "Editaci ukončíte pomocí klávesy escape." - -#: diffuse:7336 -msgid "" -"Select target line and press the space bar to align. Press the escape key " -"to cancel." -msgstr "" -"Vyberte cílový řádek a proveďte zarovnání stisknutím klávesy Mezerník. Pro " -"zrušení stiskněte klávesu Escape." - -#: diffuse:7436 -msgid "_File" -msgstr "_Soubor" - -#: diffuse:7437 -msgid "_Open File..." -msgstr "_Otevřít soubor..." - -#: diffuse:7438 -msgid "Open File In New _Tab..." -msgstr "Otevřít soubor v novém _panelu..." - -#: diffuse:7439 -msgid "Open _Modified Files..." -msgstr "Otevřít změněné soubory..." - -#: diffuse:7440 -msgid "Open Commi_t..." -msgstr "Otevřít _revizi..." - -#: diffuse:7441 -msgid "_Reload File" -msgstr "_Znovu načíst soubor" - -#: diffuse:7443 -msgid "_Save File" -msgstr "_Uložit soubor" - -#: diffuse:7444 -msgid "Save File _As..." -msgstr "Uložit soubor ­_jako..." - -#: diffuse:7445 -msgid "Save A_ll" -msgstr "Uložit _vše" - -#: diffuse:7447 -msgid "New _2-Way File Merge" -msgstr "Nové _2směrné slučování" - -#: diffuse:7448 -msgid "New _3-Way File Merge" -msgstr "Nové _3směrné slučování" - -#: diffuse:7449 -msgid "New _N-Way File Merge..." -msgstr "Nové _Nsměrné slučování" - -#: diffuse:7451 -msgid "_Close Tab" -msgstr "_Zavřít panel" - -#: diffuse:7452 -msgid "_Undo Close Tab" -msgstr "_Obnovit zavřený panel" - -#: diffuse:7453 -msgid "_Quit" -msgstr "Kone_c" - -#: diffuse:7455 -msgid "_Edit" -msgstr "Úpr_avy" - -#: diffuse:7456 -msgid "_Undo" -msgstr "_Zpět" - -#: diffuse:7457 -msgid "_Redo" -msgstr "Z_novu" - -#: diffuse:7459 -msgid "Cu_t" -msgstr "_Vyjmout" - -#: diffuse:7460 -msgid "_Copy" -msgstr "_Kopírovat" - -#: diffuse:7461 -msgid "_Paste" -msgstr "V_ložit" - -#: diffuse:7463 -msgid "Select _All" -msgstr "V_ybrat vše" - -#: diffuse:7464 -msgid "C_lear Edits" -msgstr "_Smazat úpravy" - -#: diffuse:7465 -msgid "_Dismiss All Edits" -msgstr "Z_rušit všechny úpravy" - -#: diffuse:7467 -msgid "_Find..." -msgstr "_Najít" - -#: diffuse:7468 -msgid "Find _Next" -msgstr "Najít _další" - -#: diffuse:7469 -msgid "Find Pre_vious" -msgstr "Najít _předchozí" - -#: diffuse:7470 -msgid "_Go To Line..." -msgstr "Pře_jít na řádek..." - -#: diffuse:7472 -msgid "Pr_eferences..." -msgstr "Př_edvolby..." - -#: diffuse:7474 -msgid "None" -msgstr "Nic" - -#: diffuse:7482 -msgid "_View" -msgstr "_Zobrazit" - -#: diffuse:7483 -msgid "_Syntax Highlighting" -msgstr "Zvýraznění _syntaxe" - -#: diffuse:7485 -msgid "Re_align All" -msgstr "Znovu _zarovnat" - -#: diffuse:7486 -msgid "_Isolate" -msgstr "_Izolovat" - -#: diffuse:7488 -msgid "_First Difference" -msgstr "Pr_vní rozdíl" - -#: diffuse:7489 -msgid "_Previous Difference" -msgstr "_Předchozí rozdíl" - -#: diffuse:7490 -msgid "_Next Difference" -msgstr "_Další rozdíl" - -#: diffuse:7491 -msgid "_Last Difference" -msgstr "P_oslední rozdíl" - -#: diffuse:7493 -msgid "Fir_st Tab" -msgstr "Prv_ní panel" - -#: diffuse:7494 -msgid "Pre_vious Tab" -msgstr "Předch_ozí panel" - -#: diffuse:7495 -msgid "Next _Tab" -msgstr "D_alší panel" - -#: diffuse:7496 -msgid "Las_t Tab" -msgstr "Posl_ední panel" - -#: diffuse:7498 -msgid "Shift Pane _Right" -msgstr "Přesunout podokno dop_rava" - -#: diffuse:7499 -msgid "Shift Pane _Left" -msgstr "Přesunout podokno do_leva" - -#: diffuse:7501 -msgid "F_ormat" -msgstr "F_ormát" - -#: diffuse:7502 -msgid "Convert To _Upper Case" -msgstr "Převést na _velká písmena" - -#: diffuse:7503 -msgid "Convert To _Lower Case" -msgstr "Převést na _malá písmena" - -#: diffuse:7505 -msgid "Sort Lines In _Ascending Order" -msgstr "Seřadit řádky v_zestupně" - -#: diffuse:7506 -msgid "Sort Lines In D_escending Order" -msgstr "Seřadit řádky _sestupně" - -#: diffuse:7508 -msgid "Remove Trailing _White Space" -msgstr "_Odstranit mezery na koncích řádků" - -#: diffuse:7509 -msgid "Convert Tabs To _Spaces" -msgstr "_Nahradit tabulátory mezerami" - -#: diffuse:7510 -msgid "Convert Leading Spaces To _Tabs" -msgstr "Nah_radit úvodní mezery tabulátory" - -#: diffuse:7512 -msgid "_Increase Indenting" -msgstr "Zvětš_it odsazení" - -#: diffuse:7513 -msgid "De_crease Indenting" -msgstr "Zmenši_t odsazení" - -#: diffuse:7515 -msgid "Convert To _DOS Format" -msgstr "Převést na _DOS formát" - -#: diffuse:7516 -msgid "Convert To _Mac Format" -msgstr "Převést na Ma_c formát" - -#: diffuse:7517 -msgid "Convert To Uni_x Format" -msgstr "Převést na Uni_x formát" - -#: diffuse:7519 -msgid "_Merge" -msgstr "S_loučit" - -#: diffuse:7520 -msgid "Copy Selection _Right" -msgstr "_Kopírovat výběr doprava" - -#: diffuse:7521 -msgid "Copy Selection _Left" -msgstr "K_opírovat výběr doleva" - -#: diffuse:7523 -msgid "Copy Left _Into Selection" -msgstr "Ko_pírovat zleva do výběru" - -#: diffuse:7524 -msgid "Copy Right I_nto Selection" -msgstr "Kopí_rovat zprava do výběru" - -#: diffuse:7525 -msgid "_Merge From Left Then Right" -msgstr "_Sloučit zleva a poté zprava" - -#: diffuse:7526 -msgid "M_erge From Right Then Left" -msgstr "S_loučit zprava a poté zleva" - -#: diffuse:7528 -msgid "_Help" -msgstr "Nápo_věda" - -#: diffuse:7529 -msgid "_Help Contents..." -msgstr "_Zobrazit nápovědu" - -#: diffuse:7531 +#: ../src/usr/bin/diffuse:7618 #, python-format msgid "_About %s..." msgstr "_O programu %s..." -#: diffuse:7545 -msgid "New 2-Way File Merge" -msgstr "Nové 2směrné slučování" +#: ../src/usr/bin/diffuse:7538 +msgid "_Close Tab" +msgstr "_Zavřít panel" -#: diffuse:7546 -msgid "New 3-Way File Merge" -msgstr "Nové 3směrné slučování" +#: ../src/usr/bin/diffuse:7547 +msgid "_Copy" +msgstr "_Kopírovat" -#: diffuse:7548 -msgid "Realign All" -msgstr "Znovu zarovnat" +#: ../src/usr/bin/diffuse:7552 +msgid "_Dismiss All Edits" +msgstr "Z_rušit všechny úpravy" -#: diffuse:7549 -msgid "First Difference" -msgstr "První rozdíl" +#: ../src/usr/bin/diffuse:7542 +msgid "_Edit" +msgstr "Úpr_avy" -#: diffuse:7550 -msgid "Previous Difference" -msgstr "Předchozí rozdíl" +#: ../src/usr/bin/diffuse:7523 +msgid "_File" +msgstr "_Soubor" -#: diffuse:7551 -msgid "Next Difference" -msgstr "Další rozdíl" +#: ../src/usr/bin/diffuse:7554 +msgid "_Find..." +msgstr "_Najít" -#: diffuse:7552 -msgid "Last Difference" -msgstr "Poslední rozdíl" +#: ../src/usr/bin/diffuse:7575 +msgid "_First Difference" +msgstr "Pr_vní rozdíl" -#: diffuse:7554 -msgid "Copy Selection Right" -msgstr "Kopírovat výběr doprava" +#: ../src/usr/bin/diffuse:7557 +msgid "_Go To Line..." +msgstr "Pře_jít na řádek..." -#: diffuse:7555 -msgid "Copy Selection Left" -msgstr "Kopírovat výběr doleva" +#: ../src/usr/bin/diffuse:7615 +msgid "_Help" +msgstr "Nápo_věda" -#: diffuse:7556 -msgid "Copy Left Into Selection" -msgstr "Kopírovat zleva do výběru" +#: ../src/usr/bin/diffuse:7616 +msgid "_Help Contents..." +msgstr "_Zobrazit nápovědu" -#: diffuse:7557 -msgid "Copy Right Into Selection" -msgstr "Kopírovat zprava do výběru" +#: ../src/usr/bin/diffuse:7599 +msgid "_Increase Indenting" +msgstr "Zvětš_it odsazení" -#: diffuse:7558 -msgid "Merge From Left Then Right" -msgstr "Sloučit zleva a poté zprava" +#: ../src/usr/bin/diffuse:7573 +msgid "_Isolate" +msgstr "_Izolovat" -#: diffuse:7559 -msgid "Merge From Right Then Left" -msgstr "Sloučit zprava a poté zleva" +#: ../src/usr/bin/diffuse:7578 +msgid "_Last Difference" +msgstr "P_oslední rozdíl" -#: diffuse:7561 -msgid "Undo" -msgstr "Zpět" +#: ../src/usr/bin/diffuse:7606 +msgid "_Merge" +msgstr "S_loučit" -#: diffuse:7562 -msgid "Redo" -msgstr "Znovu" +#: ../src/usr/bin/diffuse:7612 +msgid "_Merge From Left Then Right" +msgstr "_Sloučit zleva a poté zprava" -#: diffuse:7678 -msgid "" -"Some files have unsaved changes. Select the files to save before closing." -msgstr "" -"Některé změněné soubory nebyly uloženy. Vyberte soubory, které chcete před " -"zavřením uložit." +#: ../src/usr/bin/diffuse:7577 +msgid "_Next Difference" +msgstr "_Další rozdíl" -#: diffuse:7691 -msgid "Tab" -msgstr "Panel" +#: ../src/usr/bin/diffuse:7524 +msgid "_Open File..." +msgstr "_Otevřít soubor..." -#: diffuse:7696 -msgid "Pane" -msgstr "Podokno" +#: ../src/usr/bin/diffuse:7548 +msgid "_Paste" +msgstr "V_ložit" -#: diffuse:7707 -msgid "Close _Without Saving" -msgstr "Zavřít _bez uložení" +#: ../src/usr/bin/diffuse:7576 +msgid "_Previous Difference" +msgstr "_Předchozí rozdíl" + +#: ../src/usr/bin/diffuse:7540 +msgid "_Quit" +msgstr "Kone_c" + +#: ../src/usr/bin/diffuse:7544 +msgid "_Redo" +msgstr "Z_novu" + +#: ../src/usr/bin/diffuse:7528 +msgid "_Reload File" +msgstr "_Znovu načíst soubor" + +#: ../src/usr/bin/diffuse:7530 +msgid "_Save File" +msgstr "_Uložit soubor" + +#: ../src/usr/bin/diffuse:7570 +msgid "_Syntax Highlighting" +msgstr "Zvýraznění _syntaxe" + +#: ../src/usr/bin/diffuse:7543 +msgid "_Undo" +msgstr "_Zpět" + +#: ../src/usr/bin/diffuse:7539 +msgid "_Undo Close Tab" +msgstr "_Obnovit zavřený panel" + +#: ../src/usr/bin/diffuse:7569 +msgid "_View" +msgstr "_Zobrazit" + +#: ../src/usr/bin/diffuse:6815 +msgid "translator-credits" +msgstr "Jindřich Šesták " -#: diffuse:7818 #, python-format -msgid "File Merge %d" -msgstr "Slučování %d" - -#: diffuse:7921 -#, python-format -msgid "Error retrieving commits for %s." -msgstr "Revize pro %s se nepodařilo načíst." - -#: diffuse:7952 -#, python-format -msgid "Error retrieving modifications for %s." -msgstr "Při načítání změn %s došlo k chybě." - -#: diffuse:7985 -msgid "Open File In New Tab" -msgstr "Otevřít soubor v novém panelu" - -#: diffuse:8001 -msgid "Choose Folder With Modified Files" -msgstr "Vyberte adresář se změněnými soubory" - -#: diffuse:8014 -msgid "No modified files found." -msgstr "Nebyly nalezeny žádné změněné soubory." - -#: diffuse:8021 -msgid "Choose Folder With Commit" -msgstr "Vyberte adresář se zapsanou revizí" - -#: diffuse:8034 -msgid "No committed files found." -msgstr "Nebyly nalezeny žádné zapsané soubory." - -#: diffuse:8070 -msgid "New N-Way File Merge..." -msgstr "Nové Nsměrné slučování" - -#: diffuse:8070 -msgid "Number of panes: " -msgstr "Počet podoken: " - -#: diffuse:8135 -msgid "Phrase not found. Continue from the end of the file?" -msgstr "Hledaný výraz nebyl nalezen. Pokračovat v hledání od konce souboru?" - -#: diffuse:8137 -msgid "Phrase not found. Continue from the start of the file?" -msgstr "Hledaný výraz nebyl nalezen. Pokračovat v hledání od začátku souboru?" - -#: diffuse:8399 -msgid "Error parsing line number." -msgstr "Při analýze čísla řádku došlo k chybě." - -#: diffuse:8409 -#, python-format -msgid "Skipping unknown argument \"%s\"." -msgstr "Ignorován neznámý parametr \"%s\"." - -#: diffuse:8416 -#, python-format -msgid "Error processing argument \"%s\". Directory not expected." -msgstr "Při zpracování parametru \"%s\" došlo k chybě. Adresář nebyl očekáván." +#~ msgid "Column %d" +#~ msgstr "Sloupec %d" diff --git a/translations/de.po b/translations/de.po index f1466bb..946e748 100644 --- a/translations/de.po +++ b/translations/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-20 14:57+0200\n" -"PO-Revision-Date: \n" +"POT-Creation-Date: 2020-06-29 14:49-0400\n" +"PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Henri Menke \n" "Language-Team: German \n" "Language: de\n" @@ -21,640 +21,621 @@ msgstr "" "X-Poedit-Country: GERMANY\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../src/usr/bin/diffuse:901 +#: ../src/usr/bin/diffuse:911 msgid "\"co\" command" msgstr "\"co\" Befehl" -#: ../src/usr/bin/diffuse:902 +#: ../src/usr/bin/diffuse:912 msgid "\"rlog\" command" msgstr "\"rlog\" Befehl" -#: ../src/usr/bin/diffuse:7226 +#: ../src/usr/bin/diffuse:7305 #, python-format msgid "A file named %s already exists. Do you want to overwrite it?" msgstr "Eine Datei mit dem Namen %s existiert bereits. Überschreiben?" -#: ../src/usr/bin/diffuse:4737 +#: ../src/usr/bin/diffuse:4820 msgid "Align with Selection" msgstr "Ausrichten an der Auswahl" -#: ../src/usr/bin/diffuse:835 +#: ../src/usr/bin/diffuse:843 msgid "Alignment" msgstr "Ausrichtung" -#: ../src/usr/bin/diffuse:852 +#: ../src/usr/bin/diffuse:860 msgid "Always show the tab bar" msgstr "Reiter-Leiste immer anzeigen" -#: ../src/usr/bin/diffuse:725 +#: ../src/usr/bin/diffuse:733 msgid "Auto Detect" msgstr "Automatische Erkennung" -#: ../src/usr/bin/diffuse:845 +#: ../src/usr/bin/diffuse:853 msgid "Auto indent" msgstr "Automatischer Einzug" -#: ../src/usr/bin/diffuse:7464 +#: ../src/usr/bin/diffuse:7551 msgid "C_lear Edits" msgstr "Alle _Änderungen rückgängig" -#: ../src/usr/bin/diffuse:8021 +#: ../src/usr/bin/diffuse:8116 msgid "Choose Folder With Commit" msgstr "Ordner mit Revisionen auswählen" -#: ../src/usr/bin/diffuse:8001 +#: ../src/usr/bin/diffuse:8096 msgid "Choose Folder With Modified Files" msgstr "Ordner mit bearbeiteten Dateien auswählen" -#: ../src/usr/bin/diffuse:4746 -#: ../src/usr/bin/diffuse:7566 +#: ../src/usr/bin/diffuse:4829 ../src/usr/bin/diffuse:7653 msgid "Clear Edits" msgstr "Alle Änderungen rückgängig" -#: ../src/usr/bin/diffuse:6774 +#: ../src/usr/bin/diffuse:6853 msgid "Close Tab" msgstr "Reiter schließen" -#: ../src/usr/bin/diffuse:7707 +#: ../src/usr/bin/diffuse:7802 msgid "Close _Without Saving" msgstr "Ohne speichern schließen" -#: ../src/usr/bin/diffuse:6647 +#: ../src/usr/bin/diffuse:6714 #, python-format msgid "Closing this tab will quit %s." msgstr "Schließen des letzten Tabs beendet %s." -#: ../src/usr/bin/diffuse:6912 -#, python-format -msgid "Column %d" -msgstr "Spalte %d" - -#: ../src/usr/bin/diffuse:904 +#: ../src/usr/bin/diffuse:914 msgid "Command" msgstr "Befehl" -#: ../src/usr/bin/diffuse:7510 +#: ../src/usr/bin/diffuse:7597 msgid "Convert Leading Spaces To _Tabs" msgstr "Vorangestellte Leerzeichen in _Tabulatoren konvertieren" -#: ../src/usr/bin/diffuse:7509 +#: ../src/usr/bin/diffuse:7596 msgid "Convert Tabs To _Spaces" msgstr "Tabulatoren in Leer_zeichen konvertieren" -#: ../src/usr/bin/diffuse:7517 +#: ../src/usr/bin/diffuse:7604 msgid "Convert To Uni_x Format" msgstr "Ins Uni_x Format konvertieren" -#: ../src/usr/bin/diffuse:7515 +#: ../src/usr/bin/diffuse:7602 msgid "Convert To _DOS Format" msgstr "Ins _DOS Format konvertieren" -#: ../src/usr/bin/diffuse:7503 +#: ../src/usr/bin/diffuse:7590 msgid "Convert To _Lower Case" msgstr "In K_leinbuchstaben konvertieren" -#: ../src/usr/bin/diffuse:7516 +#: ../src/usr/bin/diffuse:7603 msgid "Convert To _Mac Format" msgstr "Ins _Mac Format konvertieren" -#: ../src/usr/bin/diffuse:7502 +#: ../src/usr/bin/diffuse:7589 msgid "Convert To _Upper Case" msgstr "In Großb_uchstaben konvertieren" -#: ../src/usr/bin/diffuse:4742 -#: ../src/usr/bin/diffuse:7564 +#: ../src/usr/bin/diffuse:4825 ../src/usr/bin/diffuse:7651 msgid "Copy" msgstr "Kopieren" -#: ../src/usr/bin/diffuse:7556 +#: ../src/usr/bin/diffuse:7643 msgid "Copy Left Into Selection" msgstr "Von links in die Auswahl kopieren" -#: ../src/usr/bin/diffuse:7523 +#: ../src/usr/bin/diffuse:7610 msgid "Copy Left _Into Selection" msgstr "Von links _in die Auswahl kopieren" -#: ../src/usr/bin/diffuse:7524 +#: ../src/usr/bin/diffuse:7611 msgid "Copy Right I_nto Selection" msgstr "Von rechts i_n die Auswahl kopieren" -#: ../src/usr/bin/diffuse:7557 +#: ../src/usr/bin/diffuse:7644 msgid "Copy Right Into Selection" msgstr "Von rechts in die Auswahl kopieren" -#: ../src/usr/bin/diffuse:7555 +#: ../src/usr/bin/diffuse:7642 msgid "Copy Selection Left" msgstr "Auswahl nach links kopieren" -#: ../src/usr/bin/diffuse:7554 +#: ../src/usr/bin/diffuse:7641 msgid "Copy Selection Right" msgstr "Auswahl nach rechts kopieren" -#: ../src/usr/bin/diffuse:7521 +#: ../src/usr/bin/diffuse:7608 msgid "Copy Selection _Left" msgstr "Auswahl nach _links kopieren" -#: ../src/usr/bin/diffuse:7520 +#: ../src/usr/bin/diffuse:7607 msgid "Copy Selection _Right" msgstr "Auswahl nach _rechts kopieren" -#: ../src/usr/bin/diffuse:68 -msgid "Copyright © 2006-2019 Derrick Moser" -"Copyright © 2015-2020 Romain Failliot" -msgstr "Copyright © 2006-2019 Derrick Moser" -"Copyright © 2015-2020 Romain Failliot" +#: ../src/usr/bin/diffuse:70 +msgid "Copyright" +msgstr "" -#: ../src/usr/bin/diffuse:7459 +#: ../src/usr/bin/diffuse:7546 msgid "Cu_t" msgstr "_Ausschneiden" -#: ../src/usr/bin/diffuse:4741 -#: ../src/usr/bin/diffuse:7563 +#: ../src/usr/bin/diffuse:4824 ../src/usr/bin/diffuse:7650 msgid "Cut" msgstr "Ausschneiden" -#: ../src/usr/bin/diffuse:881 +#: ../src/usr/bin/diffuse:889 msgid "Cygdrive prefix" msgstr "Cygdrive Präfix" -#: ../src/usr/bin/diffuse:878 +#: ../src/usr/bin/diffuse:886 msgid "Cygwin" msgstr "Cygwin" -#: ../src/usr/bin/diffuse:7513 +#: ../src/usr/bin/diffuse:7600 msgid "De_crease Indenting" msgstr "Einzug _vermindern" -#: ../src/usr/bin/diffuse:857 +#: ../src/usr/bin/diffuse:865 msgid "Default codec" msgstr "Standardkodierung" -#: ../src/usr/bin/diffuse:851 +#: ../src/usr/bin/diffuse:859 msgid "Default panes" msgstr "Standard Fenster" -#: ../src/usr/bin/diffuse:6736 -msgid "Derrick Moser " -msgstr "Derrick Moser " - -#: ../src/usr/bin/diffuse:6733 +#: ../src/usr/bin/diffuse:6810 msgid "Diffuse is a graphical tool for merging and comparing text files." msgstr "Diffuse ist ein graphisches Werkzeug zum Zusammenführen und Vergleichen von Textdateien." -#: ../src/usr/bin/diffuse:821 +#: ../src/usr/bin/diffuse:829 msgid "Display" msgstr "Anzeige" -#: ../src/usr/bin/diffuse:843 +#: ../src/usr/bin/diffuse:851 msgid "Editor" msgstr "Editor" -#: ../src/usr/bin/diffuse:6659 +#: ../src/usr/bin/diffuse:6736 msgid "Encoding: " msgstr "Kodierung: " -#: ../src/usr/bin/diffuse:7272 +#: ../src/usr/bin/diffuse:7351 #, python-format msgid "Error encoding to %s." msgstr "Fehler bei der Kodierung nach %s." -#: ../src/usr/bin/diffuse:2528 +#: ../src/usr/bin/diffuse:2657 #, python-format msgid "Error parsing %s." msgstr "Fehler bei der Analyse %s." -#: ../src/usr/bin/diffuse:8399 +#: ../src/usr/bin/diffuse:8498 msgid "Error parsing line number." msgstr "Fehler bei der Analyse der Zeilennummer." -#: ../src/usr/bin/diffuse:1630 -#: ../src/usr/bin/diffuse:2193 -#: ../src/usr/bin/diffuse:2321 +#: ../src/usr/bin/diffuse:1655 ../src/usr/bin/diffuse:2272 +#: ../src/usr/bin/diffuse:2416 #, python-format msgid "Error parsing revision %s." msgstr "Fehler bei der Analyse der Revision %s." -#: ../src/usr/bin/diffuse:8416 +#: ../src/usr/bin/diffuse:8515 #, python-format msgid "Error processing argument \"%s\". Directory not expected." msgstr "Fehler beim Verarbeiten des Arguments \"%s\". Unerwartetes Verzeichnis." -#: ../src/usr/bin/diffuse:706 +#: ../src/usr/bin/diffuse:714 #, python-format msgid "Error processing line %(line)d of %(file)s." msgstr "Fehler bei der Analyse der Zeilen %(line)d von %(file)s." -#: ../src/usr/bin/diffuse:7107 -#: ../src/usr/bin/diffuse:8322 +#: ../src/usr/bin/diffuse:7186 ../src/usr/bin/diffuse:8417 #, python-format msgid "Error reading %s." msgstr "Fehler beim Lesen von %s." -#: ../src/usr/bin/diffuse:7105 +#: ../src/usr/bin/diffuse:7184 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "Fehler beim lesen der Revision %(rev)s von %(file)s." -#: ../src/usr/bin/diffuse:7921 +#: ../src/usr/bin/diffuse:8016 #, python-format msgid "Error retrieving commits for %s." msgstr "Fehler beim Empfangen der Revisionen von %s." -#: ../src/usr/bin/diffuse:7952 +#: ../src/usr/bin/diffuse:8047 #, python-format msgid "Error retrieving modifications for %s." msgstr "Fehler beim Empfangen der Bearbeitungen von %s." -#: ../src/usr/bin/diffuse:1013 -#: ../src/usr/bin/diffuse:7276 +#: ../src/usr/bin/diffuse:1026 ../src/usr/bin/diffuse:7355 #, python-format msgid "Error writing %s." msgstr "Fehler beim Schreiben von %s." -#: ../src/usr/bin/diffuse:846 +#: ../src/usr/bin/diffuse:854 msgid "Expand tabs to spaces" msgstr "Tabulatoren zu Leerzeichen erweitern" -#: ../src/usr/bin/diffuse:7501 +#: ../src/usr/bin/diffuse:7588 msgid "F_ormat" msgstr "F_ormat" -#: ../src/usr/bin/diffuse:7818 +#: ../src/usr/bin/diffuse:7913 #, python-format msgid "File Merge %d" msgstr "Dateien zusammenführen %d" -#: ../src/usr/bin/diffuse:7469 +#: ../src/usr/bin/diffuse:7556 msgid "Find Pre_vious" msgstr "_Rückwärts suchen" -#: ../src/usr/bin/diffuse:7468 +#: ../src/usr/bin/diffuse:7555 msgid "Find _Next" msgstr "_Nächstes suchen" -#: ../src/usr/bin/diffuse:6597 +#: ../src/usr/bin/diffuse:6662 msgid "Find..." msgstr "Suchen..." -#: ../src/usr/bin/diffuse:7493 +#: ../src/usr/bin/diffuse:7580 msgid "Fir_st Tab" msgstr "Er_ster Reiter" -#: ../src/usr/bin/diffuse:7549 +#: ../src/usr/bin/diffuse:7636 msgid "First Difference" msgstr "Erster Unterschied" -#: ../src/usr/bin/diffuse:823 +#: ../src/usr/bin/diffuse:831 msgid "Font" msgstr "Schriftart" -#: ../src/usr/bin/diffuse:7306 +#: ../src/usr/bin/diffuse:7385 msgid "Go To Line..." msgstr "Gehe zu Zeile..." -#: ../src/usr/bin/diffuse:832 +#: ../src/usr/bin/diffuse:840 msgid "Ignore blank line differences" msgstr "Unterschiede bei leeren Zeilen ignorieren" -#: ../src/usr/bin/diffuse:840 +#: ../src/usr/bin/diffuse:848 msgid "Ignore blank lines" msgstr "Leere Zeilen ignorieren" -#: ../src/usr/bin/diffuse:837 +#: ../src/usr/bin/diffuse:845 msgid "Ignore case" msgstr "Groß- und Kleinschreibung ignorieren" -#: ../src/usr/bin/diffuse:829 +#: ../src/usr/bin/diffuse:837 msgid "Ignore case differences" msgstr "Unterschiede bei Groß- und Kleinschreibung ignorieren" -#: ../src/usr/bin/diffuse:831 -#: ../src/usr/bin/diffuse:839 +#: ../src/usr/bin/diffuse:839 ../src/usr/bin/diffuse:847 msgid "Ignore changes to white space" msgstr "Änderungen an Leerzeichen ignorieren" -#: ../src/usr/bin/diffuse:841 +#: ../src/usr/bin/diffuse:849 msgid "Ignore end of line characters" msgstr "Zeilenumbrüche ignorieren" -#: ../src/usr/bin/diffuse:833 +#: ../src/usr/bin/diffuse:841 msgid "Ignore end of line differences" msgstr "Unterschiede bei Zeilenumbrüchen ignorieren" -#: ../src/usr/bin/diffuse:838 +#: ../src/usr/bin/diffuse:846 msgid "Ignore white space" msgstr "Leerzeichen ignorieren" -#: ../src/usr/bin/diffuse:830 +#: ../src/usr/bin/diffuse:838 msgid "Ignore white space differences" msgstr "Unterschiede bei Leerzeichen ignorieren" -#: ../src/usr/bin/diffuse:4738 +#: ../src/usr/bin/diffuse:4821 msgid "Isolate" msgstr "Isolieren" -#: ../src/usr/bin/diffuse:7496 +#: ../src/usr/bin/diffuse:7583 msgid "Las_t Tab" msgstr "Letz_ter Reiter" -#: ../src/usr/bin/diffuse:7552 +#: ../src/usr/bin/diffuse:7639 msgid "Last Difference" msgstr "Letzter Unterschied" -#: ../src/usr/bin/diffuse:906 +#: ../src/usr/bin/diffuse:916 msgid "Launch from a Bash login shell" msgstr "Aus einer Bash login shell starten" -#: ../src/usr/bin/diffuse:7306 +#: ../src/usr/bin/diffuse:7385 msgid "Line Number: " msgstr "Zeilennummer: " -#: ../src/usr/bin/diffuse:7526 +#: ../src/usr/bin/diffuse:7613 msgid "M_erge From Right Then Left" msgstr "Zusammenführen von rechts, dann von links" -#: ../src/usr/bin/diffuse:6628 +#: ../src/usr/bin/diffuse:6695 msgid "Match Case" msgstr "Übereinstimmen von Groß- und Kleinschreibung" -#: ../src/usr/bin/diffuse:7558 +#: ../src/usr/bin/diffuse:7645 msgid "Merge From Left Then Right" msgstr "Zusammenführen von links, dann von rechts" -#: ../src/usr/bin/diffuse:7559 +#: ../src/usr/bin/diffuse:7646 msgid "Merge From Right Then Left" msgstr "Zusammenführen von rechts, dann von links" -#: ../src/usr/bin/diffuse:4739 +#: ../src/usr/bin/diffuse:4822 msgid "Merge Selection" msgstr "Auswahl zusammenführen" -#: ../src/usr/bin/diffuse:7545 +#: ../src/usr/bin/diffuse:7632 msgid "New 2-Way File Merge" msgstr "Neues 2-Wege-Datei-Zusammenführen" -#: ../src/usr/bin/diffuse:7546 +#: ../src/usr/bin/diffuse:7633 msgid "New 3-Way File Merge" msgstr "Neues 3-Wege-Datei-Zusammenführen" -#: ../src/usr/bin/diffuse:8070 +#: ../src/usr/bin/diffuse:8165 msgid "New N-Way File Merge..." msgstr "Neues N-Wege-Datei-Zusammenführen..." -#: ../src/usr/bin/diffuse:7447 +#: ../src/usr/bin/diffuse:7534 msgid "New _2-Way File Merge" msgstr "Neues _2-Wege-Datei-Zusammenführen" -#: ../src/usr/bin/diffuse:7448 +#: ../src/usr/bin/diffuse:7535 msgid "New _3-Way File Merge" msgstr "Neues _3-Wege-Datei-Zusammenführen" -#: ../src/usr/bin/diffuse:7449 +#: ../src/usr/bin/diffuse:7536 msgid "New _N-Way File Merge..." msgstr "Neues _N-Wege-Datei-Zusammenführen..." -#: ../src/usr/bin/diffuse:7551 +#: ../src/usr/bin/diffuse:7638 msgid "Next Difference" msgstr "Nächster Unterschied" -#: ../src/usr/bin/diffuse:7495 +#: ../src/usr/bin/diffuse:7582 msgid "Next _Tab" msgstr "N_ächster Reiter" -#: ../src/usr/bin/diffuse:8034 +#: ../src/usr/bin/diffuse:8129 msgid "No committed files found." msgstr "Keine revidierten Dateien gefunden." -#: ../src/usr/bin/diffuse:8014 +#: ../src/usr/bin/diffuse:8109 msgid "No modified files found." msgstr "Keine bearbeiteten Dateien gefunden." -#: ../src/usr/bin/diffuse:7474 +#: ../src/usr/bin/diffuse:7561 msgid "None" msgstr "Keine" -#: ../src/usr/bin/diffuse:8070 +#: ../src/usr/bin/diffuse:8165 msgid "Number of panes: " msgstr "Anzahl der Fenster: " -#: ../src/usr/bin/diffuse:7440 +#: ../src/usr/bin/diffuse:7527 msgid "Open Commi_t..." msgstr "Revi_sion öffnen..." -#: ../src/usr/bin/diffuse:7130 +#: ../src/usr/bin/diffuse:7209 msgid "Open File" msgstr "Datei öffnen" -#: ../src/usr/bin/diffuse:7985 +#: ../src/usr/bin/diffuse:8080 msgid "Open File In New Tab" msgstr "Datei in neuem Reiter öffnen" -#: ../src/usr/bin/diffuse:7438 +#: ../src/usr/bin/diffuse:7525 msgid "Open File In New _Tab..." msgstr "Datei _in neuem Reiter öffnen..." -#: ../src/usr/bin/diffuse:6829 +#: ../src/usr/bin/diffuse:6908 msgid "Open File..." msgstr "Datei öffnen..." -#: ../src/usr/bin/diffuse:7439 +#: ../src/usr/bin/diffuse:7526 msgid "Open _Modified Files..." msgstr "_Bearbeitete Dateien öffnen..." -#: ../src/usr/bin/diffuse:858 +#: ../src/usr/bin/diffuse:866 msgid "Order of codecs used to identify encoding" msgstr "Reihenfolge der Chiffren um die Kodierung zu erkennen" -#: ../src/usr/bin/diffuse:7696 +#: ../src/usr/bin/diffuse:7791 msgid "Pane" msgstr "Fenster" -#: ../src/usr/bin/diffuse:4743 -#: ../src/usr/bin/diffuse:7565 +#: ../src/usr/bin/diffuse:4826 ../src/usr/bin/diffuse:7652 msgid "Paste" msgstr "Einfügen" -#: ../src/usr/bin/diffuse:8135 +#: ../src/usr/bin/diffuse:8230 msgid "Phrase not found. Continue from the end of the file?" msgstr "Ausdruck nicht gefunden. Am Ende der Datei fortsetzen?" -#: ../src/usr/bin/diffuse:8137 +#: ../src/usr/bin/diffuse:8232 msgid "Phrase not found. Continue from the start of the file?" msgstr "Ausdruck nicht gefunden. Am Anfang der Datei fortsetzen?" -#: ../src/usr/bin/diffuse:7472 +#: ../src/usr/bin/diffuse:7559 msgid "Pr_eferences..." msgstr "_Einstellungen..." -#: ../src/usr/bin/diffuse:7494 +#: ../src/usr/bin/diffuse:7581 msgid "Pre_vious Tab" msgstr "V_origer Reiter" -#: ../src/usr/bin/diffuse:975 +#: ../src/usr/bin/diffuse:986 msgid "Preferences" msgstr "Einstellungen" -#: ../src/usr/bin/diffuse:7332 +#: ../src/usr/bin/diffuse:7411 msgid "Press the enter key or double click to edit. Press the space bar or use the RMB menu to manually align." msgstr "Enter drücken, oder Doppelklicken zum editieren. Drücken Sie die Leertaste, oder nutzen sie das RMB Menü zum manuellen Ausrichten." -#: ../src/usr/bin/diffuse:7334 +#: ../src/usr/bin/diffuse:7413 msgid "Press the escape key to finish editing." msgstr "Drücken Sie die Escape Taste um die Bearbeitung zu beenden." -#: ../src/usr/bin/diffuse:7550 +#: ../src/usr/bin/diffuse:7637 msgid "Previous Difference" msgstr "Voriger Unterschied" -#: ../src/usr/bin/diffuse:7485 +#: ../src/usr/bin/diffuse:7572 msgid "Re_align All" msgstr "Alle neu _ausrichten" -#: ../src/usr/bin/diffuse:7548 +#: ../src/usr/bin/diffuse:7635 msgid "Realign All" msgstr "Alle neu ausrichten" -#: ../src/usr/bin/diffuse:7562 +#: ../src/usr/bin/diffuse:7649 msgid "Redo" msgstr "Wiederholen" -#: ../src/usr/bin/diffuse:855 +#: ../src/usr/bin/diffuse:863 msgid "Regional Settings" msgstr "Lokalisierung" -#: ../src/usr/bin/diffuse:6830 +#: ../src/usr/bin/diffuse:6909 msgid "Reload File" msgstr "Datei neu laden" -#: ../src/usr/bin/diffuse:7508 +#: ../src/usr/bin/diffuse:7595 msgid "Remove Trailing _White Space" msgstr "Entferne angehängte _Leerzeichen" -#: ../src/usr/bin/diffuse:6669 +#: ../src/usr/bin/diffuse:6746 msgid "Revision: " msgstr "Revision: " -#: ../src/usr/bin/diffuse:826 +#: ../src/usr/bin/diffuse:834 msgid "Right margin" msgstr "Rechter Rand" -#: ../src/usr/bin/diffuse:880 +#: ../src/usr/bin/diffuse:888 msgid "Root directory" msgstr "Hauptverzeichnis" -#: ../src/usr/bin/diffuse:7200 +#: ../src/usr/bin/diffuse:7279 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "Speichern %(title)s Fenster %(pane)d" -#: ../src/usr/bin/diffuse:7445 +#: ../src/usr/bin/diffuse:7532 msgid "Save A_ll" msgstr "_Alle speichern" -#: ../src/usr/bin/diffuse:6831 +#: ../src/usr/bin/diffuse:6910 msgid "Save File" msgstr "Datei speichern" -#: ../src/usr/bin/diffuse:6832 +#: ../src/usr/bin/diffuse:6911 msgid "Save File As..." msgstr "Datei speichern unter..." -#: ../src/usr/bin/diffuse:7444 +#: ../src/usr/bin/diffuse:7531 msgid "Save File _As..." msgstr "Datei speichern _unter..." -#: ../src/usr/bin/diffuse:6977 +#: ../src/usr/bin/diffuse:7056 msgid "Save changes before loading the new file?" msgstr "Änderungen speichern vor dem Laden der neuen Datei?" -#: ../src/usr/bin/diffuse:6633 +#: ../src/usr/bin/diffuse:6700 msgid "Search Backwards" msgstr "Rückwärts suchen" -#: ../src/usr/bin/diffuse:6603 +#: ../src/usr/bin/diffuse:6670 msgid "Search For: " msgstr "Suchen nach: " -#: ../src/usr/bin/diffuse:4745 +#: ../src/usr/bin/diffuse:4828 msgid "Select All" msgstr "Alles auswählen" -#: ../src/usr/bin/diffuse:7463 +#: ../src/usr/bin/diffuse:7550 msgid "Select _All" msgstr "_Alles auswählen" -#: ../src/usr/bin/diffuse:7336 +#: ../src/usr/bin/diffuse:7415 msgid "Select target line and press the space bar to align. Press the escape key to cancel." msgstr "Zeile auswählen und Leertaste drücken zum Ausrichten. Drücken Sie die Escape Taste zum Abbrechen." -#: ../src/usr/bin/diffuse:7499 +#: ../src/usr/bin/diffuse:7586 msgid "Shift Pane _Left" msgstr "Fenster nach _links verschieben" -#: ../src/usr/bin/diffuse:7498 +#: ../src/usr/bin/diffuse:7585 msgid "Shift Pane _Right" msgstr "Fenster nach _rechts verschieben" -#: ../src/usr/bin/diffuse:827 +#: ../src/usr/bin/diffuse:835 msgid "Show line numbers" msgstr "Zeige Zeilennummern" -#: ../src/usr/bin/diffuse:825 +#: ../src/usr/bin/diffuse:833 msgid "Show right margin" msgstr "Zeige rechten Rand" -#: ../src/usr/bin/diffuse:828 +#: ../src/usr/bin/diffuse:836 msgid "Show white space characters" msgstr "Leerzeichen anzeigen" -#: ../src/usr/bin/diffuse:8409 +#: ../src/usr/bin/diffuse:8508 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "Übergehe unbekannten Parameter \"%s\"." -#: ../src/usr/bin/diffuse:847 +#: ../src/usr/bin/diffuse:855 msgid "Soft tab width" msgstr "Weiche Tabulatorweite" -#: ../src/usr/bin/diffuse:7678 +#: ../src/usr/bin/diffuse:7773 msgid "Some files have unsaved changes. Select the files to save before closing." msgstr "Einige Dateien haben ungespeicherte Änderungen. Wählen Sie die Dateien zum speichern aus, bevor Sie beenden." -#: ../src/usr/bin/diffuse:7506 +#: ../src/usr/bin/diffuse:7593 msgid "Sort Lines In D_escending Order" msgstr "Zeile in abst_eigender Reihenfolge sortieren" -#: ../src/usr/bin/diffuse:7505 +#: ../src/usr/bin/diffuse:7592 msgid "Sort Lines In _Ascending Order" msgstr "Zeile in _aufsteigender Reihenfolge sortieren" -#: ../src/usr/bin/diffuse:4748 +#: ../src/usr/bin/diffuse:4831 msgid "Swap with Selected Pane" msgstr "Mit ausgewähltem Fenster tauschen" -#: ../src/usr/bin/diffuse:7691 +#: ../src/usr/bin/diffuse:7786 msgid "Tab" msgstr "Reiter" -#: ../src/usr/bin/diffuse:824 +#: ../src/usr/bin/diffuse:832 msgid "Tab width" msgstr "Tabulatorweite" -#: ../src/usr/bin/diffuse:849 +#: ../src/usr/bin/diffuse:857 msgid "Tabs" msgstr "Reiter" -#: ../src/usr/bin/diffuse:7180 +#: ../src/usr/bin/diffuse:7259 #, python-format msgid "The file %s changed on disk. Do you want to reload the file?" msgstr "Die Datei %s wurde auf geändert. Wollen Sie die Datei neu laden?" -#: ../src/usr/bin/diffuse:7231 +#: ../src/usr/bin/diffuse:7310 #, python-format msgid "The file %s has been modified by another process since reading it. If you save, all the external changes could be lost. Save anyways?" msgstr "Die Datei %s wurde seit dem letzten Mal von einem anderen Prozess verändert. Wenn Sie speichern werden alle externen Änderungen verloren gehen. Trotzdem Speichern?" -#: ../src/usr/bin/diffuse:6740 +#: ../src/usr/bin/diffuse:6818 msgid "" "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n" "\n" @@ -668,15 +649,15 @@ msgstr "" "\n" "Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe .\n" -#: ../src/usr/bin/diffuse:7561 +#: ../src/usr/bin/diffuse:7648 msgid "Undo" msgstr "Rückgängig" -#: ../src/usr/bin/diffuse:908 +#: ../src/usr/bin/diffuse:918 msgid "Update paths for Cygwin" msgstr "Pfade für Cygwin aktualisieren" -#: ../src/usr/bin/diffuse:86 +#: ../src/usr/bin/diffuse:81 msgid "" "Usage:\n" " diffuse [ [OPTION...] [FILE...] ]...\n" @@ -705,6 +686,7 @@ msgid "" " ( -r | --revision ) File revision \n" " ( -s | --separate ) Create a new tab for each file\n" " ( -t | --tab ) Start a new tab\n" +" ( -V | --vcs ) Version control system search order\n" " --line Start with line selected\n" " --null-file Create a blank file comparison pane\n" "\n" @@ -744,6 +726,7 @@ msgstr "" " ( -r | --revision ) Datei Revision \n" " ( -s | --separate ) Neuen Reiter für jede Datei erstellen\n" " ( -t | --tab ) Neuen Reiter öffnen\n" +" ( -V | --vcs ) Version control system search order\n" " --line Beim Starten Zeile markieren\n" " --null-file Starte mit leerem Datei-Vergleichsfenster\n" "\n" @@ -754,128 +737,136 @@ msgstr "" " ( -i | --ignore-case ) Unterschiede an Groß- und Kleinschreibung ignorieren\n" " ( -w | --ignore-all-space ) Unterschiede an Leerzeichen ignorieren" -#: ../src/usr/bin/diffuse:911 +#: ../src/usr/bin/diffuse:922 msgid "Version Control" msgstr "Versionsverwaltung" -#: ../src/usr/bin/diffuse:853 +#: ../src/usr/bin/diffuse:905 +msgid "Version control system search order" +msgstr "" + +#: ../src/usr/bin/diffuse:861 #, python-format msgid "Warn me when closing a tab will quit %s" msgstr "Warnen, wenn schließen des Tabs %s beendet" -#: ../src/usr/bin/diffuse:7531 +#: ../src/usr/bin/diffuse:7618 #, python-format msgid "_About %s..." msgstr "_Über %s..." -#: ../src/usr/bin/diffuse:7451 +#: ../src/usr/bin/diffuse:7538 msgid "_Close Tab" msgstr "_Reiter schließen" -#: ../src/usr/bin/diffuse:7460 +#: ../src/usr/bin/diffuse:7547 msgid "_Copy" msgstr "_Kopieren" -#: ../src/usr/bin/diffuse:7465 +#: ../src/usr/bin/diffuse:7552 msgid "_Dismiss All Edits" msgstr "Alle Än_derungen verwerfen" -#: ../src/usr/bin/diffuse:7455 +#: ../src/usr/bin/diffuse:7542 msgid "_Edit" msgstr "_Bearbeiten" -#: ../src/usr/bin/diffuse:7436 +#: ../src/usr/bin/diffuse:7523 msgid "_File" msgstr "_Datei" -#: ../src/usr/bin/diffuse:7467 +#: ../src/usr/bin/diffuse:7554 msgid "_Find..." msgstr "_Suchen..." -#: ../src/usr/bin/diffuse:7488 +#: ../src/usr/bin/diffuse:7575 msgid "_First Difference" msgstr "_Erster Unterschied" -#: ../src/usr/bin/diffuse:7470 +#: ../src/usr/bin/diffuse:7557 msgid "_Go To Line..." msgstr "_Gehe zu Zeile..." -#: ../src/usr/bin/diffuse:7528 +#: ../src/usr/bin/diffuse:7615 msgid "_Help" msgstr "_Hilfe" -#: ../src/usr/bin/diffuse:7529 +#: ../src/usr/bin/diffuse:7616 msgid "_Help Contents..." msgstr "_Inhalt..." -#: ../src/usr/bin/diffuse:7512 +#: ../src/usr/bin/diffuse:7599 msgid "_Increase Indenting" msgstr "Einzug er_höhen" -#: ../src/usr/bin/diffuse:7486 +#: ../src/usr/bin/diffuse:7573 msgid "_Isolate" msgstr "_Isolieren" -#: ../src/usr/bin/diffuse:7491 +#: ../src/usr/bin/diffuse:7578 msgid "_Last Difference" msgstr "_Letzter Unterschied" -#: ../src/usr/bin/diffuse:7519 +#: ../src/usr/bin/diffuse:7606 msgid "_Merge" msgstr "_Zusammenführen" -#: ../src/usr/bin/diffuse:7525 +#: ../src/usr/bin/diffuse:7612 msgid "_Merge From Left Then Right" msgstr "Zusammenführen von links, dann von rechts" -#: ../src/usr/bin/diffuse:7490 +#: ../src/usr/bin/diffuse:7577 msgid "_Next Difference" msgstr "_Nächster Unterschied" -#: ../src/usr/bin/diffuse:7437 +#: ../src/usr/bin/diffuse:7524 msgid "_Open File..." msgstr "Datei _öffnen" -#: ../src/usr/bin/diffuse:7461 +#: ../src/usr/bin/diffuse:7548 msgid "_Paste" msgstr "_Einfügen" -#: ../src/usr/bin/diffuse:7489 +#: ../src/usr/bin/diffuse:7576 msgid "_Previous Difference" msgstr "_Voriger Unterschied" -#: ../src/usr/bin/diffuse:7453 +#: ../src/usr/bin/diffuse:7540 msgid "_Quit" msgstr "_Beenden" -#: ../src/usr/bin/diffuse:7457 +#: ../src/usr/bin/diffuse:7544 msgid "_Redo" msgstr "_Wiederholen" -#: ../src/usr/bin/diffuse:7441 +#: ../src/usr/bin/diffuse:7528 msgid "_Reload File" msgstr "Datei _neu laden" -#: ../src/usr/bin/diffuse:7443 +#: ../src/usr/bin/diffuse:7530 msgid "_Save File" msgstr "Datei _speichern" -#: ../src/usr/bin/diffuse:7483 +#: ../src/usr/bin/diffuse:7570 msgid "_Syntax Highlighting" msgstr "_Syntax Hervorhebung" -#: ../src/usr/bin/diffuse:7456 +#: ../src/usr/bin/diffuse:7543 msgid "_Undo" msgstr "_Rückgängig" -#: ../src/usr/bin/diffuse:7452 +#: ../src/usr/bin/diffuse:7539 msgid "_Undo Close Tab" msgstr "_Reiter schließen rückgängig" -#: ../src/usr/bin/diffuse:7482 +#: ../src/usr/bin/diffuse:7569 msgid "_View" msgstr "_Ansicht" -#: ../src/usr/bin/diffuse:6737 +#: ../src/usr/bin/diffuse:6815 msgid "translator-credits" msgstr "Henri Menke " + +#, python-format +#~ msgid "Column %d" +#~ msgstr "Spalte %d" diff --git a/translations/es.po b/translations/es.po index 9ed714f..2ba10c8 100644 --- a/translations/es.po +++ b/translations/es.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-20 15:02+0200\n" -"PO-Revision-Date: \n" +"POT-Creation-Date: 2020-06-29 14:49-0400\n" +"PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: David Marín Carreño \n" "Language-Team: Spanish \n" "Language: es\n" @@ -18,640 +18,621 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/usr/bin/diffuse:901 +#: ../src/usr/bin/diffuse:911 msgid "\"co\" command" msgstr "Comando \"co\"" -#: ../src/usr/bin/diffuse:902 +#: ../src/usr/bin/diffuse:912 msgid "\"rlog\" command" msgstr "Comando \"rlog\"" -#: ../src/usr/bin/diffuse:7226 +#: ../src/usr/bin/diffuse:7305 #, python-format msgid "A file named %s already exists. Do you want to overwrite it?" msgstr "Ya existe un archivo llamado %s. ¿Quiere reemplazarlo?" -#: ../src/usr/bin/diffuse:4737 +#: ../src/usr/bin/diffuse:4820 msgid "Align with Selection" msgstr "Alinear con la selección." -#: ../src/usr/bin/diffuse:835 +#: ../src/usr/bin/diffuse:843 msgid "Alignment" msgstr "Alineación" -#: ../src/usr/bin/diffuse:852 +#: ../src/usr/bin/diffuse:860 msgid "Always show the tab bar" msgstr "Mostrar siempre barra de pestañas" -#: ../src/usr/bin/diffuse:725 +#: ../src/usr/bin/diffuse:733 msgid "Auto Detect" msgstr "Reconocimiento automático" -#: ../src/usr/bin/diffuse:845 +#: ../src/usr/bin/diffuse:853 msgid "Auto indent" msgstr "Sangría automática" -#: ../src/usr/bin/diffuse:7464 +#: ../src/usr/bin/diffuse:7551 msgid "C_lear Edits" msgstr "_Deshacer todo" -#: ../src/usr/bin/diffuse:8021 +#: ../src/usr/bin/diffuse:8116 msgid "Choose Folder With Commit" msgstr "Seleccionar carpeta con revisiónes" -#: ../src/usr/bin/diffuse:8001 +#: ../src/usr/bin/diffuse:8096 msgid "Choose Folder With Modified Files" msgstr "Seleccionar carpeta con archivos modificados" -#: ../src/usr/bin/diffuse:4746 -#: ../src/usr/bin/diffuse:7566 +#: ../src/usr/bin/diffuse:4829 ../src/usr/bin/diffuse:7653 msgid "Clear Edits" msgstr "Deshacer todo" -#: ../src/usr/bin/diffuse:6774 +#: ../src/usr/bin/diffuse:6853 msgid "Close Tab" msgstr "Cerrar pestaña" -#: ../src/usr/bin/diffuse:7707 +#: ../src/usr/bin/diffuse:7802 msgid "Close _Without Saving" msgstr "Cerrar _sin guardar" -#: ../src/usr/bin/diffuse:6647 +#: ../src/usr/bin/diffuse:6714 #, python-format msgid "Closing this tab will quit %s." msgstr "Cerrar esta pestaña terminará %s." -#: ../src/usr/bin/diffuse:6912 -#, python-format -msgid "Column %d" -msgstr "Columna %d" - -#: ../src/usr/bin/diffuse:904 +#: ../src/usr/bin/diffuse:914 msgid "Command" msgstr "Comando" -#: ../src/usr/bin/diffuse:7510 +#: ../src/usr/bin/diffuse:7597 msgid "Convert Leading Spaces To _Tabs" msgstr "Transformar espacios iniciales en _tabuladores" -#: ../src/usr/bin/diffuse:7509 +#: ../src/usr/bin/diffuse:7596 msgid "Convert Tabs To _Spaces" msgstr "Transformar tabuladores en e_spacios" -#: ../src/usr/bin/diffuse:7517 +#: ../src/usr/bin/diffuse:7604 msgid "Convert To Uni_x Format" msgstr "Transformar a formato Uni_x" -#: ../src/usr/bin/diffuse:7515 +#: ../src/usr/bin/diffuse:7602 msgid "Convert To _DOS Format" msgstr "Transformar a formato _DOS" -#: ../src/usr/bin/diffuse:7503 +#: ../src/usr/bin/diffuse:7590 msgid "Convert To _Lower Case" msgstr "Transformar en letras minúsculas" -#: ../src/usr/bin/diffuse:7516 +#: ../src/usr/bin/diffuse:7603 msgid "Convert To _Mac Format" msgstr "Transformar a formato _Mac" -#: ../src/usr/bin/diffuse:7502 +#: ../src/usr/bin/diffuse:7589 msgid "Convert To _Upper Case" msgstr "Transformar en letras mayúsculas" -#: ../src/usr/bin/diffuse:4742 -#: ../src/usr/bin/diffuse:7564 +#: ../src/usr/bin/diffuse:4825 ../src/usr/bin/diffuse:7651 msgid "Copy" msgstr "Copiar" -#: ../src/usr/bin/diffuse:7556 +#: ../src/usr/bin/diffuse:7643 msgid "Copy Left Into Selection" msgstr "Copiar de izquierda a la selección" -#: ../src/usr/bin/diffuse:7523 +#: ../src/usr/bin/diffuse:7610 msgid "Copy Left _Into Selection" msgstr "Copiar de _izquierda a la selección" -#: ../src/usr/bin/diffuse:7524 +#: ../src/usr/bin/diffuse:7611 msgid "Copy Right I_nto Selection" msgstr "Copiar de de_recha a la selección" -#: ../src/usr/bin/diffuse:7557 +#: ../src/usr/bin/diffuse:7644 msgid "Copy Right Into Selection" msgstr "Copiar de derecha a la selección" -#: ../src/usr/bin/diffuse:7555 +#: ../src/usr/bin/diffuse:7642 msgid "Copy Selection Left" msgstr "Copiar selección a la izquierda" -#: ../src/usr/bin/diffuse:7554 +#: ../src/usr/bin/diffuse:7641 msgid "Copy Selection Right" msgstr "Copiar selección a la derecha" -#: ../src/usr/bin/diffuse:7521 +#: ../src/usr/bin/diffuse:7608 msgid "Copy Selection _Left" msgstr "Copiar selección a la i_zquierda" -#: ../src/usr/bin/diffuse:7520 +#: ../src/usr/bin/diffuse:7607 msgid "Copy Selection _Right" msgstr "Copiar selección a la de_recha" -#: ../src/usr/bin/diffuse:68 -msgid "Copyright © 2006-2019 Derrick Moser" -"Copyright © 2015-2020 Romain Failliot" -msgstr "Copyright © 2006-2019 Derrick Moser" -"Copyright © 2015-2020 Romain Failliot" +#: ../src/usr/bin/diffuse:70 +msgid "Copyright" +msgstr "" -#: ../src/usr/bin/diffuse:7459 +#: ../src/usr/bin/diffuse:7546 msgid "Cu_t" msgstr "Cor_tar" -#: ../src/usr/bin/diffuse:4741 -#: ../src/usr/bin/diffuse:7563 +#: ../src/usr/bin/diffuse:4824 ../src/usr/bin/diffuse:7650 msgid "Cut" msgstr "Cortar" -#: ../src/usr/bin/diffuse:881 +#: ../src/usr/bin/diffuse:889 msgid "Cygdrive prefix" msgstr "Prefijo de Cygdrive" -#: ../src/usr/bin/diffuse:878 +#: ../src/usr/bin/diffuse:886 msgid "Cygwin" msgstr "Cygwin" -#: ../src/usr/bin/diffuse:7513 +#: ../src/usr/bin/diffuse:7600 msgid "De_crease Indenting" msgstr "Dis_minuir sangría" -#: ../src/usr/bin/diffuse:857 +#: ../src/usr/bin/diffuse:865 msgid "Default codec" msgstr "Codificación estándar" -#: ../src/usr/bin/diffuse:851 +#: ../src/usr/bin/diffuse:859 msgid "Default panes" msgstr "Paneles predeterminados" -#: ../src/usr/bin/diffuse:6736 -msgid "Derrick Moser " -msgstr "Derrick Moser " - -#: ../src/usr/bin/diffuse:6733 +#: ../src/usr/bin/diffuse:6810 msgid "Diffuse is a graphical tool for merging and comparing text files." msgstr "Diffuse es una herramienta para mezclar y comparar archivos de texto." -#: ../src/usr/bin/diffuse:821 +#: ../src/usr/bin/diffuse:829 msgid "Display" msgstr "Visualización" -#: ../src/usr/bin/diffuse:843 +#: ../src/usr/bin/diffuse:851 msgid "Editor" msgstr "Editor" -#: ../src/usr/bin/diffuse:6659 +#: ../src/usr/bin/diffuse:6736 msgid "Encoding: " msgstr "Codificación:" -#: ../src/usr/bin/diffuse:7272 +#: ../src/usr/bin/diffuse:7351 #, python-format msgid "Error encoding to %s." msgstr "Error codificando a %s." -#: ../src/usr/bin/diffuse:2528 +#: ../src/usr/bin/diffuse:2657 #, python-format msgid "Error parsing %s." msgstr "Error analizando %s." -#: ../src/usr/bin/diffuse:8399 +#: ../src/usr/bin/diffuse:8498 msgid "Error parsing line number." msgstr "Error analizando número de líneas." -#: ../src/usr/bin/diffuse:1630 -#: ../src/usr/bin/diffuse:2193 -#: ../src/usr/bin/diffuse:2321 +#: ../src/usr/bin/diffuse:1655 ../src/usr/bin/diffuse:2272 +#: ../src/usr/bin/diffuse:2416 #, python-format msgid "Error parsing revision %s." msgstr "Error analizando revisión %s." -#: ../src/usr/bin/diffuse:8416 +#: ../src/usr/bin/diffuse:8515 #, python-format msgid "Error processing argument \"%s\". Directory not expected." msgstr "Error processando parámetro \"%s\". No se esperaba un directorio." -#: ../src/usr/bin/diffuse:706 +#: ../src/usr/bin/diffuse:714 #, python-format msgid "Error processing line %(line)d of %(file)s." msgstr "Error procesando línea %(line)d de %(file)s." -#: ../src/usr/bin/diffuse:7107 -#: ../src/usr/bin/diffuse:8322 +#: ../src/usr/bin/diffuse:7186 ../src/usr/bin/diffuse:8417 #, python-format msgid "Error reading %s." msgstr "Error leyendo %s." -#: ../src/usr/bin/diffuse:7105 +#: ../src/usr/bin/diffuse:7184 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "Error leyendo revisión %(rev)s de %(file)s." -#: ../src/usr/bin/diffuse:7921 +#: ../src/usr/bin/diffuse:8016 #, python-format msgid "Error retrieving commits for %s." msgstr "Error recibiendo commits de %s." -#: ../src/usr/bin/diffuse:7952 +#: ../src/usr/bin/diffuse:8047 #, python-format msgid "Error retrieving modifications for %s." msgstr "Error recibiendo modificaciones de %s." -#: ../src/usr/bin/diffuse:1013 -#: ../src/usr/bin/diffuse:7276 +#: ../src/usr/bin/diffuse:1026 ../src/usr/bin/diffuse:7355 #, python-format msgid "Error writing %s." msgstr "Error guardando %s." -#: ../src/usr/bin/diffuse:846 +#: ../src/usr/bin/diffuse:854 msgid "Expand tabs to spaces" msgstr "Ampliar tabuladores a espacios" -#: ../src/usr/bin/diffuse:7501 +#: ../src/usr/bin/diffuse:7588 msgid "F_ormat" msgstr "F_ormato" -#: ../src/usr/bin/diffuse:7818 +#: ../src/usr/bin/diffuse:7913 #, python-format msgid "File Merge %d" msgstr "Mezcla de archivo %d" -#: ../src/usr/bin/diffuse:7469 +#: ../src/usr/bin/diffuse:7556 msgid "Find Pre_vious" msgstr "Buscar an_terior" -#: ../src/usr/bin/diffuse:7468 +#: ../src/usr/bin/diffuse:7555 msgid "Find _Next" msgstr "Buscar siguie_nte" -#: ../src/usr/bin/diffuse:6597 +#: ../src/usr/bin/diffuse:6662 msgid "Find..." msgstr "Buscar..." -#: ../src/usr/bin/diffuse:7493 +#: ../src/usr/bin/diffuse:7580 msgid "Fir_st Tab" msgstr "Prime_ra pestaña" -#: ../src/usr/bin/diffuse:7549 +#: ../src/usr/bin/diffuse:7636 msgid "First Difference" msgstr "Primera diferencía" -#: ../src/usr/bin/diffuse:823 +#: ../src/usr/bin/diffuse:831 msgid "Font" msgstr "Tipo" -#: ../src/usr/bin/diffuse:7306 +#: ../src/usr/bin/diffuse:7385 msgid "Go To Line..." msgstr "Ir a línea..." -#: ../src/usr/bin/diffuse:832 +#: ../src/usr/bin/diffuse:840 msgid "Ignore blank line differences" msgstr "Ignorar diferencías de líneas vacías" -#: ../src/usr/bin/diffuse:840 +#: ../src/usr/bin/diffuse:848 msgid "Ignore blank lines" msgstr "Ignorar líneas vacías" -#: ../src/usr/bin/diffuse:837 +#: ../src/usr/bin/diffuse:845 msgid "Ignore case" msgstr "Ignorar capitalización" -#: ../src/usr/bin/diffuse:829 +#: ../src/usr/bin/diffuse:837 msgid "Ignore case differences" msgstr "Ignorar diferencías de capitalización" -#: ../src/usr/bin/diffuse:831 -#: ../src/usr/bin/diffuse:839 +#: ../src/usr/bin/diffuse:839 ../src/usr/bin/diffuse:847 msgid "Ignore changes to white space" msgstr "Ignorar cambios de espacios" -#: ../src/usr/bin/diffuse:841 +#: ../src/usr/bin/diffuse:849 msgid "Ignore end of line characters" msgstr "Ignorar caracteres de fin de línea" -#: ../src/usr/bin/diffuse:833 +#: ../src/usr/bin/diffuse:841 msgid "Ignore end of line differences" msgstr "Ignorar diferencias en caracteres de fin de línea" -#: ../src/usr/bin/diffuse:838 +#: ../src/usr/bin/diffuse:846 msgid "Ignore white space" msgstr "Ignorar espacios" -#: ../src/usr/bin/diffuse:830 +#: ../src/usr/bin/diffuse:838 msgid "Ignore white space differences" msgstr "Ignorar diferencías de espacios" -#: ../src/usr/bin/diffuse:4738 +#: ../src/usr/bin/diffuse:4821 msgid "Isolate" msgstr "Aislar" -#: ../src/usr/bin/diffuse:7496 +#: ../src/usr/bin/diffuse:7583 msgid "Las_t Tab" msgstr "Ul_tima pestaña" -#: ../src/usr/bin/diffuse:7552 +#: ../src/usr/bin/diffuse:7639 msgid "Last Difference" msgstr "Última diferencía" -#: ../src/usr/bin/diffuse:906 +#: ../src/usr/bin/diffuse:916 msgid "Launch from a Bash login shell" msgstr "Lanzar desde línea de comandos Bash" -#: ../src/usr/bin/diffuse:7306 +#: ../src/usr/bin/diffuse:7385 msgid "Line Number: " msgstr "Número de línea: " -#: ../src/usr/bin/diffuse:7526 +#: ../src/usr/bin/diffuse:7613 msgid "M_erge From Right Then Left" msgstr "M_ezclar desde derecha, después desde izquierda" -#: ../src/usr/bin/diffuse:6628 +#: ../src/usr/bin/diffuse:6695 msgid "Match Case" msgstr "Coincidencia de capitalización" -#: ../src/usr/bin/diffuse:7558 +#: ../src/usr/bin/diffuse:7645 msgid "Merge From Left Then Right" msgstr "Mezclar desde izquierda, después desde derecha" -#: ../src/usr/bin/diffuse:7559 +#: ../src/usr/bin/diffuse:7646 msgid "Merge From Right Then Left" msgstr "Mezclar desde derecha, después desde izquierda" -#: ../src/usr/bin/diffuse:4739 +#: ../src/usr/bin/diffuse:4822 msgid "Merge Selection" msgstr "Mezclar selección" -#: ../src/usr/bin/diffuse:7545 +#: ../src/usr/bin/diffuse:7632 msgid "New 2-Way File Merge" msgstr "Nueva mezcla de ficheros de 2 vías" -#: ../src/usr/bin/diffuse:7546 +#: ../src/usr/bin/diffuse:7633 msgid "New 3-Way File Merge" msgstr "Nueva mezcla de ficheros de 3 vías" -#: ../src/usr/bin/diffuse:8070 +#: ../src/usr/bin/diffuse:8165 msgid "New N-Way File Merge..." msgstr "Nueva mezcla de ficheros de N vías..." -#: ../src/usr/bin/diffuse:7447 +#: ../src/usr/bin/diffuse:7534 msgid "New _2-Way File Merge" msgstr "Nueva mezcla de ficheros de _2 vías" -#: ../src/usr/bin/diffuse:7448 +#: ../src/usr/bin/diffuse:7535 msgid "New _3-Way File Merge" msgstr "Nueva mezcla de ficheros de _3 vías" -#: ../src/usr/bin/diffuse:7449 +#: ../src/usr/bin/diffuse:7536 msgid "New _N-Way File Merge..." msgstr "Nueva mezcla de ficheros de _N vías..." -#: ../src/usr/bin/diffuse:7551 +#: ../src/usr/bin/diffuse:7638 msgid "Next Difference" msgstr "Siguiente diferencia" -#: ../src/usr/bin/diffuse:7495 +#: ../src/usr/bin/diffuse:7582 msgid "Next _Tab" msgstr "Siguiente _pestaña" -#: ../src/usr/bin/diffuse:8034 +#: ../src/usr/bin/diffuse:8129 msgid "No committed files found." msgstr "No se encontraron ficheros confirmados." -#: ../src/usr/bin/diffuse:8014 +#: ../src/usr/bin/diffuse:8109 msgid "No modified files found." msgstr "No se encontraron ficheros modificados." -#: ../src/usr/bin/diffuse:7474 +#: ../src/usr/bin/diffuse:7561 msgid "None" msgstr "Ninguno" -#: ../src/usr/bin/diffuse:8070 +#: ../src/usr/bin/diffuse:8165 msgid "Number of panes: " msgstr "Número de paneles: " -#: ../src/usr/bin/diffuse:7440 +#: ../src/usr/bin/diffuse:7527 msgid "Open Commi_t..." msgstr "Abrir revi_sión..." -#: ../src/usr/bin/diffuse:7130 +#: ../src/usr/bin/diffuse:7209 msgid "Open File" msgstr "Abrir fichero" -#: ../src/usr/bin/diffuse:7985 +#: ../src/usr/bin/diffuse:8080 msgid "Open File In New Tab" msgstr "Abrir fichero en nueva pestaña" -#: ../src/usr/bin/diffuse:7438 +#: ../src/usr/bin/diffuse:7525 msgid "Open File In New _Tab..." msgstr "Abrir fichero en nueva _pestaña..." -#: ../src/usr/bin/diffuse:6829 +#: ../src/usr/bin/diffuse:6908 msgid "Open File..." msgstr "Abrir fichero..." -#: ../src/usr/bin/diffuse:7439 +#: ../src/usr/bin/diffuse:7526 msgid "Open _Modified Files..." msgstr "Abrir ficheros _modificados..." -#: ../src/usr/bin/diffuse:858 +#: ../src/usr/bin/diffuse:866 msgid "Order of codecs used to identify encoding" msgstr "Orden de codificaciones en identificación" -#: ../src/usr/bin/diffuse:7696 +#: ../src/usr/bin/diffuse:7791 msgid "Pane" msgstr "Panel" -#: ../src/usr/bin/diffuse:4743 -#: ../src/usr/bin/diffuse:7565 +#: ../src/usr/bin/diffuse:4826 ../src/usr/bin/diffuse:7652 msgid "Paste" msgstr "Pegar" -#: ../src/usr/bin/diffuse:8135 +#: ../src/usr/bin/diffuse:8230 msgid "Phrase not found. Continue from the end of the file?" msgstr "Frase no encontrada. ¿Continuar desde final del fichero?" -#: ../src/usr/bin/diffuse:8137 +#: ../src/usr/bin/diffuse:8232 msgid "Phrase not found. Continue from the start of the file?" msgstr "Frase no encontrada. ¿Continuar desde principio del fichero?" -#: ../src/usr/bin/diffuse:7472 +#: ../src/usr/bin/diffuse:7559 msgid "Pr_eferences..." msgstr "Pr_eferencias..." -#: ../src/usr/bin/diffuse:7494 +#: ../src/usr/bin/diffuse:7581 msgid "Pre_vious Tab" msgstr "Pestaña ante_rior" -#: ../src/usr/bin/diffuse:975 +#: ../src/usr/bin/diffuse:986 msgid "Preferences" msgstr "Preferencias" -#: ../src/usr/bin/diffuse:7332 +#: ../src/usr/bin/diffuse:7411 msgid "Press the enter key or double click to edit. Press the space bar or use the RMB menu to manually align." msgstr "Pulse Enter o haga doble clic para editar. Pulse el espaciador o use el menú RMB para alinear manualmente." -#: ../src/usr/bin/diffuse:7334 +#: ../src/usr/bin/diffuse:7413 msgid "Press the escape key to finish editing." msgstr "Pulse Escape para finalizar la edición." -#: ../src/usr/bin/diffuse:7550 +#: ../src/usr/bin/diffuse:7637 msgid "Previous Difference" msgstr "Diferencía anterior" -#: ../src/usr/bin/diffuse:7485 +#: ../src/usr/bin/diffuse:7572 msgid "Re_align All" msgstr "Re_alinear todo" -#: ../src/usr/bin/diffuse:7548 +#: ../src/usr/bin/diffuse:7635 msgid "Realign All" msgstr "Realinear todo" -#: ../src/usr/bin/diffuse:7562 +#: ../src/usr/bin/diffuse:7649 msgid "Redo" msgstr "Rehacer" -#: ../src/usr/bin/diffuse:855 +#: ../src/usr/bin/diffuse:863 msgid "Regional Settings" msgstr "Ajustes regionales" -#: ../src/usr/bin/diffuse:6830 +#: ../src/usr/bin/diffuse:6909 msgid "Reload File" msgstr "Recargar fichero" -#: ../src/usr/bin/diffuse:7508 +#: ../src/usr/bin/diffuse:7595 msgid "Remove Trailing _White Space" msgstr "Quitar _espacios finales" -#: ../src/usr/bin/diffuse:6669 +#: ../src/usr/bin/diffuse:6746 msgid "Revision: " msgstr "Revision: " -#: ../src/usr/bin/diffuse:826 +#: ../src/usr/bin/diffuse:834 msgid "Right margin" msgstr "Margen derecho" -#: ../src/usr/bin/diffuse:880 +#: ../src/usr/bin/diffuse:888 msgid "Root directory" msgstr "Directorio raíz" -#: ../src/usr/bin/diffuse:7200 +#: ../src/usr/bin/diffuse:7279 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "Guardar Panel %(title)s %(pane)d" -#: ../src/usr/bin/diffuse:7445 +#: ../src/usr/bin/diffuse:7532 msgid "Save A_ll" msgstr "Gu_ardar todo" -#: ../src/usr/bin/diffuse:6831 +#: ../src/usr/bin/diffuse:6910 msgid "Save File" msgstr "Guardar fichero" -#: ../src/usr/bin/diffuse:6832 +#: ../src/usr/bin/diffuse:6911 msgid "Save File As..." msgstr "Guardar fichero como..." -#: ../src/usr/bin/diffuse:7444 +#: ../src/usr/bin/diffuse:7531 msgid "Save File _As..." msgstr "Guardar _fichero como..." -#: ../src/usr/bin/diffuse:6977 +#: ../src/usr/bin/diffuse:7056 msgid "Save changes before loading the new file?" msgstr "¿Guardar cambios antes de abrir nuevo fichero?" -#: ../src/usr/bin/diffuse:6633 +#: ../src/usr/bin/diffuse:6700 msgid "Search Backwards" msgstr "Buscar hacia atrás" -#: ../src/usr/bin/diffuse:6603 +#: ../src/usr/bin/diffuse:6670 msgid "Search For: " msgstr "Buscar: " -#: ../src/usr/bin/diffuse:4745 +#: ../src/usr/bin/diffuse:4828 msgid "Select All" msgstr "Seleccionar todo" -#: ../src/usr/bin/diffuse:7463 +#: ../src/usr/bin/diffuse:7550 msgid "Select _All" msgstr "Seleccion_ar todo" -#: ../src/usr/bin/diffuse:7336 +#: ../src/usr/bin/diffuse:7415 msgid "Select target line and press the space bar to align. Press the escape key to cancel." msgstr "Selecciona la línea y pulsa espacio para alinear. Pulsa Escape para cancelar." -#: ../src/usr/bin/diffuse:7499 +#: ../src/usr/bin/diffuse:7586 msgid "Shift Pane _Left" msgstr "Cambiar panel _izquierdo" -#: ../src/usr/bin/diffuse:7498 +#: ../src/usr/bin/diffuse:7585 msgid "Shift Pane _Right" msgstr "Cambiar panel _derecho" -#: ../src/usr/bin/diffuse:827 +#: ../src/usr/bin/diffuse:835 msgid "Show line numbers" msgstr "Mostrar números de línea" -#: ../src/usr/bin/diffuse:825 +#: ../src/usr/bin/diffuse:833 msgid "Show right margin" msgstr "Mostrar margen derecho" -#: ../src/usr/bin/diffuse:828 +#: ../src/usr/bin/diffuse:836 msgid "Show white space characters" msgstr "Mostrar espacios" -#: ../src/usr/bin/diffuse:8409 +#: ../src/usr/bin/diffuse:8508 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "Omitiendo argumento desconocido \"%s\"." -#: ../src/usr/bin/diffuse:847 +#: ../src/usr/bin/diffuse:855 msgid "Soft tab width" msgstr "Tabuladores blandos" -#: ../src/usr/bin/diffuse:7678 +#: ../src/usr/bin/diffuse:7773 msgid "Some files have unsaved changes. Select the files to save before closing." msgstr "Unos ficheros tienen cambios. Elige los ficheros a guardar antes de cerrar." -#: ../src/usr/bin/diffuse:7506 +#: ../src/usr/bin/diffuse:7593 msgid "Sort Lines In D_escending Order" msgstr "Ordenar lineas en orden _descendente" -#: ../src/usr/bin/diffuse:7505 +#: ../src/usr/bin/diffuse:7592 msgid "Sort Lines In _Ascending Order" msgstr "Ordenar lineas en orden _ascendente" -#: ../src/usr/bin/diffuse:4748 +#: ../src/usr/bin/diffuse:4831 msgid "Swap with Selected Pane" msgstr "Reemplazar con panel seleccionado" -#: ../src/usr/bin/diffuse:7691 +#: ../src/usr/bin/diffuse:7786 msgid "Tab" msgstr "Pestaña" -#: ../src/usr/bin/diffuse:824 +#: ../src/usr/bin/diffuse:832 msgid "Tab width" msgstr "Tamaño de tabulador" -#: ../src/usr/bin/diffuse:849 +#: ../src/usr/bin/diffuse:857 msgid "Tabs" msgstr "Pestañas" -#: ../src/usr/bin/diffuse:7180 +#: ../src/usr/bin/diffuse:7259 #, python-format msgid "The file %s changed on disk. Do you want to reload the file?" msgstr "El fichero %s ha cambiado en disco. ¿Quieres recargarlo?" -#: ../src/usr/bin/diffuse:7231 +#: ../src/usr/bin/diffuse:7310 #, python-format msgid "The file %s has been modified by another process since reading it. If you save, all the external changes could be lost. Save anyways?" msgstr "El fichero %s ha sido modificado por otro proceso desde que se cargó. Sí se guarda, todos los cambios realizados por procesos externos se perderán. ¿Deseas guardar de todos modos?" -#: ../src/usr/bin/diffuse:6740 +#: ../src/usr/bin/diffuse:6818 msgid "" "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n" "\n" @@ -665,15 +646,15 @@ msgstr "" "\n" "You should have received a copy of the GNU General Public License along with this program. You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n" -#: ../src/usr/bin/diffuse:7561 +#: ../src/usr/bin/diffuse:7648 msgid "Undo" msgstr "Deshacer" -#: ../src/usr/bin/diffuse:908 +#: ../src/usr/bin/diffuse:918 msgid "Update paths for Cygwin" msgstr "Actualizar rutas de Cygwin" -#: ../src/usr/bin/diffuse:86 +#: ../src/usr/bin/diffuse:81 msgid "" "Usage:\n" " diffuse [ [OPTION...] [FILE...] ]...\n" @@ -702,6 +683,7 @@ msgid "" " ( -r | --revision ) File revision \n" " ( -s | --separate ) Create a new tab for each file\n" " ( -t | --tab ) Start a new tab\n" +" ( -V | --vcs ) Version control system search order\n" " --line Start with line selected\n" " --null-file Create a blank file comparison pane\n" "\n" @@ -739,6 +721,8 @@ msgstr "" " ( -r | --revision ) Revisión de fichero \n" " ( -s | --separate ) Crea nueva pestaña para cada fichero\n" " ( -t | --tab ) Inicia pestaña nueva\n" +" ( -V | --vcs ) Version control system search order\n" +" --line Start with line selected\n" " --null-file Crea panel vacío de comparación de ficheros\n" "\n" "Opciones de visualización:\n" @@ -748,130 +732,138 @@ msgstr "" " ( -i | --ignore-case ) Ignorar cambios de capitalización\n" " ( -w | --ignore-all-space ) Ignorar todos los cambios en espaciado" -#: ../src/usr/bin/diffuse:911 +#: ../src/usr/bin/diffuse:922 msgid "Version Control" msgstr "Control de versión" -#: ../src/usr/bin/diffuse:853 +#: ../src/usr/bin/diffuse:905 +msgid "Version control system search order" +msgstr "" + +#: ../src/usr/bin/diffuse:861 #, python-format msgid "Warn me when closing a tab will quit %s" msgstr "Avísar sí cerrar la ultima pestaña cerrará la aplicación %s" -#: ../src/usr/bin/diffuse:7531 +#: ../src/usr/bin/diffuse:7618 #, python-format msgid "_About %s..." msgstr "_Acerca de %s..." -#: ../src/usr/bin/diffuse:7451 +#: ../src/usr/bin/diffuse:7538 msgid "_Close Tab" msgstr "_Cerrar pestaña" -#: ../src/usr/bin/diffuse:7460 +#: ../src/usr/bin/diffuse:7547 msgid "_Copy" msgstr "_Copiar" -#: ../src/usr/bin/diffuse:7465 +#: ../src/usr/bin/diffuse:7552 msgid "_Dismiss All Edits" msgstr "_Ignorar todas las ediciones" -#: ../src/usr/bin/diffuse:7455 +#: ../src/usr/bin/diffuse:7542 msgid "_Edit" msgstr "_Editar" -#: ../src/usr/bin/diffuse:7436 +#: ../src/usr/bin/diffuse:7523 msgid "_File" msgstr "_Fichero" -#: ../src/usr/bin/diffuse:7467 +#: ../src/usr/bin/diffuse:7554 msgid "_Find..." msgstr "_Buscar..." -#: ../src/usr/bin/diffuse:7488 +#: ../src/usr/bin/diffuse:7575 msgid "_First Difference" msgstr "Primera di_ferencia" -#: ../src/usr/bin/diffuse:7470 +#: ../src/usr/bin/diffuse:7557 msgid "_Go To Line..." msgstr "_Ir a la línea..." -#: ../src/usr/bin/diffuse:7528 +#: ../src/usr/bin/diffuse:7615 msgid "_Help" msgstr "_Ayuda" -#: ../src/usr/bin/diffuse:7529 +#: ../src/usr/bin/diffuse:7616 msgid "_Help Contents..." msgstr "Índ_ice de ayuda..." -#: ../src/usr/bin/diffuse:7512 +#: ../src/usr/bin/diffuse:7599 msgid "_Increase Indenting" msgstr "Aumentar sangr_ía" -#: ../src/usr/bin/diffuse:7486 +#: ../src/usr/bin/diffuse:7573 msgid "_Isolate" msgstr "A_islar" -#: ../src/usr/bin/diffuse:7491 +#: ../src/usr/bin/diffuse:7578 msgid "_Last Difference" msgstr "Ú_ltima diferencia" -#: ../src/usr/bin/diffuse:7519 +#: ../src/usr/bin/diffuse:7606 msgid "_Merge" msgstr "_Mezcla" -#: ../src/usr/bin/diffuse:7525 +#: ../src/usr/bin/diffuse:7612 msgid "_Merge From Left Then Right" msgstr "_Mezclar desde izquierda, después desde derecha" -#: ../src/usr/bin/diffuse:7490 +#: ../src/usr/bin/diffuse:7577 msgid "_Next Difference" msgstr "Diferencia siguie_nte" -#: ../src/usr/bin/diffuse:7437 +#: ../src/usr/bin/diffuse:7524 msgid "_Open File..." msgstr "_Abrir fichero" -#: ../src/usr/bin/diffuse:7461 +#: ../src/usr/bin/diffuse:7548 msgid "_Paste" msgstr "_Pegar" -#: ../src/usr/bin/diffuse:7489 +#: ../src/usr/bin/diffuse:7576 msgid "_Previous Difference" msgstr "Diferencia an_terior" -#: ../src/usr/bin/diffuse:7453 +#: ../src/usr/bin/diffuse:7540 msgid "_Quit" msgstr "_Salir" -#: ../src/usr/bin/diffuse:7457 +#: ../src/usr/bin/diffuse:7544 msgid "_Redo" msgstr "_Rehacer" -#: ../src/usr/bin/diffuse:7441 +#: ../src/usr/bin/diffuse:7528 msgid "_Reload File" msgstr "_Recargar fichero" -#: ../src/usr/bin/diffuse:7443 +#: ../src/usr/bin/diffuse:7530 msgid "_Save File" msgstr "_Guardar fichero" -#: ../src/usr/bin/diffuse:7483 +#: ../src/usr/bin/diffuse:7570 msgid "_Syntax Highlighting" msgstr "Coloreado _sintáctico" -#: ../src/usr/bin/diffuse:7456 +#: ../src/usr/bin/diffuse:7543 msgid "_Undo" msgstr "_Deshacer" -#: ../src/usr/bin/diffuse:7452 +#: ../src/usr/bin/diffuse:7539 msgid "_Undo Close Tab" msgstr "_Deshacer cerrar pestaña" -#: ../src/usr/bin/diffuse:7482 +#: ../src/usr/bin/diffuse:7569 msgid "_View" msgstr "_Ver" -#: ../src/usr/bin/diffuse:6737 +#: ../src/usr/bin/diffuse:6815 msgid "translator-credits" msgstr "" "Henri Menke \n" "David Marín Carreño " + +#, python-format +#~ msgid "Column %d" +#~ msgstr "Columna %d" diff --git a/translations/it.po b/translations/it.po index 5f59859..6b756af 100644 --- a/translations/it.po +++ b/translations/it.po @@ -7,720 +7,667 @@ msgid "" msgstr "" "Project-Id-Version: Diffuse 0.4.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-20 13:55+0200\n" -"PO-Revision-Date: 2013-04-20 13:54+0100\n" +"POT-Creation-Date: 2020-06-29 14:49-0400\n" +"PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Cristian Marchi \n" "Language-Team: Italian\n" -"Language: \n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/usr/bin/diffuse:901 +#: ../src/usr/bin/diffuse:911 msgid "\"co\" command" msgstr "Comando \"co\"" -#: ../src/usr/bin/diffuse:902 +#: ../src/usr/bin/diffuse:912 msgid "\"rlog\" command" msgstr "Comando \"rlog\"" -#: ../src/usr/bin/diffuse:7226 +#: ../src/usr/bin/diffuse:7305 #, python-format msgid "A file named %s already exists. Do you want to overwrite it?" msgstr "Il file «%s» esiste già. Sovrascrivere?" -#: ../src/usr/bin/diffuse:4737 +#: ../src/usr/bin/diffuse:4820 msgid "Align with Selection" msgstr "Allinea con la selezione" -#: ../src/usr/bin/diffuse:835 +#: ../src/usr/bin/diffuse:843 msgid "Alignment" msgstr "Allineamento" -#: ../src/usr/bin/diffuse:852 +#: ../src/usr/bin/diffuse:860 msgid "Always show the tab bar" msgstr "Mostra sempre la barra delle schede" -#: ../src/usr/bin/diffuse:725 +#: ../src/usr/bin/diffuse:733 msgid "Auto Detect" msgstr "Automatico" -#: ../src/usr/bin/diffuse:845 +#: ../src/usr/bin/diffuse:853 msgid "Auto indent" msgstr "Indentazione automatica" -#: ../src/usr/bin/diffuse:7464 +#: ../src/usr/bin/diffuse:7551 msgid "C_lear Edits" msgstr "Annulla _modifiche" -#: ../src/usr/bin/diffuse:8021 +#: ../src/usr/bin/diffuse:8116 msgid "Choose Folder With Commit" msgstr "Selezionare la cartella con i commit" -#: ../src/usr/bin/diffuse:8001 +#: ../src/usr/bin/diffuse:8096 msgid "Choose Folder With Modified Files" msgstr "Selezionare la cartella con i file modificati" -#: ../src/usr/bin/diffuse:4746 ../src/usr/bin/diffuse:7566 +#: ../src/usr/bin/diffuse:4829 ../src/usr/bin/diffuse:7653 msgid "Clear Edits" msgstr "Annulla le modifiche" -#: ../src/usr/bin/diffuse:6774 +#: ../src/usr/bin/diffuse:6853 msgid "Close Tab" msgstr "Chiudi scheda" -#: ../src/usr/bin/diffuse:7707 +#: ../src/usr/bin/diffuse:7802 msgid "Close _Without Saving" msgstr "_Chiudi senza salvare" -#: ../src/usr/bin/diffuse:6647 +#: ../src/usr/bin/diffuse:6714 #, python-format msgid "Closing this tab will quit %s." msgstr "Chiudendo questa scheda %s verrà chiuso." -#: ../src/usr/bin/diffuse:6912 -#, python-format -msgid "Column %d" -msgstr "Colonna %d" - -#: ../src/usr/bin/diffuse:904 +#: ../src/usr/bin/diffuse:914 msgid "Command" msgstr "Comando" -#: ../src/usr/bin/diffuse:7510 +#: ../src/usr/bin/diffuse:7597 msgid "Convert Leading Spaces To _Tabs" msgstr "Converti gli spa_zi iniziali in tabulazioni" -#: ../src/usr/bin/diffuse:7509 +#: ../src/usr/bin/diffuse:7596 msgid "Convert Tabs To _Spaces" msgstr "Converti le _tabulazioni in spazi" -#: ../src/usr/bin/diffuse:7517 +#: ../src/usr/bin/diffuse:7604 msgid "Convert To Uni_x Format" msgstr "Converti nel formato Uni_x" -#: ../src/usr/bin/diffuse:7515 +#: ../src/usr/bin/diffuse:7602 msgid "Convert To _DOS Format" msgstr "Converti nel formato D_OS" -#: ../src/usr/bin/diffuse:7503 +#: ../src/usr/bin/diffuse:7590 msgid "Convert To _Lower Case" msgstr "Converti in m_inuscolo" -#: ../src/usr/bin/diffuse:7516 +#: ../src/usr/bin/diffuse:7603 msgid "Convert To _Mac Format" msgstr "Converti nel formato MA_C" -#: ../src/usr/bin/diffuse:7502 +#: ../src/usr/bin/diffuse:7589 msgid "Convert To _Upper Case" msgstr "Converti in M_AIUSCOLO" -#: ../src/usr/bin/diffuse:4742 ../src/usr/bin/diffuse:7564 +#: ../src/usr/bin/diffuse:4825 ../src/usr/bin/diffuse:7651 msgid "Copy" msgstr "Copia" -#: ../src/usr/bin/diffuse:7556 +#: ../src/usr/bin/diffuse:7643 msgid "Copy Left Into Selection" msgstr "Copia sinistra nella selezione" -#: ../src/usr/bin/diffuse:7523 +#: ../src/usr/bin/diffuse:7610 msgid "Copy Left _Into Selection" msgstr "Copia s_inistra nella selezione" -#: ../src/usr/bin/diffuse:7524 +#: ../src/usr/bin/diffuse:7611 msgid "Copy Right I_nto Selection" msgstr "Copia d_estra nella selezione" -#: ../src/usr/bin/diffuse:7557 +#: ../src/usr/bin/diffuse:7644 msgid "Copy Right Into Selection" msgstr "Copia destra nella selezione" -#: ../src/usr/bin/diffuse:7555 +#: ../src/usr/bin/diffuse:7642 msgid "Copy Selection Left" msgstr "Copia la selezione a sinistra" -#: ../src/usr/bin/diffuse:7554 +#: ../src/usr/bin/diffuse:7641 msgid "Copy Selection Right" msgstr "Copia la selezione a destra" -#: ../src/usr/bin/diffuse:7521 +#: ../src/usr/bin/diffuse:7608 msgid "Copy Selection _Left" msgstr "Copia selezione a _sinistra" -#: ../src/usr/bin/diffuse:7520 +#: ../src/usr/bin/diffuse:7607 msgid "Copy Selection _Right" msgstr "Copia selezione a _destra" -#: ../src/usr/bin/diffuse:68 -msgid "Copyright © 2006-2019 Derrick Moser" -"Copyright © 2015-2020 Romain Failliot" -msgstr "Copyright © 2006-2019 Derrick Moser" -"Copyright © 2015-2020 Romain Failliot" +#: ../src/usr/bin/diffuse:70 +msgid "Copyright" +msgstr "" -#: ../src/usr/bin/diffuse:7459 +#: ../src/usr/bin/diffuse:7546 msgid "Cu_t" msgstr "_Taglia" -#: ../src/usr/bin/diffuse:4741 ../src/usr/bin/diffuse:7563 +#: ../src/usr/bin/diffuse:4824 ../src/usr/bin/diffuse:7650 msgid "Cut" msgstr "Taglia" -#: ../src/usr/bin/diffuse:881 +#: ../src/usr/bin/diffuse:889 msgid "Cygdrive prefix" msgstr "Prefisso Cygdrive" -#: ../src/usr/bin/diffuse:878 +#: ../src/usr/bin/diffuse:886 msgid "Cygwin" msgstr "Cygwin" -#: ../src/usr/bin/diffuse:7513 +#: ../src/usr/bin/diffuse:7600 msgid "De_crease Indenting" msgstr "Dimi_nuisci indentazione" -#: ../src/usr/bin/diffuse:857 +#: ../src/usr/bin/diffuse:865 msgid "Default codec" msgstr "Codec predefinito" -#: ../src/usr/bin/diffuse:851 +#: ../src/usr/bin/diffuse:859 msgid "Default panes" msgstr "Riquadri predefiniti" -#: ../src/usr/bin/diffuse:6736 -msgid "Derrick Moser " -msgstr "Derrick Moser " - -#: ../src/usr/bin/diffuse:6733 +#: ../src/usr/bin/diffuse:6810 msgid "Diffuse is a graphical tool for merging and comparing text files." -msgstr "" -"Diffuse è uno strumento grafico per l'unione e la comparazione di file di " -"testo." +msgstr "Diffuse è uno strumento grafico per l'unione e la comparazione di file di testo." -#: ../src/usr/bin/diffuse:821 +#: ../src/usr/bin/diffuse:829 msgid "Display" msgstr "Visualizzazione" -#: ../src/usr/bin/diffuse:843 +#: ../src/usr/bin/diffuse:851 msgid "Editor" msgstr "Editor" -#: ../src/usr/bin/diffuse:6659 +#: ../src/usr/bin/diffuse:6736 msgid "Encoding: " msgstr "Codifica: " -#: ../src/usr/bin/diffuse:7272 +#: ../src/usr/bin/diffuse:7351 #, python-format msgid "Error encoding to %s." msgstr "Errore codificando %s" -#: ../src/usr/bin/diffuse:2528 +#: ../src/usr/bin/diffuse:2657 #, python-format msgid "Error parsing %s." msgstr "Errore analizzando %s." -#: ../src/usr/bin/diffuse:8399 +#: ../src/usr/bin/diffuse:8498 msgid "Error parsing line number." msgstr "Errore nell'analizzare il numero di riga." -#: ../src/usr/bin/diffuse:1630 ../src/usr/bin/diffuse:2193 -#: ../src/usr/bin/diffuse:2321 +#: ../src/usr/bin/diffuse:1655 ../src/usr/bin/diffuse:2272 +#: ../src/usr/bin/diffuse:2416 #, python-format msgid "Error parsing revision %s." msgstr "Eroore analizzando la revisione %s." -#: ../src/usr/bin/diffuse:8416 +#: ../src/usr/bin/diffuse:8515 #, python-format msgid "Error processing argument \"%s\". Directory not expected." msgstr "Errore nell'elaborazione dell'argomento \"%s\". Cartella non attesa." -#: ../src/usr/bin/diffuse:706 +#: ../src/usr/bin/diffuse:714 #, python-format msgid "Error processing line %(line)d of %(file)s." msgstr "Errore nell'elaborare la riga %(line)d di «%(file)s»." -#: ../src/usr/bin/diffuse:7107 ../src/usr/bin/diffuse:8322 +#: ../src/usr/bin/diffuse:7186 ../src/usr/bin/diffuse:8417 #, python-format msgid "Error reading %s." msgstr "Errore leggendo il %s." -#: ../src/usr/bin/diffuse:7105 +#: ../src/usr/bin/diffuse:7184 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "Errore durante la lettura della revisione \"%(rev)s\" di «%(file)s»." -#: ../src/usr/bin/diffuse:7921 +#: ../src/usr/bin/diffuse:8016 #, python-format msgid "Error retrieving commits for %s." msgstr "Errore nel recupero dei commit per «%s»" -#: ../src/usr/bin/diffuse:7952 +#: ../src/usr/bin/diffuse:8047 #, python-format msgid "Error retrieving modifications for %s." msgstr "Errore nel recupero delle modifiche per «%s»" -#: ../src/usr/bin/diffuse:1013 ../src/usr/bin/diffuse:7276 +#: ../src/usr/bin/diffuse:1026 ../src/usr/bin/diffuse:7355 #, python-format msgid "Error writing %s." msgstr "Errore scrivendo il %s." -#: ../src/usr/bin/diffuse:846 +#: ../src/usr/bin/diffuse:854 msgid "Expand tabs to spaces" msgstr "Espandi le tabulazioni in spazi" -#: ../src/usr/bin/diffuse:7501 +#: ../src/usr/bin/diffuse:7588 msgid "F_ormat" msgstr "F_ormato" -#: ../src/usr/bin/diffuse:7818 +#: ../src/usr/bin/diffuse:7913 #, python-format msgid "File Merge %d" msgstr "Unione file # %d" -#: ../src/usr/bin/diffuse:7469 +#: ../src/usr/bin/diffuse:7556 msgid "Find Pre_vious" msgstr "Trova _precedente" -#: ../src/usr/bin/diffuse:7468 +#: ../src/usr/bin/diffuse:7555 msgid "Find _Next" msgstr "Trova _successivo" -#: ../src/usr/bin/diffuse:6597 +#: ../src/usr/bin/diffuse:6662 msgid "Find..." msgstr "Trova..." -#: ../src/usr/bin/diffuse:7493 +#: ../src/usr/bin/diffuse:7580 msgid "Fir_st Tab" msgstr "Prim_a scheda" -#: ../src/usr/bin/diffuse:7549 +#: ../src/usr/bin/diffuse:7636 msgid "First Difference" msgstr "Prima differenza" -#: ../src/usr/bin/diffuse:823 +#: ../src/usr/bin/diffuse:831 msgid "Font" msgstr "Carattere" -#: ../src/usr/bin/diffuse:7306 +#: ../src/usr/bin/diffuse:7385 msgid "Go To Line..." msgstr "Vai alla linea..." -#: ../src/usr/bin/diffuse:832 +#: ../src/usr/bin/diffuse:840 msgid "Ignore blank line differences" msgstr "Ignora le differenze tra le righe vuote" -#: ../src/usr/bin/diffuse:840 +#: ../src/usr/bin/diffuse:848 msgid "Ignore blank lines" msgstr "Ignora le righe vuote" -#: ../src/usr/bin/diffuse:837 +#: ../src/usr/bin/diffuse:845 msgid "Ignore case" msgstr "Ignora MAIUSCOLE/minuscole" -#: ../src/usr/bin/diffuse:829 +#: ../src/usr/bin/diffuse:837 msgid "Ignore case differences" msgstr "Ignora la differenza tra lettere maiuscole e minuscole" -#: ../src/usr/bin/diffuse:831 ../src/usr/bin/diffuse:839 +#: ../src/usr/bin/diffuse:839 ../src/usr/bin/diffuse:847 msgid "Ignore changes to white space" msgstr "Ignora le modifiche agli spazi vuoti" -#: ../src/usr/bin/diffuse:841 +#: ../src/usr/bin/diffuse:849 msgid "Ignore end of line characters" msgstr "Ignora i caratteri di fine linea" -#: ../src/usr/bin/diffuse:833 +#: ../src/usr/bin/diffuse:841 msgid "Ignore end of line differences" msgstr "Ignora le differenze alla fine della riga" -#: ../src/usr/bin/diffuse:838 +#: ../src/usr/bin/diffuse:846 msgid "Ignore white space" msgstr "Ignora gli spazi vuoti" -#: ../src/usr/bin/diffuse:830 +#: ../src/usr/bin/diffuse:838 msgid "Ignore white space differences" msgstr "Ignora le differenze tra spazi vuoti" -#: ../src/usr/bin/diffuse:4738 +#: ../src/usr/bin/diffuse:4821 msgid "Isolate" msgstr "Isola" -#: ../src/usr/bin/diffuse:7496 +#: ../src/usr/bin/diffuse:7583 msgid "Las_t Tab" msgstr "Ul_tima scheda" -#: ../src/usr/bin/diffuse:7552 +#: ../src/usr/bin/diffuse:7639 msgid "Last Difference" msgstr "Ultima differenza" -#: ../src/usr/bin/diffuse:906 +#: ../src/usr/bin/diffuse:916 msgid "Launch from a Bash login shell" msgstr "Avvia dalla Bash di una shell di login" -#: ../src/usr/bin/diffuse:7306 +#: ../src/usr/bin/diffuse:7385 msgid "Line Number: " msgstr "Numero di riga: " -#: ../src/usr/bin/diffuse:7526 +#: ../src/usr/bin/diffuse:7613 msgid "M_erge From Right Then Left" msgstr "U_nisci destra poi sinistra" -#: ../src/usr/bin/diffuse:6628 +#: ../src/usr/bin/diffuse:6695 msgid "Match Case" msgstr "Distingui MAIUSCOLE/minuscole" -#: ../src/usr/bin/diffuse:7558 +#: ../src/usr/bin/diffuse:7645 msgid "Merge From Left Then Right" msgstr "Unisce prima da sinistra poi da destra" -#: ../src/usr/bin/diffuse:7559 +#: ../src/usr/bin/diffuse:7646 msgid "Merge From Right Then Left" msgstr "Unisce prima da destra poi da sinistra" -#: ../src/usr/bin/diffuse:4739 +#: ../src/usr/bin/diffuse:4822 msgid "Merge Selection" msgstr "Unisci selezione" -#: ../src/usr/bin/diffuse:7545 +#: ../src/usr/bin/diffuse:7632 msgid "New 2-Way File Merge" msgstr "Nuova unione a 2 file" -#: ../src/usr/bin/diffuse:7546 +#: ../src/usr/bin/diffuse:7633 msgid "New 3-Way File Merge" msgstr "Nuova unione a 3 file" -#: ../src/usr/bin/diffuse:8070 +#: ../src/usr/bin/diffuse:8165 msgid "New N-Way File Merge..." msgstr "Nuova unione a N file..." -#: ../src/usr/bin/diffuse:7447 +#: ../src/usr/bin/diffuse:7534 msgid "New _2-Way File Merge" msgstr "Nuova unione a _2 file" -#: ../src/usr/bin/diffuse:7448 +#: ../src/usr/bin/diffuse:7535 msgid "New _3-Way File Merge" msgstr "Nuova unione a _3 file" -#: ../src/usr/bin/diffuse:7449 +#: ../src/usr/bin/diffuse:7536 msgid "New _N-Way File Merge..." msgstr "Nuova unione a _N file" -#: ../src/usr/bin/diffuse:7551 +#: ../src/usr/bin/diffuse:7638 msgid "Next Difference" msgstr "Differenza successiva" -#: ../src/usr/bin/diffuse:7495 +#: ../src/usr/bin/diffuse:7582 msgid "Next _Tab" msgstr "Scheda su_ccessiva" -#: ../src/usr/bin/diffuse:8034 +#: ../src/usr/bin/diffuse:8129 msgid "No committed files found." msgstr "Non sono stati trovati file di cui è stato eseguito il commit." -#: ../src/usr/bin/diffuse:8014 +#: ../src/usr/bin/diffuse:8109 msgid "No modified files found." msgstr "Non sono stati trovati file modificati." -#: ../src/usr/bin/diffuse:7474 +#: ../src/usr/bin/diffuse:7561 msgid "None" msgstr "Nessuna" -#: ../src/usr/bin/diffuse:8070 +#: ../src/usr/bin/diffuse:8165 msgid "Number of panes: " msgstr "Numero di riquadri" -#: ../src/usr/bin/diffuse:7440 +#: ../src/usr/bin/diffuse:7527 msgid "Open Commi_t..." msgstr "Apri c_ommit..." -#: ../src/usr/bin/diffuse:7130 +#: ../src/usr/bin/diffuse:7209 msgid "Open File" msgstr "Apertura file" -#: ../src/usr/bin/diffuse:7985 +#: ../src/usr/bin/diffuse:8080 msgid "Open File In New Tab" msgstr "Apre ilo file in una nuova scheda" -#: ../src/usr/bin/diffuse:7438 +#: ../src/usr/bin/diffuse:7525 msgid "Open File In New _Tab..." msgstr "Apri file in una nuova sc_heda..." -#: ../src/usr/bin/diffuse:6829 +#: ../src/usr/bin/diffuse:6908 msgid "Open File..." msgstr "Apri file..." -#: ../src/usr/bin/diffuse:7439 +#: ../src/usr/bin/diffuse:7526 msgid "Open _Modified Files..." msgstr "Apri file _modificati..." -#: ../src/usr/bin/diffuse:858 +#: ../src/usr/bin/diffuse:866 msgid "Order of codecs used to identify encoding" msgstr "Ordine dei codici utilizzati per identificare la codifica" -#: ../src/usr/bin/diffuse:7696 +#: ../src/usr/bin/diffuse:7791 msgid "Pane" msgstr "Riquadro" -#: ../src/usr/bin/diffuse:4743 ../src/usr/bin/diffuse:7565 +#: ../src/usr/bin/diffuse:4826 ../src/usr/bin/diffuse:7652 msgid "Paste" msgstr "Incolla" -#: ../src/usr/bin/diffuse:8135 +#: ../src/usr/bin/diffuse:8230 msgid "Phrase not found. Continue from the end of the file?" msgstr "Frase non trovata. Continuare dalla fine del file?" -#: ../src/usr/bin/diffuse:8137 +#: ../src/usr/bin/diffuse:8232 msgid "Phrase not found. Continue from the start of the file?" msgstr "Frase non trovata. Continuare dall'inizio del file?" -#: ../src/usr/bin/diffuse:7472 +#: ../src/usr/bin/diffuse:7559 msgid "Pr_eferences..." msgstr "Pr_eferenze..." -#: ../src/usr/bin/diffuse:7494 +#: ../src/usr/bin/diffuse:7581 msgid "Pre_vious Tab" msgstr "Scheda pr_ecedente" -#: ../src/usr/bin/diffuse:975 +#: ../src/usr/bin/diffuse:986 msgid "Preferences" msgstr "Preferenze" -#: ../src/usr/bin/diffuse:7332 -msgid "" -"Press the enter key or double click to edit. Press the space bar or use the " -"RMB menu to manually align." -msgstr "" -"Premere il tasto \"Invio\" o fare doppio clic per modificare. Premere " -"\"spazio\" o usare il tasto destro del mouse per allineare manualmente." +#: ../src/usr/bin/diffuse:7411 +msgid "Press the enter key or double click to edit. Press the space bar or use the RMB menu to manually align." +msgstr "Premere il tasto \"Invio\" o fare doppio clic per modificare. Premere \"spazio\" o usare il tasto destro del mouse per allineare manualmente." -#: ../src/usr/bin/diffuse:7334 +#: ../src/usr/bin/diffuse:7413 msgid "Press the escape key to finish editing." msgstr "Premere il tasto \"Esc\" per terminare le modifiche" -#: ../src/usr/bin/diffuse:7550 +#: ../src/usr/bin/diffuse:7637 msgid "Previous Difference" msgstr "Differenza precedente" -#: ../src/usr/bin/diffuse:7485 +#: ../src/usr/bin/diffuse:7572 msgid "Re_align All" msgstr "Ria_llinea tutti" -#: ../src/usr/bin/diffuse:7548 +#: ../src/usr/bin/diffuse:7635 msgid "Realign All" msgstr "Riallinea tutti" -#: ../src/usr/bin/diffuse:7562 +#: ../src/usr/bin/diffuse:7649 msgid "Redo" msgstr "Ripeti" -#: ../src/usr/bin/diffuse:855 +#: ../src/usr/bin/diffuse:863 msgid "Regional Settings" msgstr "Impostazioni regionali" -#: ../src/usr/bin/diffuse:6830 +#: ../src/usr/bin/diffuse:6909 msgid "Reload File" msgstr "Ricarica file" -#: ../src/usr/bin/diffuse:7508 +#: ../src/usr/bin/diffuse:7595 msgid "Remove Trailing _White Space" msgstr "Rimuovi gli spazi _vuoti alla fine della riga" -#: ../src/usr/bin/diffuse:6669 +#: ../src/usr/bin/diffuse:6746 msgid "Revision: " msgstr "Revisione: " -#: ../src/usr/bin/diffuse:826 +#: ../src/usr/bin/diffuse:834 msgid "Right margin" msgstr "Margine destro" -#: ../src/usr/bin/diffuse:880 +#: ../src/usr/bin/diffuse:888 msgid "Root directory" msgstr "Cartella radice" -#: ../src/usr/bin/diffuse:7200 +#: ../src/usr/bin/diffuse:7279 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "Salva %(title)s riquadro %(pane)d" -#: ../src/usr/bin/diffuse:7445 +#: ../src/usr/bin/diffuse:7532 msgid "Save A_ll" msgstr "Salva _tutti" -#: ../src/usr/bin/diffuse:6831 +#: ../src/usr/bin/diffuse:6910 msgid "Save File" msgstr "Salva file" -#: ../src/usr/bin/diffuse:6832 +#: ../src/usr/bin/diffuse:6911 msgid "Save File As..." msgstr "Salva con nome..." -#: ../src/usr/bin/diffuse:7444 +#: ../src/usr/bin/diffuse:7531 msgid "Save File _As..." msgstr "S_alva con nome..." -#: ../src/usr/bin/diffuse:6977 +#: ../src/usr/bin/diffuse:7056 msgid "Save changes before loading the new file?" msgstr "Salvare i cambiamenti prima di caricare il nuovo file?" -#: ../src/usr/bin/diffuse:6633 +#: ../src/usr/bin/diffuse:6700 msgid "Search Backwards" msgstr "Cerca all'indietro" -#: ../src/usr/bin/diffuse:6603 +#: ../src/usr/bin/diffuse:6670 msgid "Search For: " msgstr "Cerca: " -#: ../src/usr/bin/diffuse:4745 +#: ../src/usr/bin/diffuse:4828 msgid "Select All" msgstr "Seleziona tutto" -#: ../src/usr/bin/diffuse:7463 +#: ../src/usr/bin/diffuse:7550 msgid "Select _All" msgstr "Selezion_a tutto" -#: ../src/usr/bin/diffuse:7336 -msgid "" -"Select target line and press the space bar to align. Press the escape key " -"to cancel." -msgstr "" -"Selezionare la riga di destinazione e premere spazio per allineare. Premere " -"\"Esc\" per annullare." +#: ../src/usr/bin/diffuse:7415 +msgid "Select target line and press the space bar to align. Press the escape key to cancel." +msgstr "Selezionare la riga di destinazione e premere spazio per allineare. Premere \"Esc\" per annullare." -#: ../src/usr/bin/diffuse:7499 +#: ../src/usr/bin/diffuse:7586 msgid "Shift Pane _Left" msgstr "Sposta riquadro a _sinistra" -#: ../src/usr/bin/diffuse:7498 +#: ../src/usr/bin/diffuse:7585 msgid "Shift Pane _Right" msgstr "Sposta riquadro a _destra" -#: ../src/usr/bin/diffuse:827 +#: ../src/usr/bin/diffuse:835 msgid "Show line numbers" msgstr "Mostra i numeri di riga" -#: ../src/usr/bin/diffuse:825 +#: ../src/usr/bin/diffuse:833 msgid "Show right margin" msgstr "Mostra margine destro" -#: ../src/usr/bin/diffuse:828 +#: ../src/usr/bin/diffuse:836 msgid "Show white space characters" msgstr "Mostra i caratteri di spaziatura" -#: ../src/usr/bin/diffuse:8409 +#: ../src/usr/bin/diffuse:8508 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "L'argomento sconosciuto \"%s\" verrà tralasciato" -#: ../src/usr/bin/diffuse:847 +#: ../src/usr/bin/diffuse:855 msgid "Soft tab width" msgstr "Larghezza scheda" -#: ../src/usr/bin/diffuse:7678 -msgid "" -"Some files have unsaved changes. Select the files to save before closing." -msgstr "" -"Alcune modifiche ai file non sono ancora state salvate. Selezionare i file " -"da salvare prima di uscire." +#: ../src/usr/bin/diffuse:7773 +msgid "Some files have unsaved changes. Select the files to save before closing." +msgstr "Alcune modifiche ai file non sono ancora state salvate. Selezionare i file da salvare prima di uscire." -#: ../src/usr/bin/diffuse:7506 +#: ../src/usr/bin/diffuse:7593 msgid "Sort Lines In D_escending Order" msgstr "Disponi le righe in ordine _discendente" -#: ../src/usr/bin/diffuse:7505 +#: ../src/usr/bin/diffuse:7592 msgid "Sort Lines In _Ascending Order" msgstr "Disponi le righe in ordine a_scendente" -#: ../src/usr/bin/diffuse:4748 +#: ../src/usr/bin/diffuse:4831 msgid "Swap with Selected Pane" msgstr "Scambia con il riquadro selezionato" -#: ../src/usr/bin/diffuse:7691 +#: ../src/usr/bin/diffuse:7786 msgid "Tab" msgstr "Scheda" -#: ../src/usr/bin/diffuse:824 +#: ../src/usr/bin/diffuse:832 msgid "Tab width" msgstr "Larghezza scheda" -#: ../src/usr/bin/diffuse:849 +#: ../src/usr/bin/diffuse:857 msgid "Tabs" msgstr "Schede" -#: ../src/usr/bin/diffuse:7180 +#: ../src/usr/bin/diffuse:7259 #, python-format msgid "The file %s changed on disk. Do you want to reload the file?" msgstr "Il file «%s» è cambiato sul disco. Ricaricarlo?" -#: ../src/usr/bin/diffuse:7231 +#: ../src/usr/bin/diffuse:7310 #, python-format -msgid "" -"The file %s has been modified by another process since reading it. If you " -"save, all the external changes could be lost. Save anyways?" -msgstr "" -"Il file «%s» è stato modificato da un'altro processo dopo la lettura. Se si " -"salva, tutte le modifiche esterne potrebbero essere perdute. Salvare " -"comunque?" +msgid "The file %s has been modified by another process since reading it. If you save, all the external changes could be lost. Save anyways?" +msgstr "Il file «%s» è stato modificato da un'altro processo dopo la lettura. Se si salva, tutte le modifiche esterne potrebbero essere perdute. Salvare comunque?" -#: ../src/usr/bin/diffuse:6740 +#: ../src/usr/bin/diffuse:6818 msgid "" -"This program is free software; you can redistribute it and/or modify it " -"under the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the licence, or (at your option) " -"any later version.\n" +"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n" "\n" -"This program is distributed in the hope that it will be useful, but WITHOUT " -"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " -"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for " -"more details.\n" +"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n" "\n" -"You should have received a copy of the GNU General Public License along with " -"this program. You may also obtain a copy of the GNU General Public License " -"from the Free Software Foundation by visiting their web site (http://www.fsf." -"org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, " -"Fifth Floor, Boston, MA 02110-1301 USA\n" +"You should have received a copy of the GNU General Public License along with this program. You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n" msgstr "" -"This program is free software; you can redistribute it and/or modify it " -"under the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the licence, or (at your option) " -"any later version.\n" +"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n" "\n" -"This program is distributed in the hope that it will be useful, but WITHOUT " -"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " -"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for " -"more details.\n" +"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n" "\n" -"You should have received a copy of the GNU General Public License along with " -"this program. You may also obtain a copy of the GNU General Public License " -"from the Free Software Foundation by visiting their web site (http://www.fsf." -"org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, " -"Fifth Floor, Boston, MA 02110-1301 USA\n" +"You should have received a copy of the GNU General Public License along with this program. You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n" -#: ../src/usr/bin/diffuse:7561 +#: ../src/usr/bin/diffuse:7648 msgid "Undo" msgstr "Annulla" -#: ../src/usr/bin/diffuse:908 +#: ../src/usr/bin/diffuse:918 msgid "Update paths for Cygwin" msgstr "Aggiorna i percorsi per Cygwin" -#: ../src/usr/bin/diffuse:86 +#: ../src/usr/bin/diffuse:81 msgid "" "Usage:\n" " diffuse [ [OPTION...] [FILE...] ]...\n" " diffuse ( -h | -? | --help | -v | --version )\n" "\n" -"Diffuse is a graphical tool for merging and comparing text files. Diffuse " -"is\n" -"able to compare an arbitrary number of files side-by-side and gives users " -"the\n" -"ability to manually adjust line matching and directly edit files. Diffuse " -"can\n" +"Diffuse is a graphical tool for merging and comparing text files. Diffuse is\n" +"able to compare an arbitrary number of files side-by-side and gives users the\n" +"ability to manually adjust line matching and directly edit files. Diffuse can\n" "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n" "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n" "\n" "Help Options:\n" " ( -h | -? | --help ) Display this usage information\n" -" ( -v | --version ) Display version and copyright " -"information\n" +" ( -v | --version ) Display version and copyright information\n" "\n" "Configuration Options:\n" " --no-rcfile Do not read any resource files\n" @@ -735,6 +682,7 @@ msgid "" " ( -r | --revision ) File revision \n" " ( -s | --separate ) Create a new tab for each file\n" " ( -t | --tab ) Start a new tab\n" +" ( -V | --vcs ) Version control system search order\n" " --line Start with line selected\n" " --null-file Create a blank file comparison pane\n" "\n" @@ -749,13 +697,10 @@ msgstr "" " diffuse [ [OPZIONE...] [FILE...] ]...\n" " diffuse ( -h | -? | --help | -v | --version )\n" "\n" -"Diffuse è uno strumento grafico per l'unione e il confronto di file di " -"testo.\n" -"Diffuse è in grado di confrontare uno a fianco dell'altro un qualsiasi " -"numero\n" +"Diffuse è uno strumento grafico per l'unione e il confronto di file di testo.\n" +"Diffuse è in grado di confrontare uno a fianco dell'altro un qualsiasi numero\n" "di file e fornisce all'utente la possibilità di correggere manualmente la\n" -"corrispondenza fra le righe e di modificare i file. Diffuse è anche in " -"grado\n" +"corrispondenza fra le righe e di modificare i file. Diffuse è anche in grado\n" "di recuperare le revisioni dei file dai repository Bazaar, CVS, Darcs, Git,\n" "Mercurial, Monotone, RCS, Subversion e SVK per confrontarle e unirle.\n" "\n" @@ -770,15 +715,13 @@ msgstr "" "Opzioni generali:\n" " ( -c | --commit ) Revisioni file e \n" " ( -D | --close-if-same ) Chiude tutte le schede senza differenze\n" -" ( -e | --encoding ) Usa per leggere e scrivere i " -"file\n" -" ( -L | --label ) Visualizza invece del nome " -"del file\n" -" ( -m | --modified ) Crea una nuova scheda per ogni file " -"modificato\n" +" ( -e | --encoding ) Usa per leggere e scrivere i file\n" +" ( -L | --label ) Visualizza invece del nome del file\n" +" ( -m | --modified ) Crea una nuova scheda per ogni file modificato\n" " ( -r | --revision ) Revisione file \n" " ( -s | --separate ) Crea una nuova scheda per ogni file\n" " ( -t | --tab ) Apre una nuova scheda\n" +" ( -V | --vcs ) Version control system search order\n" " --line Inizia con la selezionata\n" " --null-file Crea un riquadro di comparazione vuoto\n" "\n" @@ -786,132 +729,139 @@ msgstr "" " ( -b | --ignore-space-change ) Ignora le modifiche agli spazi vuoti\n" " ( -B | --ignore-blank-lines ) Ignora le modifiche alle righe vuote\n" " ( -E | --ignore-end-of-line ) Ignora le differenze di fine riga\n" -" ( -i | --ignore-case ) Ignora differenze tra MAIUSCOLE/" -"minuscole\n" +" ( -i | --ignore-case ) Ignora differenze tra MAIUSCOLE/minuscole\n" " ( -w | --ignore-all-space ) Ignora le differenze tra spazi vuoti" -#: ../src/usr/bin/diffuse:911 +#: ../src/usr/bin/diffuse:922 msgid "Version Control" msgstr "Controllo di versione" -#: ../src/usr/bin/diffuse:853 +#: ../src/usr/bin/diffuse:905 +msgid "Version control system search order" +msgstr "" + +#: ../src/usr/bin/diffuse:861 #, python-format msgid "Warn me when closing a tab will quit %s" msgstr "Avvisami se chiudendo una scheda anche %s verrà chiuso" -#: ../src/usr/bin/diffuse:7531 +#: ../src/usr/bin/diffuse:7618 #, python-format msgid "_About %s..." msgstr "I_nformazioni su %s" -#: ../src/usr/bin/diffuse:7451 +#: ../src/usr/bin/diffuse:7538 msgid "_Close Tab" msgstr "_Chiudi scheda" -#: ../src/usr/bin/diffuse:7460 +#: ../src/usr/bin/diffuse:7547 msgid "_Copy" msgstr "_Copia" -#: ../src/usr/bin/diffuse:7465 +#: ../src/usr/bin/diffuse:7552 msgid "_Dismiss All Edits" msgstr "Scarta tutte le mo_difiche" -#: ../src/usr/bin/diffuse:7455 +#: ../src/usr/bin/diffuse:7542 msgid "_Edit" msgstr "_Modifica" -#: ../src/usr/bin/diffuse:7436 +#: ../src/usr/bin/diffuse:7523 msgid "_File" msgstr "_File" -#: ../src/usr/bin/diffuse:7467 +#: ../src/usr/bin/diffuse:7554 msgid "_Find..." msgstr "Tr_ova..." -#: ../src/usr/bin/diffuse:7488 +#: ../src/usr/bin/diffuse:7575 msgid "_First Difference" msgstr "_Prima differenza" -#: ../src/usr/bin/diffuse:7470 +#: ../src/usr/bin/diffuse:7557 msgid "_Go To Line..." msgstr "_Vai alla riga..." -#: ../src/usr/bin/diffuse:7528 +#: ../src/usr/bin/diffuse:7615 msgid "_Help" msgstr "A_iuto" -#: ../src/usr/bin/diffuse:7529 +#: ../src/usr/bin/diffuse:7616 msgid "_Help Contents..." msgstr "_Sommario" -#: ../src/usr/bin/diffuse:7512 +#: ../src/usr/bin/diffuse:7599 msgid "_Increase Indenting" msgstr "Au_menta indentazione" -#: ../src/usr/bin/diffuse:7486 +#: ../src/usr/bin/diffuse:7573 msgid "_Isolate" msgstr "_Isola" -#: ../src/usr/bin/diffuse:7491 +#: ../src/usr/bin/diffuse:7578 msgid "_Last Difference" msgstr "Ulti_ma differenza" -#: ../src/usr/bin/diffuse:7519 +#: ../src/usr/bin/diffuse:7606 msgid "_Merge" msgstr "_Unione" -#: ../src/usr/bin/diffuse:7525 +#: ../src/usr/bin/diffuse:7612 msgid "_Merge From Left Then Right" msgstr "_Unisci sinistra poi destra" -#: ../src/usr/bin/diffuse:7490 +#: ../src/usr/bin/diffuse:7577 msgid "_Next Difference" msgstr "Differenza s_uccessiva" -#: ../src/usr/bin/diffuse:7437 +#: ../src/usr/bin/diffuse:7524 msgid "_Open File..." msgstr "_Apri file" -#: ../src/usr/bin/diffuse:7461 +#: ../src/usr/bin/diffuse:7548 msgid "_Paste" msgstr "_Incolla" -#: ../src/usr/bin/diffuse:7489 +#: ../src/usr/bin/diffuse:7576 msgid "_Previous Difference" msgstr "Differenza p_recedente" -#: ../src/usr/bin/diffuse:7453 +#: ../src/usr/bin/diffuse:7540 msgid "_Quit" msgstr "_Esci" -#: ../src/usr/bin/diffuse:7457 +#: ../src/usr/bin/diffuse:7544 msgid "_Redo" msgstr "_Ripeti" -#: ../src/usr/bin/diffuse:7441 +#: ../src/usr/bin/diffuse:7528 msgid "_Reload File" msgstr "_Ricarica file" -#: ../src/usr/bin/diffuse:7443 +#: ../src/usr/bin/diffuse:7530 msgid "_Save File" msgstr "_Salva file" -#: ../src/usr/bin/diffuse:7483 +#: ../src/usr/bin/diffuse:7570 msgid "_Syntax Highlighting" msgstr "Si_ntassi" -#: ../src/usr/bin/diffuse:7456 +#: ../src/usr/bin/diffuse:7543 msgid "_Undo" msgstr "Ann_ulla" -#: ../src/usr/bin/diffuse:7452 +#: ../src/usr/bin/diffuse:7539 msgid "_Undo Close Tab" msgstr "Annulla chi_usura scheda" -#: ../src/usr/bin/diffuse:7482 +#: ../src/usr/bin/diffuse:7569 msgid "_View" msgstr "_Visualizza" -#: ../src/usr/bin/diffuse:6737 +#: ../src/usr/bin/diffuse:6815 msgid "translator-credits" msgstr "Cristian Marchi , 2011." + +#, python-format +#~ msgid "Column %d" +#~ msgstr "Colonna %d" diff --git a/translations/ja.po b/translations/ja.po index 5c73267..63adacb 100644 --- a/translations/ja.po +++ b/translations/ja.po @@ -7,718 +7,667 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn r316\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-09 19:39-0400\n" -"PO-Revision-Date: 2009-10-04 09:31-0400\n" +"POT-Creation-Date: 2020-06-29 14:49-0400\n" +"PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Derrick Moser \n" "Language-Team: Japanese\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../src/usr/bin/diffuse:901 +#: ../src/usr/bin/diffuse:911 msgid "\"co\" command" msgstr "co というコマンド" -#: ../src/usr/bin/diffuse:902 +#: ../src/usr/bin/diffuse:912 msgid "\"rlog\" command" msgstr "rlog というコマンド" -#: ../src/usr/bin/diffuse:7226 +#: ../src/usr/bin/diffuse:7305 #, python-format msgid "A file named %s already exists. Do you want to overwrite it?" msgstr "%s というファイルは既に存在しています。それを上書きしますか？" -#: ../src/usr/bin/diffuse:4737 +#: ../src/usr/bin/diffuse:4820 msgid "Align with Selection" msgstr "選択と整列" -#: ../src/usr/bin/diffuse:835 +#: ../src/usr/bin/diffuse:843 msgid "Alignment" msgstr "整列" -#: ../src/usr/bin/diffuse:852 +#: ../src/usr/bin/diffuse:860 msgid "Always show the tab bar" msgstr "常にタブバーを表示" -#: ../src/usr/bin/diffuse:725 +#: ../src/usr/bin/diffuse:733 msgid "Auto Detect" msgstr "自動検出" -#: ../src/usr/bin/diffuse:845 +#: ../src/usr/bin/diffuse:853 msgid "Auto indent" msgstr "自動インデント" -#: ../src/usr/bin/diffuse:7464 +#: ../src/usr/bin/diffuse:7551 msgid "C_lear Edits" msgstr "編集をクリア(_L)" -#: ../src/usr/bin/diffuse:8021 +#: ../src/usr/bin/diffuse:8116 msgid "Choose Folder With Commit" msgstr "コミットがあるフォルダを選択" -#: ../src/usr/bin/diffuse:8001 +#: ../src/usr/bin/diffuse:8096 msgid "Choose Folder With Modified Files" msgstr "変更なったファイルがあるフォルダを選択" -#: ../src/usr/bin/diffuse:4746 ../src/usr/bin/diffuse:7566 +#: ../src/usr/bin/diffuse:4829 ../src/usr/bin/diffuse:7653 msgid "Clear Edits" msgstr "編集をクリア" -#: ../src/usr/bin/diffuse:6774 +#: ../src/usr/bin/diffuse:6853 msgid "Close Tab" msgstr "タブを閉じる" -#: ../src/usr/bin/diffuse:7707 +#: ../src/usr/bin/diffuse:7802 msgid "Close _Without Saving" msgstr "保存せずに閉じる(_W)" -#: ../src/usr/bin/diffuse:6647 +#: ../src/usr/bin/diffuse:6714 #, python-format msgid "Closing this tab will quit %s." msgstr "このタブを閉じると、%sは終了します。" -#: ../src/usr/bin/diffuse:6912 -#, python-format -msgid "Column %d" -msgstr "%d列" - -#: ../src/usr/bin/diffuse:904 +#: ../src/usr/bin/diffuse:914 msgid "Command" msgstr "コマンド" -#: ../src/usr/bin/diffuse:7510 +#: ../src/usr/bin/diffuse:7597 msgid "Convert Leading Spaces To _Tabs" msgstr "先頭のスペースをタブに変換(_T)" -#: ../src/usr/bin/diffuse:7509 +#: ../src/usr/bin/diffuse:7596 msgid "Convert Tabs To _Spaces" msgstr "タブをスペースに変換(_S)" -#: ../src/usr/bin/diffuse:7517 +#: ../src/usr/bin/diffuse:7604 msgid "Convert To Uni_x Format" msgstr "Unix 形式に変換(_X)" -#: ../src/usr/bin/diffuse:7515 +#: ../src/usr/bin/diffuse:7602 msgid "Convert To _DOS Format" msgstr "DOS 形式に変換(_D)" -#: ../src/usr/bin/diffuse:7503 +#: ../src/usr/bin/diffuse:7590 msgid "Convert To _Lower Case" msgstr "小文字に変換(_L)" -#: ../src/usr/bin/diffuse:7516 +#: ../src/usr/bin/diffuse:7603 msgid "Convert To _Mac Format" msgstr "Mac 形式に変換(_M)" -#: ../src/usr/bin/diffuse:7502 +#: ../src/usr/bin/diffuse:7589 msgid "Convert To _Upper Case" msgstr "大文字に変換(_U)" -#: ../src/usr/bin/diffuse:4742 ../src/usr/bin/diffuse:7564 +#: ../src/usr/bin/diffuse:4825 ../src/usr/bin/diffuse:7651 msgid "Copy" msgstr "コピー" -#: ../src/usr/bin/diffuse:7556 +#: ../src/usr/bin/diffuse:7643 msgid "Copy Left Into Selection" msgstr "左から選択枠にコピー" -#: ../src/usr/bin/diffuse:7523 +#: ../src/usr/bin/diffuse:7610 msgid "Copy Left _Into Selection" msgstr "左から選択枠にコピー(_I)" -#: ../src/usr/bin/diffuse:7524 +#: ../src/usr/bin/diffuse:7611 msgid "Copy Right I_nto Selection" msgstr "右から選択枠にコピー(_N)" -#: ../src/usr/bin/diffuse:7557 +#: ../src/usr/bin/diffuse:7644 msgid "Copy Right Into Selection" msgstr "右から選択枠にコピー" -#: ../src/usr/bin/diffuse:7555 +#: ../src/usr/bin/diffuse:7642 msgid "Copy Selection Left" msgstr "選択を左にコピー" -#: ../src/usr/bin/diffuse:7554 +#: ../src/usr/bin/diffuse:7641 msgid "Copy Selection Right" msgstr "選択を右にコピー" -#: ../src/usr/bin/diffuse:7521 +#: ../src/usr/bin/diffuse:7608 msgid "Copy Selection _Left" msgstr "選択を左にコピー(_L)" -#: ../src/usr/bin/diffuse:7520 +#: ../src/usr/bin/diffuse:7607 msgid "Copy Selection _Right" msgstr "選択を右にコピー(_R)" -#: ../src/usr/bin/diffuse:68 -msgid "Copyright © 2006-2019 Derrick Moser" -"Copyright © 2015-2020 Romain Failliot" -msgstr "Copyright © 2006-2019 Derrick Moser" -"Copyright © 2015-2020 Romain Failliot" +#: ../src/usr/bin/diffuse:70 +msgid "Copyright" +msgstr "" -#: ../src/usr/bin/diffuse:7459 +#: ../src/usr/bin/diffuse:7546 msgid "Cu_t" msgstr "切り取り(_T)" -#: ../src/usr/bin/diffuse:4741 ../src/usr/bin/diffuse:7563 +#: ../src/usr/bin/diffuse:4824 ../src/usr/bin/diffuse:7650 msgid "Cut" msgstr "切り取り" -#: ../src/usr/bin/diffuse:881 +#: ../src/usr/bin/diffuse:889 msgid "Cygdrive prefix" msgstr "Cygdrive 接頭辞" -#: ../src/usr/bin/diffuse:878 +#: ../src/usr/bin/diffuse:886 msgid "Cygwin" msgstr "Cygwin" -#: ../src/usr/bin/diffuse:7513 +#: ../src/usr/bin/diffuse:7600 msgid "De_crease Indenting" msgstr "インデントを減らす(_C)" -#: ../src/usr/bin/diffuse:857 +#: ../src/usr/bin/diffuse:865 msgid "Default codec" msgstr "デフォルトのコーデック" -#: ../src/usr/bin/diffuse:851 +#: ../src/usr/bin/diffuse:859 msgid "Default panes" msgstr "枠のデフォルトの数" -#: ../src/usr/bin/diffuse:6736 -msgid "Derrick Moser " -msgstr "Derrick Moser " - -#: ../src/usr/bin/diffuse:6733 +#: ../src/usr/bin/diffuse:6810 msgid "Diffuse is a graphical tool for merging and comparing text files." -msgstr "" -"Diffuse は、テキストファイルをマージして比較するためのグラフィックツールで" -"す。" +msgstr "Diffuse は、テキストファイルをマージして比較するためのグラフィックツールです。" -#: ../src/usr/bin/diffuse:821 +#: ../src/usr/bin/diffuse:829 msgid "Display" msgstr "表示" -#: ../src/usr/bin/diffuse:843 +#: ../src/usr/bin/diffuse:851 msgid "Editor" msgstr "エディタ" -#: ../src/usr/bin/diffuse:6659 +#: ../src/usr/bin/diffuse:6736 msgid "Encoding: " msgstr "エンコーディング: " -#: ../src/usr/bin/diffuse:7272 +#: ../src/usr/bin/diffuse:7351 #, python-format msgid "Error encoding to %s." msgstr "%s に変える際にエラーが生じました。" -#: ../src/usr/bin/diffuse:2528 +#: ../src/usr/bin/diffuse:2657 #, python-format msgid "Error parsing %s." msgstr "%s をパースする際にエラーが生じました。" -#: ../src/usr/bin/diffuse:8399 +#: ../src/usr/bin/diffuse:8498 msgid "Error parsing line number." msgstr "行番号をパースする際にエラーが生じました。" -#: ../src/usr/bin/diffuse:1630 ../src/usr/bin/diffuse:2193 -#: ../src/usr/bin/diffuse:2321 +#: ../src/usr/bin/diffuse:1655 ../src/usr/bin/diffuse:2272 +#: ../src/usr/bin/diffuse:2416 #, python-format msgid "Error parsing revision %s." msgstr "%s というリビジョンをパースする際にエラーが生じました。" -#: ../src/usr/bin/diffuse:8416 +#: ../src/usr/bin/diffuse:8515 #, python-format msgid "Error processing argument \"%s\". Directory not expected." -msgstr "" -"%s の引数を処理しているときにエラーが生じました。ディレクトリは予測できません" -"でした。" +msgstr "%s の引数を処理しているときにエラーが生じました。ディレクトリは予測できませんでした。" -#: ../src/usr/bin/diffuse:706 +#: ../src/usr/bin/diffuse:714 #, python-format msgid "Error processing line %(line)d of %(file)s." msgstr "%(file)s の %(line)d行 を処理しているときにエラーが生じました。" -#: ../src/usr/bin/diffuse:7107 ../src/usr/bin/diffuse:8322 +#: ../src/usr/bin/diffuse:7186 ../src/usr/bin/diffuse:8417 #, python-format msgid "Error reading %s." msgstr "%s を読み込む際にエラーが生じました。" -#: ../src/usr/bin/diffuse:7105 +#: ../src/usr/bin/diffuse:7184 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "%(file)s の %(rev)s というリビジョンを読み込む際にエラーが生じました。" -#: ../src/usr/bin/diffuse:7921 +#: ../src/usr/bin/diffuse:8016 #, python-format msgid "Error retrieving commits for %s." msgstr "%s のコミットの取得中にエラーが生じました。" -#: ../src/usr/bin/diffuse:7952 +#: ../src/usr/bin/diffuse:8047 #, python-format msgid "Error retrieving modifications for %s." msgstr "%s の変更の取得中にエラーが生じました。" -#: ../src/usr/bin/diffuse:1013 ../src/usr/bin/diffuse:7276 +#: ../src/usr/bin/diffuse:1026 ../src/usr/bin/diffuse:7355 #, python-format msgid "Error writing %s." msgstr "%s へ書き込む際にエラーが生じました。" -#: ../src/usr/bin/diffuse:846 +#: ../src/usr/bin/diffuse:854 msgid "Expand tabs to spaces" msgstr "タブの代わりに空白を挿入" -#: ../src/usr/bin/diffuse:7501 +#: ../src/usr/bin/diffuse:7588 msgid "F_ormat" msgstr "フォーマット(_O)" -#: ../src/usr/bin/diffuse:7818 +#: ../src/usr/bin/diffuse:7913 #, python-format msgid "File Merge %d" msgstr "ファイルマージ%d" -#: ../src/usr/bin/diffuse:7469 +#: ../src/usr/bin/diffuse:7556 msgid "Find Pre_vious" msgstr "前の検索(_V)" -#: ../src/usr/bin/diffuse:7468 +#: ../src/usr/bin/diffuse:7555 msgid "Find _Next" msgstr "次の検索(_N)" -#: ../src/usr/bin/diffuse:6597 +#: ../src/usr/bin/diffuse:6662 msgid "Find..." msgstr "検索..." -#: ../src/usr/bin/diffuse:7493 +#: ../src/usr/bin/diffuse:7580 msgid "Fir_st Tab" msgstr "最初のタブ(_S)" -#: ../src/usr/bin/diffuse:7549 +#: ../src/usr/bin/diffuse:7636 msgid "First Difference" msgstr "最初の差分" -#: ../src/usr/bin/diffuse:823 +#: ../src/usr/bin/diffuse:831 msgid "Font" msgstr "フォント" -#: ../src/usr/bin/diffuse:7306 +#: ../src/usr/bin/diffuse:7385 msgid "Go To Line..." msgstr "指定行へジャンプ..." -#: ../src/usr/bin/diffuse:832 +#: ../src/usr/bin/diffuse:840 msgid "Ignore blank line differences" msgstr "空白行の違いを無視" -#: ../src/usr/bin/diffuse:840 +#: ../src/usr/bin/diffuse:848 msgid "Ignore blank lines" msgstr "空白行を無視" -#: ../src/usr/bin/diffuse:837 +#: ../src/usr/bin/diffuse:845 msgid "Ignore case" msgstr "大文字小文字を無視" -#: ../src/usr/bin/diffuse:829 +#: ../src/usr/bin/diffuse:837 msgid "Ignore case differences" msgstr "大文字小文字の違いを無視" -#: ../src/usr/bin/diffuse:831 ../src/usr/bin/diffuse:839 +#: ../src/usr/bin/diffuse:839 ../src/usr/bin/diffuse:847 msgid "Ignore changes to white space" msgstr "空白の変更を無視" -#: ../src/usr/bin/diffuse:841 +#: ../src/usr/bin/diffuse:849 msgid "Ignore end of line characters" msgstr "行の最後の文字を無視" -#: ../src/usr/bin/diffuse:833 +#: ../src/usr/bin/diffuse:841 msgid "Ignore end of line differences" msgstr "行の最後の違いを無視" -#: ../src/usr/bin/diffuse:838 +#: ../src/usr/bin/diffuse:846 msgid "Ignore white space" msgstr "空白を無視" -#: ../src/usr/bin/diffuse:830 +#: ../src/usr/bin/diffuse:838 msgid "Ignore white space differences" msgstr "空白の違いを無視" -#: ../src/usr/bin/diffuse:4738 +#: ../src/usr/bin/diffuse:4821 msgid "Isolate" msgstr "分離" -#: ../src/usr/bin/diffuse:7496 +#: ../src/usr/bin/diffuse:7583 msgid "Las_t Tab" msgstr "最後のタブ(_T)" -#: ../src/usr/bin/diffuse:7552 +#: ../src/usr/bin/diffuse:7639 msgid "Last Difference" msgstr "最後の差分" -#: ../src/usr/bin/diffuse:906 +#: ../src/usr/bin/diffuse:916 msgid "Launch from a Bash login shell" msgstr "Bashログインシェルから始める" -#: ../src/usr/bin/diffuse:7306 +#: ../src/usr/bin/diffuse:7385 msgid "Line Number: " msgstr "行番号: " -#: ../src/usr/bin/diffuse:7526 +#: ../src/usr/bin/diffuse:7613 msgid "M_erge From Right Then Left" msgstr "右からマージした後、左からマージ(_E)" -#: ../src/usr/bin/diffuse:6628 +#: ../src/usr/bin/diffuse:6695 msgid "Match Case" msgstr "大文字/小文字を区別" -#: ../src/usr/bin/diffuse:7558 +#: ../src/usr/bin/diffuse:7645 msgid "Merge From Left Then Right" msgstr "左からマージした後、右からマージ" -#: ../src/usr/bin/diffuse:7559 +#: ../src/usr/bin/diffuse:7646 msgid "Merge From Right Then Left" msgstr "右からマージした後、左からマージ" -#: ../src/usr/bin/diffuse:4739 +#: ../src/usr/bin/diffuse:4822 msgid "Merge Selection" msgstr "選択をマージ" -#: ../src/usr/bin/diffuse:7545 +#: ../src/usr/bin/diffuse:7632 msgid "New 2-Way File Merge" msgstr "新しい２つのファイルの比較" -#: ../src/usr/bin/diffuse:7546 +#: ../src/usr/bin/diffuse:7633 msgid "New 3-Way File Merge" msgstr "新しい３つのファイルの比較" -#: ../src/usr/bin/diffuse:8070 +#: ../src/usr/bin/diffuse:8165 msgid "New N-Way File Merge..." msgstr "新しい複数のファイルの比較..." -#: ../src/usr/bin/diffuse:7447 +#: ../src/usr/bin/diffuse:7534 msgid "New _2-Way File Merge" msgstr "新しい２つのファイルの比較(_2)" -#: ../src/usr/bin/diffuse:7448 +#: ../src/usr/bin/diffuse:7535 msgid "New _3-Way File Merge" msgstr "新しい３つのファイルの比較(_3)" -#: ../src/usr/bin/diffuse:7449 +#: ../src/usr/bin/diffuse:7536 msgid "New _N-Way File Merge..." msgstr "新しい複数のファイルの比較...(_N)" -#: ../src/usr/bin/diffuse:7551 +#: ../src/usr/bin/diffuse:7638 msgid "Next Difference" msgstr "次の差分" -#: ../src/usr/bin/diffuse:7495 +#: ../src/usr/bin/diffuse:7582 msgid "Next _Tab" msgstr "次のタブ(_T)" -#: ../src/usr/bin/diffuse:8034 +#: ../src/usr/bin/diffuse:8129 msgid "No committed files found." msgstr "コミットされたファイルが見つかりませんでした。" -#: ../src/usr/bin/diffuse:8014 +#: ../src/usr/bin/diffuse:8109 msgid "No modified files found." msgstr "変更なったファイルが見つかりませんでした。" -#: ../src/usr/bin/diffuse:7474 +#: ../src/usr/bin/diffuse:7561 msgid "None" msgstr "なし" -#: ../src/usr/bin/diffuse:8070 +#: ../src/usr/bin/diffuse:8165 msgid "Number of panes: " msgstr "枠の数: " -#: ../src/usr/bin/diffuse:7440 +#: ../src/usr/bin/diffuse:7527 msgid "Open Commi_t..." msgstr "コミットを開く...(_T)" -#: ../src/usr/bin/diffuse:7130 +#: ../src/usr/bin/diffuse:7209 msgid "Open File" msgstr "ファイルを開く" -#: ../src/usr/bin/diffuse:7985 +#: ../src/usr/bin/diffuse:8080 msgid "Open File In New Tab" msgstr "新しいタブにファイルを開く" -#: ../src/usr/bin/diffuse:7438 +#: ../src/usr/bin/diffuse:7525 msgid "Open File In New _Tab..." msgstr "新しいタブにファイルを開く...(_T)" -#: ../src/usr/bin/diffuse:6829 +#: ../src/usr/bin/diffuse:6908 msgid "Open File..." msgstr "ファイルを開く..." -#: ../src/usr/bin/diffuse:7439 +#: ../src/usr/bin/diffuse:7526 msgid "Open _Modified Files..." msgstr "変更のあるファイルを開く...(_M)" -#: ../src/usr/bin/diffuse:858 +#: ../src/usr/bin/diffuse:866 msgid "Order of codecs used to identify encoding" msgstr "エンコーディングを特定するためのコーデックの優先順位" -#: ../src/usr/bin/diffuse:7696 +#: ../src/usr/bin/diffuse:7791 msgid "Pane" msgstr "枠" -#: ../src/usr/bin/diffuse:4743 ../src/usr/bin/diffuse:7565 +#: ../src/usr/bin/diffuse:4826 ../src/usr/bin/diffuse:7652 msgid "Paste" msgstr "貼り付け" -#: ../src/usr/bin/diffuse:8135 +#: ../src/usr/bin/diffuse:8230 msgid "Phrase not found. Continue from the end of the file?" msgstr "文字列が見つかりませんでした。ファイルの終わりから続けますか。" -#: ../src/usr/bin/diffuse:8137 +#: ../src/usr/bin/diffuse:8232 msgid "Phrase not found. Continue from the start of the file?" msgstr "文字列が見つかりませんでした。ファイルの始めから続けますか。" -#: ../src/usr/bin/diffuse:7472 +#: ../src/usr/bin/diffuse:7559 msgid "Pr_eferences..." msgstr "設定...(_E)" -#: ../src/usr/bin/diffuse:7494 +#: ../src/usr/bin/diffuse:7581 msgid "Pre_vious Tab" msgstr "前のタブ(_V)" -#: ../src/usr/bin/diffuse:975 +#: ../src/usr/bin/diffuse:986 msgid "Preferences" msgstr "設定" -#: ../src/usr/bin/diffuse:7332 -msgid "" -"Press the enter key or double click to edit. Press the space bar or use the " -"RMB menu to manually align." -msgstr "" -"編集するためにエンターキーを押すか、ダブルクリックします。手動で整列させるた" -"めにスペースバーを押すか、RMBを使います。" +#: ../src/usr/bin/diffuse:7411 +msgid "Press the enter key or double click to edit. Press the space bar or use the RMB menu to manually align." +msgstr "編集するためにエンターキーを押すか、ダブルクリックします。手動で整列させるためにスペースバーを押すか、RMBを使います。" -#: ../src/usr/bin/diffuse:7334 +#: ../src/usr/bin/diffuse:7413 msgid "Press the escape key to finish editing." msgstr "ESCキーを押して、編集を終了します。" -#: ../src/usr/bin/diffuse:7550 +#: ../src/usr/bin/diffuse:7637 msgid "Previous Difference" msgstr "前の差分" -#: ../src/usr/bin/diffuse:7485 +#: ../src/usr/bin/diffuse:7572 msgid "Re_align All" msgstr "全て再整列(_A)" -#: ../src/usr/bin/diffuse:7548 +#: ../src/usr/bin/diffuse:7635 msgid "Realign All" msgstr "全て再整列" -#: ../src/usr/bin/diffuse:7562 +#: ../src/usr/bin/diffuse:7649 msgid "Redo" msgstr "やり直す" -#: ../src/usr/bin/diffuse:855 +#: ../src/usr/bin/diffuse:863 msgid "Regional Settings" msgstr "地域設定" -#: ../src/usr/bin/diffuse:6830 +#: ../src/usr/bin/diffuse:6909 msgid "Reload File" msgstr "ファイルを再読込み" -#: ../src/usr/bin/diffuse:7508 +#: ../src/usr/bin/diffuse:7595 msgid "Remove Trailing _White Space" msgstr "末尾の空白を削除(_W)" -#: ../src/usr/bin/diffuse:6669 +#: ../src/usr/bin/diffuse:6746 msgid "Revision: " msgstr "リビジョン: " -#: ../src/usr/bin/diffuse:826 +#: ../src/usr/bin/diffuse:834 msgid "Right margin" msgstr "右マージン" -#: ../src/usr/bin/diffuse:880 +#: ../src/usr/bin/diffuse:888 msgid "Root directory" msgstr "ルートディレクトリ" -#: ../src/usr/bin/diffuse:7200 +#: ../src/usr/bin/diffuse:7279 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "%(title)s の%(pane)d番目の枠を保存" -#: ../src/usr/bin/diffuse:7445 +#: ../src/usr/bin/diffuse:7532 msgid "Save A_ll" msgstr "全て保存(_L)" -#: ../src/usr/bin/diffuse:6831 +#: ../src/usr/bin/diffuse:6910 msgid "Save File" msgstr "ファイルを保存" -#: ../src/usr/bin/diffuse:6832 +#: ../src/usr/bin/diffuse:6911 msgid "Save File As..." msgstr "ファイルとして保存..." -#: ../src/usr/bin/diffuse:7444 +#: ../src/usr/bin/diffuse:7531 msgid "Save File _As..." msgstr "ファイルとして保存...(_A)" -#: ../src/usr/bin/diffuse:6977 +#: ../src/usr/bin/diffuse:7056 msgid "Save changes before loading the new file?" msgstr "新しいファイルをロードする前に、変更したデータを保存しますか？" -#: ../src/usr/bin/diffuse:6633 +#: ../src/usr/bin/diffuse:6700 msgid "Search Backwards" msgstr "先頭に向かって検索" -#: ../src/usr/bin/diffuse:6603 +#: ../src/usr/bin/diffuse:6670 msgid "Search For: " msgstr "検索する文字列: " -#: ../src/usr/bin/diffuse:4745 +#: ../src/usr/bin/diffuse:4828 msgid "Select All" msgstr "全て選択" -#: ../src/usr/bin/diffuse:7463 +#: ../src/usr/bin/diffuse:7550 msgid "Select _All" msgstr "全て選択(_A)" -#: ../src/usr/bin/diffuse:7336 -msgid "" -"Select target line and press the space bar to align. Press the escape key " -"to cancel." -msgstr "" -"目標行を選択してスペースバーを押すと整列します。取り消す場合は、ESCキーを押し" -"ます。" +#: ../src/usr/bin/diffuse:7415 +msgid "Select target line and press the space bar to align. Press the escape key to cancel." +msgstr "目標行を選択してスペースバーを押すと整列します。取り消す場合は、ESCキーを押します。" -#: ../src/usr/bin/diffuse:7499 +#: ../src/usr/bin/diffuse:7586 msgid "Shift Pane _Left" msgstr "枠を左に動かす(_L)" -#: ../src/usr/bin/diffuse:7498 +#: ../src/usr/bin/diffuse:7585 msgid "Shift Pane _Right" msgstr "枠を右に動かす(_R)" -#: ../src/usr/bin/diffuse:827 +#: ../src/usr/bin/diffuse:835 msgid "Show line numbers" msgstr "行番号を表示" -#: ../src/usr/bin/diffuse:825 +#: ../src/usr/bin/diffuse:833 msgid "Show right margin" msgstr "右マージンを表示" -#: ../src/usr/bin/diffuse:828 +#: ../src/usr/bin/diffuse:836 msgid "Show white space characters" msgstr "空白文字を表示" -#: ../src/usr/bin/diffuse:8409 +#: ../src/usr/bin/diffuse:8508 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "未知の引数「%s」を飛ばします。" -#: ../src/usr/bin/diffuse:847 +#: ../src/usr/bin/diffuse:855 msgid "Soft tab width" msgstr "ソフトタブの幅" -#: ../src/usr/bin/diffuse:7678 -msgid "" -"Some files have unsaved changes. Select the files to save before closing." -msgstr "" -"変更が保存されていないファイルがあります。終了前に保存するファイルを選択しま" -"す。" +#: ../src/usr/bin/diffuse:7773 +msgid "Some files have unsaved changes. Select the files to save before closing." +msgstr "変更が保存されていないファイルがあります。終了前に保存するファイルを選択します。" -#: ../src/usr/bin/diffuse:7506 +#: ../src/usr/bin/diffuse:7593 msgid "Sort Lines In D_escending Order" msgstr "行を降順に並べる(_E)" -#: ../src/usr/bin/diffuse:7505 +#: ../src/usr/bin/diffuse:7592 msgid "Sort Lines In _Ascending Order" msgstr "行を昇順に並べる(_A)" -#: ../src/usr/bin/diffuse:4748 +#: ../src/usr/bin/diffuse:4831 msgid "Swap with Selected Pane" msgstr "選択された枠と交換" -#: ../src/usr/bin/diffuse:7691 +#: ../src/usr/bin/diffuse:7786 msgid "Tab" msgstr "タブ" -#: ../src/usr/bin/diffuse:824 +#: ../src/usr/bin/diffuse:832 msgid "Tab width" msgstr "タブの幅" -#: ../src/usr/bin/diffuse:849 +#: ../src/usr/bin/diffuse:857 msgid "Tabs" msgstr "タブ" -#: ../src/usr/bin/diffuse:7180 +#: ../src/usr/bin/diffuse:7259 #, python-format msgid "The file %s changed on disk. Do you want to reload the file?" msgstr "ファイル %s が変更されたようです。 そのファイルを再読み込みしますか？" -#: ../src/usr/bin/diffuse:7231 +#: ../src/usr/bin/diffuse:7310 #, python-format -msgid "" -"The file %s has been modified by another process since reading it. If you " -"save, all the external changes could be lost. Save anyways?" -msgstr "" -"ファイル %s は、変更されています。保存する場合は、これらの変更が失われること" -"があります。保存しますか?" +msgid "The file %s has been modified by another process since reading it. If you save, all the external changes could be lost. Save anyways?" +msgstr "ファイル %s は、変更されています。保存する場合は、これらの変更が失われることがあります。保存しますか?" -#: ../src/usr/bin/diffuse:6740 +#: ../src/usr/bin/diffuse:6818 msgid "" -"This program is free software; you can redistribute it and/or modify it " -"under the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the licence, or (at your option) " -"any later version.\n" +"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n" "\n" -"This program is distributed in the hope that it will be useful, but WITHOUT " -"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " -"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for " -"more details.\n" +"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n" "\n" -"You should have received a copy of the GNU General Public License along with " -"this program. You may also obtain a copy of the GNU General Public License " -"from the Free Software Foundation by visiting their web site (http://www.fsf." -"org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, " -"Fifth Floor, Boston, MA 02110-1301 USA\n" +"You should have received a copy of the GNU General Public License along with this program. You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n" msgstr "" -"このプログラムはフリーソフトウェアです。あなたはこれを、フリーソフトウェア財" -"団によって発行された GNU 一般公衆利用許諾契約書(バージョン2か、希望によっては" -"それ以降のバージョンのうちどれか)の定める条件の下で再頒布または改変することが" -"できます。\n" +"このプログラムはフリーソフトウェアです。あなたはこれを、フリーソフトウェア財団によって発行された GNU 一般公衆利用許諾契約書(バージョン2か、希望によってはそれ以降のバージョンのうちどれか)の定める条件の下で再頒布または改変することができます。\n" "\n" -"このプログラムは有用であることを願って頒布されますが、*全くの無保証*です。商" -"業可能性の保証や特定の目的への適合性は、言外に示されたものも含め全く存在しま" -"せん。詳しくはGNU 一般公衆利用許諾契約書をご覧ください。\n" +"このプログラムは有用であることを願って頒布されますが、*全くの無保証*です。商業可能性の保証や特定の目的への適合性は、言外に示されたものも含め全く存在しません。詳しくはGNU 一般公衆利用許諾契約書をご覧ください。\n" "\n" -"あなたはこのプログラムと共に、GNU 一般公衆利用許諾契約書の複製物を一部受け" -"取ったはずです。もし受け取っていなければ、フリーソフトウェア財団まで請求して" -"ください(宛先は the Free Software Foundation, Inc., 59 Temple Place, Suite " -"330, Boston, MA 02111-1307 USA)。\n" +"あなたはこのプログラムと共に、GNU 一般公衆利用許諾契約書の複製物を一部受け取ったはずです。もし受け取っていなければ、フリーソフトウェア財団まで請求してください(宛先は the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA)。\n" -#: ../src/usr/bin/diffuse:7561 +#: ../src/usr/bin/diffuse:7648 msgid "Undo" msgstr "元に戻す" -#: ../src/usr/bin/diffuse:908 +#: ../src/usr/bin/diffuse:918 msgid "Update paths for Cygwin" msgstr "Cygwin のためにパスを更新" -#: ../src/usr/bin/diffuse:86 +#: ../src/usr/bin/diffuse:81 msgid "" "Usage:\n" " diffuse [ [OPTION...] [FILE...] ]...\n" " diffuse ( -h | -? | --help | -v | --version )\n" "\n" -"Diffuse is a graphical tool for merging and comparing text files. Diffuse " -"is\n" -"able to compare an arbitrary number of files side-by-side and gives users " -"the\n" -"ability to manually adjust line matching and directly edit files. Diffuse " -"can\n" +"Diffuse is a graphical tool for merging and comparing text files. Diffuse is\n" +"able to compare an arbitrary number of files side-by-side and gives users the\n" +"ability to manually adjust line matching and directly edit files. Diffuse can\n" "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n" "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n" "\n" "Help Options:\n" " ( -h | -? | --help ) Display this usage information\n" -" ( -v | --version ) Display version and copyright " -"information\n" +" ( -v | --version ) Display version and copyright information\n" "\n" "Configuration Options:\n" " --no-rcfile Do not read any resource files\n" @@ -733,6 +682,7 @@ msgid "" " ( -r | --revision ) File revision \n" " ( -s | --separate ) Create a new tab for each file\n" " ( -t | --tab ) Start a new tab\n" +" ( -V | --vcs ) Version control system search order\n" " --line Start with line selected\n" " --null-file Create a blank file comparison pane\n" "\n" @@ -747,11 +697,9 @@ msgstr "" " diffuse [ [オプション...] [ファイル...] ]...\n" " diffuse ( -h | -? | --help | -v | --version )\n" "\n" -"Diffuse は、テキストファイルをマージして比較するためのグラフィックツールで" -"す。\n" +"Diffuse は、テキストファイルをマージして比較するためのグラフィックツールです。\n" "任意の数の並行なファイルを比較できます。ユーザは、手動で行を再整列し、\n" -"ファイルを直接編集できます。また、Diffuse は比較やマージするためにBazaar、" -"CVS、\n" +"ファイルを直接編集できます。また、Diffuse は比較やマージするためにBazaar、CVS、\n" "Darcs、Git、Mercurial、Monotone、RCS、Subversion、および SVK リポジトリから\n" "ファイルリビジョンを取得できます。\n" "\n" @@ -764,16 +712,15 @@ msgstr "" " --rcfile 指定されたリソースファイルを読む\n" "\n" "一般的なオプション:\n" -" ( -c | --commit ) と というファイルリビジョ" -"ン\n" +" ( -c | --commit ) と というファイルリビジョン\n" " ( -D | --close-if-same ) 差分がないタブを閉じる\n" " ( -e | --encoding ) でファイルを読み書き\n" " ( -L | --label )