diff --git a/.flake8 b/.flake8 index 35abd39..9656ec8 100644 --- a/.flake8 +++ b/.flake8 @@ -1,6 +1,7 @@ [flake8] builtins = _ max-line-length = 100 +show-source = true # Temporary exclude = src/diffuse/main.py diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5abdfa8..1be2757 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,10 +22,10 @@ jobs: - run: pip install -r requirements.txt - name: Flake8 - run: flake8 src/ + run: flake8 src/ po/ - name: MyPy - run: mypy src/ + run: mypy src/ po/ meson-build-test: runs-on: ubuntu-latest diff --git a/CHANGELOG.md b/CHANGELOG.md index 877dcf4..5270eb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Added +- Added a `--remove-obsolete` option for the update-translation.py script + +### Changed +- Updated the translation files +- Renamed POTFILES.in to POTFILES +- Renamed io.github.mightycreak.Diffuse.metadata.xml.in to + io.github.mightycreak.Diffuse.appdata.xml.in + ## 0.7.3 - 2021-11-22 ### Added @@ -16,7 +25,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - main.py slimmed down by about 5000 lines - The new widgets.py is a bit fat though (~4000 lines) -- Updated the translation files ### Fixed - The intense code cleaning seems to have fixed a bug with the `-c` argument diff --git a/README.md b/README.md index 3a7b157..21fb5eb 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,10 @@ This is the easiest way to install Diffuse: flatpak install io.github.mightycreak.Diffuse ``` +## Translators + +Please refer to the [translation documentation](po/README.md). + ## Developers ### Setup @@ -128,7 +132,7 @@ the on-line help documentation using a web browser. Diffuse is under the [GPLv2](COPYING). -The file [io.github.mightycreak.Diffuse.metainfo.xml](src/usr/share/metainfo/io.github.mightycreak.Diffuse.metainfo.xml) +The file [io.github.mightycreak.Diffuse.appdata.xml.in](data/io.github.mightycreak.Diffuse.appdata.xml.in) is licensed under the [FSF-AP](https://www.gnu.org/prep/maintain/html_node/License-Notices-for-Other-Files.html) license. diff --git a/data/io.github.mightycreak.Diffuse.metainfo.xml.in b/data/io.github.mightycreak.Diffuse.appdata.xml.in similarity index 99% rename from data/io.github.mightycreak.Diffuse.metainfo.xml.in rename to data/io.github.mightycreak.Diffuse.appdata.xml.in index 410e56e..40a782d 100644 --- a/data/io.github.mightycreak.Diffuse.metainfo.xml.in +++ b/data/io.github.mightycreak.Diffuse.appdata.xml.in @@ -8,18 +8,25 @@ Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories.

+ FSFAP GPL-2.0-or-later io.github.mightycreak.Diffuse.desktop https://mightycreak.github.io/diffuse/ https://github.com/MightyCreak/diffuse/issues + Main window: diff between two files https://mightycreak.github.io/diffuse/images/screenshot_v0.7.0.png + + + Romain Failliot + romain.failliot@foolstep.com + @@ -207,6 +214,4 @@ - Romain Failliot - romain.failliot@foolstep.com diff --git a/data/meson.build b/data/meson.build index 10fae07..019f488 100644 --- a/data/meson.build +++ b/data/meson.build @@ -17,8 +17,8 @@ if desktop_utils.found() endif appstream_file = i18n.merge_file( - input: 'io.github.mightycreak.Diffuse.metainfo.xml.in', - output: 'io.github.mightycreak.Diffuse.metainfo.xml', + input: 'io.github.mightycreak.Diffuse.appdata.xml.in', + output: 'io.github.mightycreak.Diffuse.appdata.xml', po_dir: '../po', install: true, install_dir: join_paths(get_option('datadir'), 'appdata') diff --git a/po/POTFILES b/po/POTFILES new file mode 100644 index 0000000..6461013 --- /dev/null +++ b/po/POTFILES @@ -0,0 +1,12 @@ +# List of source files which contain translatable strings. +# Copyright (C) 2020 Romain Failliot + +data/io.github.mightycreak.Diffuse.desktop.in +data/io.github.mightycreak.Diffuse.appdata.xml.in +src/diffuse/constants.py.in +src/diffuse/diffuse.in +src/diffuse/main.py +src/diffuse/vcs/cvs.py +src/diffuse/vcs/rcs.py +src/diffuse/vcs/svn.py +src/diffuse/vcs/vcs_registry.py diff --git a/po/POTFILES.in b/po/POTFILES.in deleted file mode 100644 index 80d4324..0000000 --- a/po/POTFILES.in +++ /dev/null @@ -1,12 +0,0 @@ -# List of source files which contain translatable strings. -# Copyright (C) 2020 Romain Failliot - -data/io.github.mightycreak.Diffuse.desktop.in -data/io.github.mightycreak.Diffuse.metainfo.xml.in -src/constants.py.in -src/diffuse.in -src/main.py -src/vcs/cvs.py -src/vcs/rcs.py -src/vcs/svn.py -src/vcs/vcs_registry.py diff --git a/po/README.md b/po/README.md index 0675923..2510820 100644 --- a/po/README.md +++ b/po/README.md @@ -15,7 +15,9 @@ Create PO template To create or update the PO template (`po/diffuse.pot`), use this command at the repo root: - xgettext -o po/diffuse.pot -f po/POTFILES.in +```sh +xgettext -o po/diffuse.pot -f po/POTFILES.in +``` Create a new translation ------------------------ @@ -23,42 +25,37 @@ Create a new translation To create a new translation file, you'll need a PO template. If not already created, refer to previous section "Create PO template". -1. Create a .po file for the translation: +1. Create a .po file for the translation (replace `` with your language): - msginit -l ja -o ja.po -i diffuse.pot + ```sh + msginit -l -o .po -i diffuse.pot + ``` -2. Manually complete in the translations in the .po file: +2. Manually complete in the translations in the .po file using either an + application for that such as [Gtranslator][gtranslator] or directly with a + text editor such as [gedit][gedit] or [vim][vim]. - vim ja.po +[gtranslator]: https://www.flathub.org/apps/details/org.gnome.Gtranslator +[gedit]: https://www.flathub.org/apps/details/org.gnome.gedit +[vim]: https://www.vim.org/ Update a translation -------------------- Use `update-translations.py` to update one or more PO files. -Here is an example with `ja.po` and `ko.po`: +Here is an example with the Japanese and Korean translations, respectively +`ja.po` and `ko.po`: Command-line: + ```sh ./update-translations.py ja.po ko.po ``` -Output: -``` -Generate 'diffuse.pot'. -Updating translation file 'ja.po'... -Created /tmp/tmp0gtniydu/ja.empty.po. -Validate ja.po: -183 translated messages, 2 untranslated messages. -Update done. -Updating translation file 'ko.po'... -Created /tmp/tmp0gtniydu/ko.empty.po. -Validate ko.po: -183 translated messages, 2 untranslated messages. -Update done. -``` - -Then use the text editor of your choice to complete the translations. +This command also validate the files, so if you see a message saying "N +untranslated messages", use the text editor of your choice to complete the +translations. Validate a translation ---------------------- @@ -72,40 +69,30 @@ Command-line: ./update-translations.py --check-only ja.po ko.po ``` -Output: -``` -Validate ja.po: -183 translated messages, 2 untranslated messages. -Validate ko.po: -183 translated messages, 2 untranslated messages. -``` - System Integration ================== -Localised text for the system menu (name and comment) should be manually -added to the desktop file: +Localized text for the Microsoft Windows installer is stored in separate ISL +files. Copy the [English version][english-win-docs] and replace the text to the +right of each equal sign. - ../src/usr/share/applications/diffuse.desktop - -Localised text for the Microsoft Windows installer is stored in separate ISL -files. Copy the English version (../windows-installer/en.isl) and replace the -text to the right of each equal sign. +[english-win-docs]: ../windows-installer/en.isl Documentation ============= Documentation is stored in DocBook format. Start a new translation of the -manual by copying the English version of the DocBook manual -(../src/usr/share/gnome/help/diffuse/C/diffuse.xml) and then edit the -contents. +manual by copying the English version of the [DocBook manual][docbook-manual] +and then edit the contents. The DocBook manual is converted to HTML for Windows and Unix man pages for POSIX platforms. The conversion tools insert some English text that gets -localised using search and replace. Manually add new search and replace rules +localized using search and replace. Manually add new search and replace rules to these files: ../windows-installer/translations.txt ../utils/translations.txt The format of each line is: \:\:\ + +[docbook-manual]: ../data/usr/share/gnome/help/diffuse/C/diffuse.xml diff --git a/po/cs.po b/po/cs.po index ae5d6ca..4286c0c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-18 15:21-0500\n" +"POT-Creation-Date: 2021-11-24 10:26-0500\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Jindřich Šesták \n" "Language-Team: NONE \n" @@ -23,994 +23,571 @@ msgstr "" "X-Poedit-SearchPath-0: .\n" #: data/io.github.mightycreak.Diffuse.desktop.in:3 -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:4 +#: data/io.github.mightycreak.Diffuse.appdata.xml.in:4 msgid "Diffuse Merge Tool" msgstr "Diffuse" #: data/io.github.mightycreak.Diffuse.desktop.in:4 -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:5 +#: data/io.github.mightycreak.Diffuse.appdata.xml.in:5 msgid "Graphical tool for merging and comparing text files" msgstr "Grafický nástroj pro slučování a porovnávání textových souborů" -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:7 -msgid "Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories." +#: data/io.github.mightycreak.Diffuse.appdata.xml.in:7 +msgid "" +"Diffuse is a graphical tool for comparing and merging text files. It can " +"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, " +"Monotone, RCS, Subversion, and SVK repositories." msgstr "" -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:19 +#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21 msgid "Main window: diff between two files" msgstr "" -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:26 -msgid "Patch release to fix a bug when using the Flatpak package." -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:29 -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:71 -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:146 -msgid "Fixed:" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:31 -msgid "Fixed a Flatpak bug where the app couldn't call binaries on the host, such as `git`, `svn`, etc." -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:40 -msgid "With this release, the main end-user change is the new icon. The rest is mainly maintenance improvements with a much more standard folder structure and starting to modularize the code. This is an ongoing effort as there is still a lot to do, but hopefully this would motivate some to contribute ;)" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:47 -msgid "An important note though: the application ID has changed and is now io.github.mightycreak.Diffuse." -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:51 -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:89 -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:123 -msgid "Added:" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:53 -msgid "New icon and in SVG now" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:54 -msgid "Started to modularize the code" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:56 -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:93 -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:136 -msgid "Changed:" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:58 -msgid "Changed AppID to io.github.mightycreak.Diffuse (as advised in the Flatpak documentation)" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:62 -msgid "Renamed directory `translations/` to `po/`" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:63 -msgid "Now uses POTFILES.in to list the files to translate" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:64 -msgid "Translation strings are no longer sorted alphabetically, this will help when there will be several files in POTFILES.in" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:68 -msgid "Updated the documentation and script in the `po/` directory" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:69 -msgid "Add .desktop translations in .po files" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:73 -msgid "Fixed some GTK deprecation warnings" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:79 -msgid "Mainly under the hood changes in this release, so nothing really visible to the users in this version. That said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse development to be a bit more active and iterative." -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:85 -msgid "Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available through Flathub!" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:91 -msgid "New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:95 -msgid "Replace old install.py with the more standard Meson" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:96 -msgid "Remove u string prefixes since Python 3 is in UTF-8 by default" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:97 -msgid "Replaced some interpolation operators (%) for the f string prefix" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:98 -msgid "Use the window scale factor for the icons generation" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:104 -msgid "Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:108 -msgid "There is a lot to do on this application, and some features didn't make the release. The main one being the Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python scripts should work on Windows, but no executable is produced (yet) with the release." -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:115 -msgid "Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the latest commits from upstream (which were never released)." -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:120 -msgid "The next version will not take 6 years, I promise you! 😄" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:125 -msgid "Added Pedro Albuquerque's Portuguese translation" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:126 -msgid "Added Åke Engelbrektson's Swedish translation" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:127 -msgid "Added Guillaume Hoffmann's Darcs support improvements" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:128 -msgid "Added Akom Chotiphantawanon's Thai translation" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:129 -msgid "Added support for Git submodules" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:130 -msgid "Added a preference and command line option to specify the version control system search order" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:131 -msgid "Added .editorconfig file" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:132 -msgid "Added .gitignore file" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:133 -msgid "Added message when removing files during uninstallation" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:134 -msgid "Added Python script to update all the translation files at once" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:138 -msgid "Convert to Python 3" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:139 -msgid "Convert to GTK 3" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:140 -msgid "Updated Python highlighting for Python 3 grammar" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:141 -msgid "Updated copyrights years and authors" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:142 -msgid "Improve Spanish translation" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:143 -msgid "Convert translation README to MarkDown" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:144 -msgid "Updated all the translation files" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:148 -msgid "Fixed wrong icons directory for gtk-update-icon-cache" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:149 -msgid "Fixed missing directories when uninstalling" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:150 -msgid "Fixed bug introduced by r420 with RCS VCS" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:151 -msgid "Fixed broken drag'n'drop since migration to Python3/GTK3" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:152 -msgid "Fixed error when using '-m' in an SVN repo" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:157 -msgid "Romain Failliot" -msgstr "" - -#: src/constants.py.in:23 +#: src/diffuse/constants.py.in:23 msgid "Copyright" msgstr "" -#: src/main.py:591 -#, 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/main.py:610 -msgid "Auto Detect" -msgstr "Automaticky rozpoznat" - -#: src/main.py:706 -msgid "Display" -msgstr "Zobrazení" - -#: src/main.py:708 -msgid "Font" -msgstr "Písmo" - -#: src/main.py:709 -msgid "Tab width" -msgstr "Šířka tabulátoru" - -#: src/main.py:710 -msgid "Show right margin" -msgstr "Zobrazit pravý okraj" - -#: src/main.py:711 -msgid "Right margin" -msgstr "Pravý okraj" - -#: src/main.py:712 -msgid "Show line numbers" -msgstr "Zobrazit čísla řádků" - -#: src/main.py:713 -msgid "Show white space characters" -msgstr "Zobrazit netisknutelné znaky" - -#: src/main.py:714 -msgid "Ignore case differences" -msgstr "Ignorovat velikost písmen" - -#: src/main.py:715 -msgid "Ignore white space differences" -msgstr "Ignorovat netisknutelné znaky" - -#: src/main.py:716 src/main.py:724 -msgid "Ignore changes to white space" -msgstr "Ignorovat znaky mezer" - -#: src/main.py:717 -msgid "Ignore blank line differences" -msgstr "Ignorovat prázdné řádky" - -#: src/main.py:718 -msgid "Ignore end of line differences" -msgstr "Ignorovat znaky konce řádku" - -#: src/main.py:720 -msgid "Alignment" -msgstr "Zarovnání" - -#: src/main.py:722 -msgid "Ignore case" -msgstr "Ignorovat velikost písmen" - -#: src/main.py:723 -msgid "Ignore white space" -msgstr "Ignorovat netisknutelné znaky" - -#: src/main.py:725 -msgid "Ignore blank lines" -msgstr "Ignorovat prázdné řádky" - -#: src/main.py:726 -msgid "Ignore end of line characters" -msgstr "Ignorovat znaky konce řádku" - -#: src/main.py:728 -msgid "Editor" -msgstr "Editor" - -#: src/main.py:730 -msgid "Auto indent" -msgstr "Automaticky odsazovat" - -#: src/main.py:731 -msgid "Expand tabs to spaces" -msgstr "Nahradit tabulátory mezerami" - -#: src/main.py:732 -msgid "Soft tab width" -msgstr "Šířka tabulátoru" - -#: src/main.py:734 -msgid "Tabs" -msgstr "Panely" - -#: src/main.py:736 -msgid "Default panes" -msgstr "Výchozí počet podoken" - -#: src/main.py:737 -msgid "Always show the tab bar" -msgstr "Vždy zobrazovat lištu s panely" - -#: src/main.py:738 -#, python-format -msgid "Warn me when closing a tab will quit %s" -msgstr "Zobrazit upozornění, pokud zavření panelu ukončí %s" - -#: src/main.py:740 -msgid "Regional Settings" -msgstr "Místní nastavení" - -#: src/main.py:742 -msgid "Default codec" -msgstr "Výchozí kódování" - -#: src/main.py:743 -msgid "Order of codecs used to identify encoding" -msgstr "Pořadí kodeků pro rozpoznání kódování" - -#: src/main.py:763 -msgid "Cygwin" -msgstr "Cygwin" - -#: src/main.py:765 -msgid "Root directory" -msgstr "Kořenový adresář" - -#: src/main.py:766 -msgid "Cygdrive prefix" -msgstr "Předpona cygdrive" - -#: src/main.py:782 -msgid "Version control system search order" -msgstr "" - -#: src/main.py:788 -msgid "\"co\" command" -msgstr "příkaz \"co\"" - -#: src/main.py:789 -msgid "\"rlog\" command" -msgstr "příkaz \"rlog\"" - -#: src/main.py:791 -msgid "Command" -msgstr "Příkaz" - -#: src/main.py:793 -msgid "Launch from a Bash login shell" -msgstr "Spustit z příkazové řádky terminálu Bash" - -#: src/main.py:795 -msgid "Update paths for Cygwin" -msgstr "Upravit cesty pro Cygwin" - -#: src/main.py:799 -msgid "Version Control" -msgstr "Správa verzí" - -#: src/main.py:863 -msgid "Preferences" -msgstr "Předvolby" - -#: src/main.py:904 src/main.py:5802 -#, python-format -msgid "Error writing %s." -msgstr "Při ukládání %s došlo k chybě." - -#: src/main.py:3282 -msgid "Align with Selection" -msgstr "Zarovnat s výběrem" - -#: src/main.py:3283 -msgid "Isolate" -msgstr "Izolovat" - -#: src/main.py:3284 -msgid "Merge Selection" -msgstr "Sloučit výběr" - -#: src/main.py:3286 src/main.py:6098 -msgid "Cut" -msgstr "Vyjmout" - -#: src/main.py:3287 src/main.py:6099 -msgid "Copy" -msgstr "Kopírovat" - -#: src/main.py:3288 src/main.py:6100 -msgid "Paste" -msgstr "Vložit" - -#: src/main.py:3290 -msgid "Select All" -msgstr "Vybrat vše" - -#: src/main.py:3291 src/main.py:6101 -msgid "Clear Edits" -msgstr "Smazat úpravy" - -#: src/main.py:3293 -msgid "Swap with Selected Pane" -msgstr "Prohodit s vybraným podoknem" - -#: src/main.py:5124 -msgid "Find..." -msgstr "Najít..." - -#: src/main.py:5132 -msgid "Search For: " -msgstr "Vyhledat: " - -#: src/main.py:5157 -msgid "Match Case" -msgstr "Rozlišovat velikost písmen" - -#: src/main.py:5162 -msgid "Search Backwards" -msgstr "Hledat od konce" - -#: src/main.py:5176 -#, python-format -msgid "Closing this tab will quit %s." -msgstr "Zavřením tohoto panelu ukončíte %s." - -#: src/main.py:5198 -msgid "Encoding: " -msgstr "Kódování: " - -#: src/main.py:5208 -msgid "Revision: " -msgstr "Revize: " - -#: src/main.py:5272 -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/main.py:5277 -msgid "translator-credits" -msgstr "Jindřich Šesták " - -#: src/main.py:5281 -#, fuzzy -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -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/main.py:5322 +#: src/diffuse/main.py:77 msgid "Close Tab" msgstr "Zavřít panel" -#: src/main.py:5377 +#: src/diffuse/main.py:120 msgid "Open File..." msgstr "Otevřít soubor..." -#: src/main.py:5378 +#: src/diffuse/main.py:121 msgid "Reload File" msgstr "Znovu načíst soubor" -#: src/main.py:5379 +#: src/diffuse/main.py:122 msgid "Save File" msgstr "Uložit soubor" -#: src/main.py:5380 +#: src/diffuse/main.py:123 msgid "Save File As..." msgstr "Uložit soubor jako..." -#: src/main.py:5525 +#: src/diffuse/main.py:268 msgid "Save changes before loading the new file?" msgstr "Uložit změny před načtením nového souboru?" -#: src/main.py:5635 +#: src/diffuse/main.py:377 #, 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/main.py:5637 src/main.py:6900 +#: src/diffuse/main.py:379 src/diffuse/main.py:1712 #, python-format msgid "Error reading %s." msgstr "Při čtení souboru %s došlo k chybě." -#: src/main.py:5658 +#: src/diffuse/main.py:400 msgid "Open File" msgstr "Otevřít soubor" -#: src/main.py:5708 +#: src/diffuse/main.py:450 #, 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/main.py:5728 +#: src/diffuse/main.py:470 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "Uložit podokno %(pane)d %(title)s" -#: src/main.py:5754 +#: src/diffuse/main.py:496 #, 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/main.py:5759 +#: src/diffuse/main.py:501 #, 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?" +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/main.py:5800 +#: src/diffuse/main.py:540 #, python-format msgid "Error encoding to %s." msgstr "Při změně kódování do %s došlo k chybě." -#: src/main.py:5830 +#: src/diffuse/main.py:542 +#, python-format +msgid "Error writing %s." +msgstr "Při ukládání %s došlo k chybě." + +#: src/diffuse/main.py:570 msgid "Go To Line..." msgstr "Přejít na řádek..." -#: src/main.py:5830 +#: src/diffuse/main.py:570 msgid "Line Number: " msgstr "Řádek číslo: " -#: src/main.py:5856 -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/diffuse/main.py:596 +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/main.py:5858 +#: src/diffuse/main.py:598 msgid "Press the escape key to finish editing." msgstr "Editaci ukončíte pomocí klávesy escape." -#: src/main.py:5860 -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/diffuse/main.py:600 +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/main.py:5971 +#: src/diffuse/main.py:711 msgid "_File" msgstr "_Soubor" -#: src/main.py:5972 +#: src/diffuse/main.py:712 msgid "_Open File..." msgstr "_Otevřít soubor..." -#: src/main.py:5973 +#: src/diffuse/main.py:713 msgid "Open File In New _Tab..." msgstr "Otevřít soubor v novém _panelu..." -#: src/main.py:5974 +#: src/diffuse/main.py:714 msgid "Open _Modified Files..." msgstr "Otevřít změněné soubory..." -#: src/main.py:5975 +#: src/diffuse/main.py:715 msgid "Open Commi_t..." msgstr "Otevřít _revizi..." -#: src/main.py:5976 +#: src/diffuse/main.py:716 msgid "_Reload File" msgstr "_Znovu načíst soubor" -#: src/main.py:5978 +#: src/diffuse/main.py:718 msgid "_Save File" msgstr "_Uložit soubor" -#: src/main.py:5979 +#: src/diffuse/main.py:719 msgid "Save File _As..." msgstr "Uložit soubor ­_jako..." -#: src/main.py:5980 +#: src/diffuse/main.py:720 msgid "Save A_ll" msgstr "Uložit _vše" -#: src/main.py:5982 +#: src/diffuse/main.py:722 msgid "New _2-Way File Merge" msgstr "Nové _2směrné slučování" -#: src/main.py:5983 +#: src/diffuse/main.py:723 msgid "New _3-Way File Merge" msgstr "Nové _3směrné slučování" -#: src/main.py:5984 +#: src/diffuse/main.py:724 msgid "New _N-Way File Merge..." msgstr "Nové _Nsměrné slučování" -#: src/main.py:5986 +#: src/diffuse/main.py:726 msgid "_Close Tab" msgstr "_Zavřít panel" -#: src/main.py:5987 +#: src/diffuse/main.py:727 msgid "_Undo Close Tab" msgstr "_Obnovit zavřený panel" -#: src/main.py:5988 +#: src/diffuse/main.py:728 msgid "_Quit" msgstr "Kone_c" -#: src/main.py:5990 +#: src/diffuse/main.py:730 msgid "_Edit" msgstr "Úpr_avy" -#: src/main.py:5991 +#: src/diffuse/main.py:731 msgid "_Undo" msgstr "_Zpět" -#: src/main.py:5992 +#: src/diffuse/main.py:732 msgid "_Redo" msgstr "Z_novu" -#: src/main.py:5994 +#: src/diffuse/main.py:734 msgid "Cu_t" msgstr "_Vyjmout" -#: src/main.py:5995 +#: src/diffuse/main.py:735 msgid "_Copy" msgstr "_Kopírovat" -#: src/main.py:5996 +#: src/diffuse/main.py:736 msgid "_Paste" msgstr "V_ložit" -#: src/main.py:5998 +#: src/diffuse/main.py:738 msgid "Select _All" msgstr "V_ybrat vše" -#: src/main.py:5999 +#: src/diffuse/main.py:739 msgid "C_lear Edits" msgstr "_Smazat úpravy" -#: src/main.py:6000 +#: src/diffuse/main.py:740 msgid "_Dismiss All Edits" msgstr "Z_rušit všechny úpravy" -#: src/main.py:6002 +#: src/diffuse/main.py:742 msgid "_Find..." msgstr "_Najít" -#: src/main.py:6003 +#: src/diffuse/main.py:743 msgid "Find _Next" msgstr "Najít _další" -#: src/main.py:6004 +#: src/diffuse/main.py:744 msgid "Find Pre_vious" msgstr "Najít _předchozí" -#: src/main.py:6005 +#: src/diffuse/main.py:745 msgid "_Go To Line..." msgstr "Pře_jít na řádek..." -#: src/main.py:6007 +#: src/diffuse/main.py:747 msgid "Pr_eferences..." msgstr "Př_edvolby..." -#: src/main.py:6009 +#: src/diffuse/main.py:749 msgid "None" msgstr "Nic" -#: src/main.py:6017 +#: src/diffuse/main.py:757 msgid "_View" msgstr "_Zobrazit" -#: src/main.py:6018 +#: src/diffuse/main.py:758 msgid "_Syntax Highlighting" msgstr "Zvýraznění _syntaxe" -#: src/main.py:6020 +#: src/diffuse/main.py:760 msgid "Re_align All" msgstr "Znovu _zarovnat" -#: src/main.py:6021 +#: src/diffuse/main.py:761 msgid "_Isolate" msgstr "_Izolovat" -#: src/main.py:6023 +#: src/diffuse/main.py:763 msgid "_First Difference" msgstr "Pr_vní rozdíl" -#: src/main.py:6024 +#: src/diffuse/main.py:764 msgid "_Previous Difference" msgstr "_Předchozí rozdíl" -#: src/main.py:6025 +#: src/diffuse/main.py:765 msgid "_Next Difference" msgstr "_Další rozdíl" -#: src/main.py:6026 +#: src/diffuse/main.py:766 msgid "_Last Difference" msgstr "P_oslední rozdíl" -#: src/main.py:6028 +#: src/diffuse/main.py:768 msgid "Fir_st Tab" msgstr "Prv_ní panel" -#: src/main.py:6029 +#: src/diffuse/main.py:769 msgid "Pre_vious Tab" msgstr "Předch_ozí panel" -#: src/main.py:6030 +#: src/diffuse/main.py:770 msgid "Next _Tab" msgstr "D_alší panel" -#: src/main.py:6031 +#: src/diffuse/main.py:771 msgid "Las_t Tab" msgstr "Posl_ední panel" -#: src/main.py:6033 +#: src/diffuse/main.py:773 msgid "Shift Pane _Right" msgstr "Přesunout podokno dop_rava" -#: src/main.py:6034 +#: src/diffuse/main.py:774 msgid "Shift Pane _Left" msgstr "Přesunout podokno do_leva" -#: src/main.py:6036 +#: src/diffuse/main.py:776 msgid "F_ormat" msgstr "F_ormát" -#: src/main.py:6037 +#: src/diffuse/main.py:777 msgid "Convert To _Upper Case" msgstr "Převést na _velká písmena" -#: src/main.py:6038 +#: src/diffuse/main.py:778 msgid "Convert To _Lower Case" msgstr "Převést na _malá písmena" -#: src/main.py:6040 +#: src/diffuse/main.py:780 msgid "Sort Lines In _Ascending Order" msgstr "Seřadit řádky v_zestupně" -#: src/main.py:6041 +#: src/diffuse/main.py:781 msgid "Sort Lines In D_escending Order" msgstr "Seřadit řádky _sestupně" -#: src/main.py:6043 +#: src/diffuse/main.py:783 msgid "Remove Trailing _White Space" msgstr "_Odstranit mezery na koncích řádků" -#: src/main.py:6044 +#: src/diffuse/main.py:784 msgid "Convert Tabs To _Spaces" msgstr "_Nahradit tabulátory mezerami" -#: src/main.py:6045 +#: src/diffuse/main.py:785 msgid "Convert Leading Spaces To _Tabs" msgstr "Nah_radit úvodní mezery tabulátory" -#: src/main.py:6047 +#: src/diffuse/main.py:787 msgid "_Increase Indenting" msgstr "Zvětš_it odsazení" -#: src/main.py:6048 +#: src/diffuse/main.py:788 msgid "De_crease Indenting" msgstr "Zmenši_t odsazení" -#: src/main.py:6050 +#: src/diffuse/main.py:790 msgid "Convert To _DOS Format" msgstr "Převést na _DOS formát" -#: src/main.py:6051 +#: src/diffuse/main.py:791 msgid "Convert To _Mac Format" msgstr "Převést na Ma_c formát" -#: src/main.py:6052 +#: src/diffuse/main.py:792 msgid "Convert To Uni_x Format" msgstr "Převést na Uni_x formát" -#: src/main.py:6054 +#: src/diffuse/main.py:794 msgid "_Merge" msgstr "S_loučit" -#: src/main.py:6055 +#: src/diffuse/main.py:795 msgid "Copy Selection _Right" msgstr "_Kopírovat výběr doprava" -#: src/main.py:6056 +#: src/diffuse/main.py:796 msgid "Copy Selection _Left" msgstr "K_opírovat výběr doleva" -#: src/main.py:6058 +#: src/diffuse/main.py:798 msgid "Copy Left _Into Selection" msgstr "Ko_pírovat zleva do výběru" -#: src/main.py:6059 +#: src/diffuse/main.py:799 msgid "Copy Right I_nto Selection" msgstr "Kopí_rovat zprava do výběru" -#: src/main.py:6060 +#: src/diffuse/main.py:800 msgid "_Merge From Left Then Right" msgstr "_Sloučit zleva a poté zprava" -#: src/main.py:6061 +#: src/diffuse/main.py:801 msgid "M_erge From Right Then Left" msgstr "S_loučit zprava a poté zleva" -#: src/main.py:6063 +#: src/diffuse/main.py:803 msgid "_Help" msgstr "Nápo_věda" -#: src/main.py:6064 +#: src/diffuse/main.py:804 msgid "_Help Contents..." msgstr "_Zobrazit nápovědu" -#: src/main.py:6066 +#: src/diffuse/main.py:806 #, python-format msgid "_About %s..." msgstr "_O programu %s..." -#: src/main.py:6080 +#: src/diffuse/main.py:820 msgid "New 2-Way File Merge" msgstr "Nové 2směrné slučování" -#: src/main.py:6081 +#: src/diffuse/main.py:821 msgid "New 3-Way File Merge" msgstr "Nové 3směrné slučování" -#: src/main.py:6083 +#: src/diffuse/main.py:823 msgid "Realign All" msgstr "Znovu zarovnat" -#: src/main.py:6084 +#: src/diffuse/main.py:824 msgid "First Difference" msgstr "První rozdíl" -#: src/main.py:6085 +#: src/diffuse/main.py:825 msgid "Previous Difference" msgstr "Předchozí rozdíl" -#: src/main.py:6086 +#: src/diffuse/main.py:826 msgid "Next Difference" msgstr "Další rozdíl" -#: src/main.py:6087 +#: src/diffuse/main.py:827 msgid "Last Difference" msgstr "Poslední rozdíl" -#: src/main.py:6089 +#: src/diffuse/main.py:829 msgid "Copy Selection Right" msgstr "Kopírovat výběr doprava" -#: src/main.py:6090 +#: src/diffuse/main.py:830 msgid "Copy Selection Left" msgstr "Kopírovat výběr doleva" -#: src/main.py:6091 +#: src/diffuse/main.py:831 msgid "Copy Left Into Selection" msgstr "Kopírovat zleva do výběru" -#: src/main.py:6092 +#: src/diffuse/main.py:832 msgid "Copy Right Into Selection" msgstr "Kopírovat zprava do výběru" -#: src/main.py:6093 +#: src/diffuse/main.py:833 msgid "Merge From Left Then Right" msgstr "Sloučit zleva a poté zprava" -#: src/main.py:6094 +#: src/diffuse/main.py:834 msgid "Merge From Right Then Left" msgstr "Sloučit zprava a poté zleva" -#: src/main.py:6096 +#: src/diffuse/main.py:836 msgid "Undo" msgstr "Zpět" -#: src/main.py:6097 +#: src/diffuse/main.py:837 msgid "Redo" msgstr "Znovu" -#: src/main.py:6221 -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/diffuse/main.py:838 +msgid "Cut" +msgstr "Vyjmout" -#: src/main.py:6234 +#: src/diffuse/main.py:839 +msgid "Copy" +msgstr "Kopírovat" + +#: src/diffuse/main.py:840 +msgid "Paste" +msgstr "Vložit" + +#: src/diffuse/main.py:841 +msgid "Clear Edits" +msgstr "Smazat úpravy" + +#: src/diffuse/main.py:961 +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/diffuse/main.py:974 msgid "Tab" msgstr "Panel" -#: src/main.py:6239 +#: src/diffuse/main.py:979 msgid "Pane" msgstr "Podokno" -#: src/main.py:6250 +#: src/diffuse/main.py:990 msgid "Close _Without Saving" msgstr "Zavřít _bez uložení" -#: src/main.py:6361 +#: src/diffuse/main.py:1026 +#, python-format +msgid "Closing this tab will quit %s." +msgstr "Zavřením tohoto panelu ukončíte %s." + +#: src/diffuse/main.py:1108 #, python-format msgid "File Merge %d" msgstr "Slučování %d" -#: src/main.py:6464 +#: src/diffuse/main.py:1211 #, python-format msgid "Error retrieving commits for %s." msgstr "Revize pro %s se nepodařilo načíst." -#: src/main.py:6493 +#: src/diffuse/main.py:1240 #, python-format msgid "Error retrieving modifications for %s." msgstr "Při načítání změn %s došlo k chybě." -#: src/main.py:6523 +#: src/diffuse/main.py:1270 msgid "Open File In New Tab" msgstr "Otevřít soubor v novém panelu" -#: src/main.py:6539 +#: src/diffuse/main.py:1286 msgid "Choose Folder With Modified Files" msgstr "Vyberte adresář se změněnými soubory" -#: src/main.py:6552 +#: src/diffuse/main.py:1299 msgid "No modified files found." msgstr "Nebyly nalezeny žádné změněné soubory." -#: src/main.py:6557 +#: src/diffuse/main.py:1304 msgid "Choose Folder With Commit" msgstr "Vyberte adresář se zapsanou revizí" -#: src/main.py:6570 +#: src/diffuse/main.py:1317 msgid "No committed files found." msgstr "Nebyly nalezeny žádné zapsané soubory." -#: src/main.py:6604 +#: src/diffuse/main.py:1351 msgid "New N-Way File Merge..." msgstr "Nové Nsměrné slučování" -#: src/main.py:6604 +#: src/diffuse/main.py:1351 msgid "Number of panes: " msgstr "Počet podoken: " -#: src/main.py:6669 +#: src/diffuse/main.py:1416 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/main.py:6671 +#: src/diffuse/main.py:1418 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/main.py:6819 +#: src/diffuse/main.py:1631 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" @@ -1040,10 +617,14 @@ 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" @@ -1055,49 +636,57 @@ 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" -#: src/main.py:6990 +#: src/diffuse/main.py:1802 msgid "Error parsing line number." msgstr "Při analýze čísla řádku došlo k chybě." -#: src/main.py:7000 +#: src/diffuse/main.py:1812 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "Ignorován neznámý parametr \"%s\"." -#: src/main.py:7007 +#: src/diffuse/main.py:1819 #, 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/vcs/cvs.py:50 src/vcs/rcs.py:54 src/vcs/svn.py:89 +#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60 +#: src/diffuse/vcs/svn.py:93 #, python-format msgid "Error parsing revision %s." msgstr "Při analýze revize %s došlo k chybě." -#: src/vcs/vcs_registry.py:216 +#: src/diffuse/vcs/vcs_registry.py:231 #, python-format msgid "Error parsing %s." msgstr "Při analýze %s došlo k chybě." - -#, python-format -#~ msgid "Column %d" -#~ msgstr "Sloupec %d" diff --git a/po/de.po b/po/de.po index 81829cc..3b898f5 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-18 15:21-0500\n" +"POT-Creation-Date: 2021-11-24 10:26-0500\n" "PO-Revision-Date: 2021-01-26 04:29+0100\n" "Last-Translator: Henri Menke \n" "Language-Team: German \n" @@ -21,994 +21,570 @@ msgstr "" "X-Generator: Poedit 2.4.2\n" #: data/io.github.mightycreak.Diffuse.desktop.in:3 -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:4 +#: data/io.github.mightycreak.Diffuse.appdata.xml.in:4 msgid "Diffuse Merge Tool" msgstr "Diffuse Mischwerkzeug" #: data/io.github.mightycreak.Diffuse.desktop.in:4 -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:5 +#: data/io.github.mightycreak.Diffuse.appdata.xml.in:5 msgid "Graphical tool for merging and comparing text files" msgstr "Werkzeug zum Mischen und Vergleichen von Textdateien" -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:7 -msgid "Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories." +#: data/io.github.mightycreak.Diffuse.appdata.xml.in:7 +msgid "" +"Diffuse is a graphical tool for comparing and merging text files. It can " +"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, " +"Monotone, RCS, Subversion, and SVK repositories." msgstr "" -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:19 +#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21 msgid "Main window: diff between two files" msgstr "" -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:26 -msgid "Patch release to fix a bug when using the Flatpak package." -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:29 -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:71 -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:146 -msgid "Fixed:" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:31 -msgid "Fixed a Flatpak bug where the app couldn't call binaries on the host, such as `git`, `svn`, etc." -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:40 -msgid "With this release, the main end-user change is the new icon. The rest is mainly maintenance improvements with a much more standard folder structure and starting to modularize the code. This is an ongoing effort as there is still a lot to do, but hopefully this would motivate some to contribute ;)" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:47 -msgid "An important note though: the application ID has changed and is now io.github.mightycreak.Diffuse." -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:51 -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:89 -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:123 -msgid "Added:" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:53 -msgid "New icon and in SVG now" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:54 -msgid "Started to modularize the code" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:56 -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:93 -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:136 -msgid "Changed:" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:58 -msgid "Changed AppID to io.github.mightycreak.Diffuse (as advised in the Flatpak documentation)" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:62 -msgid "Renamed directory `translations/` to `po/`" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:63 -msgid "Now uses POTFILES.in to list the files to translate" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:64 -msgid "Translation strings are no longer sorted alphabetically, this will help when there will be several files in POTFILES.in" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:68 -msgid "Updated the documentation and script in the `po/` directory" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:69 -msgid "Add .desktop translations in .po files" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:73 -msgid "Fixed some GTK deprecation warnings" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:79 -msgid "Mainly under the hood changes in this release, so nothing really visible to the users in this version. That said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse development to be a bit more active and iterative." -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:85 -msgid "Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available through Flathub!" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:91 -msgid "New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:95 -msgid "Replace old install.py with the more standard Meson" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:96 -msgid "Remove u string prefixes since Python 3 is in UTF-8 by default" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:97 -msgid "Replaced some interpolation operators (%) for the f string prefix" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:98 -msgid "Use the window scale factor for the icons generation" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:104 -msgid "Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:108 -msgid "There is a lot to do on this application, and some features didn't make the release. The main one being the Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python scripts should work on Windows, but no executable is produced (yet) with the release." -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:115 -msgid "Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the latest commits from upstream (which were never released)." -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:120 -msgid "The next version will not take 6 years, I promise you! 😄" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:125 -msgid "Added Pedro Albuquerque's Portuguese translation" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:126 -msgid "Added Åke Engelbrektson's Swedish translation" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:127 -msgid "Added Guillaume Hoffmann's Darcs support improvements" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:128 -msgid "Added Akom Chotiphantawanon's Thai translation" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:129 -msgid "Added support for Git submodules" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:130 -msgid "Added a preference and command line option to specify the version control system search order" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:131 -msgid "Added .editorconfig file" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:132 -msgid "Added .gitignore file" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:133 -msgid "Added message when removing files during uninstallation" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:134 -msgid "Added Python script to update all the translation files at once" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:138 -msgid "Convert to Python 3" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:139 -msgid "Convert to GTK 3" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:140 -msgid "Updated Python highlighting for Python 3 grammar" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:141 -msgid "Updated copyrights years and authors" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:142 -msgid "Improve Spanish translation" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:143 -msgid "Convert translation README to MarkDown" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:144 -msgid "Updated all the translation files" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:148 -msgid "Fixed wrong icons directory for gtk-update-icon-cache" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:149 -msgid "Fixed missing directories when uninstalling" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:150 -msgid "Fixed bug introduced by r420 with RCS VCS" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:151 -msgid "Fixed broken drag'n'drop since migration to Python3/GTK3" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:152 -msgid "Fixed error when using '-m' in an SVN repo" -msgstr "" - -#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:157 -msgid "Romain Failliot" -msgstr "" - -#: src/constants.py.in:23 +#: src/diffuse/constants.py.in:23 msgid "Copyright" msgstr "Urheberrecht" -#: src/main.py:591 -#, python-format -msgid "Error processing line %(line)d of %(file)s." -msgstr "Fehler bei der Analyse der Zeilen %(line)d von %(file)s." - -#: src/main.py:610 -msgid "Auto Detect" -msgstr "Automatische Erkennung" - -#: src/main.py:706 -msgid "Display" -msgstr "Anzeige" - -#: src/main.py:708 -msgid "Font" -msgstr "Schriftart" - -#: src/main.py:709 -msgid "Tab width" -msgstr "Tabulatorweite" - -#: src/main.py:710 -msgid "Show right margin" -msgstr "Zeige rechten Rand" - -#: src/main.py:711 -msgid "Right margin" -msgstr "Rechter Rand" - -#: src/main.py:712 -msgid "Show line numbers" -msgstr "Zeige Zeilennummern" - -#: src/main.py:713 -msgid "Show white space characters" -msgstr "Leerzeichen anzeigen" - -#: src/main.py:714 -msgid "Ignore case differences" -msgstr "Unterschiede bei Groß- und Kleinschreibung ignorieren" - -#: src/main.py:715 -msgid "Ignore white space differences" -msgstr "Unterschiede bei Leerzeichen ignorieren" - -#: src/main.py:716 src/main.py:724 -msgid "Ignore changes to white space" -msgstr "Änderungen an Leerzeichen ignorieren" - -#: src/main.py:717 -msgid "Ignore blank line differences" -msgstr "Unterschiede bei leeren Zeilen ignorieren" - -#: src/main.py:718 -msgid "Ignore end of line differences" -msgstr "Unterschiede bei Zeilenumbrüchen ignorieren" - -#: src/main.py:720 -msgid "Alignment" -msgstr "Ausrichtung" - -#: src/main.py:722 -msgid "Ignore case" -msgstr "Groß- und Kleinschreibung ignorieren" - -#: src/main.py:723 -msgid "Ignore white space" -msgstr "Leerzeichen ignorieren" - -#: src/main.py:725 -msgid "Ignore blank lines" -msgstr "Leere Zeilen ignorieren" - -#: src/main.py:726 -msgid "Ignore end of line characters" -msgstr "Zeilenumbrüche ignorieren" - -#: src/main.py:728 -msgid "Editor" -msgstr "Editor" - -#: src/main.py:730 -msgid "Auto indent" -msgstr "Automatischer Einzug" - -#: src/main.py:731 -msgid "Expand tabs to spaces" -msgstr "Tabulatoren zu Leerzeichen erweitern" - -#: src/main.py:732 -msgid "Soft tab width" -msgstr "Weiche Tabulatorweite" - -#: src/main.py:734 -msgid "Tabs" -msgstr "Reiter" - -#: src/main.py:736 -msgid "Default panes" -msgstr "Standard Fenster" - -#: src/main.py:737 -msgid "Always show the tab bar" -msgstr "Reiter-Leiste immer anzeigen" - -#: src/main.py:738 -#, python-format -msgid "Warn me when closing a tab will quit %s" -msgstr "Warnen, wenn schließen des Tabs %s beendet" - -#: src/main.py:740 -msgid "Regional Settings" -msgstr "Lokalisierung" - -#: src/main.py:742 -msgid "Default codec" -msgstr "Standardkodierung" - -#: src/main.py:743 -msgid "Order of codecs used to identify encoding" -msgstr "Reihenfolge der Chiffren um die Kodierung zu erkennen" - -#: src/main.py:763 -msgid "Cygwin" -msgstr "Cygwin" - -#: src/main.py:765 -msgid "Root directory" -msgstr "Hauptverzeichnis" - -#: src/main.py:766 -msgid "Cygdrive prefix" -msgstr "Cygdrive Präfix" - -#: src/main.py:782 -msgid "Version control system search order" -msgstr "Suchreihenfolge des Versionskontrollsystems" - -#: src/main.py:788 -msgid "\"co\" command" -msgstr "\"co\" Befehl" - -#: src/main.py:789 -msgid "\"rlog\" command" -msgstr "\"rlog\" Befehl" - -#: src/main.py:791 -msgid "Command" -msgstr "Befehl" - -#: src/main.py:793 -msgid "Launch from a Bash login shell" -msgstr "Aus einer Bash login shell starten" - -#: src/main.py:795 -msgid "Update paths for Cygwin" -msgstr "Pfade für Cygwin aktualisieren" - -#: src/main.py:799 -msgid "Version Control" -msgstr "Versionsverwaltung" - -#: src/main.py:863 -msgid "Preferences" -msgstr "Einstellungen" - -#: src/main.py:904 src/main.py:5802 -#, python-format -msgid "Error writing %s." -msgstr "Fehler beim Schreiben von %s." - -#: src/main.py:3282 -msgid "Align with Selection" -msgstr "Ausrichten an der Auswahl" - -#: src/main.py:3283 -msgid "Isolate" -msgstr "Isolieren" - -#: src/main.py:3284 -msgid "Merge Selection" -msgstr "Auswahl zusammenführen" - -#: src/main.py:3286 src/main.py:6098 -msgid "Cut" -msgstr "Ausschneiden" - -#: src/main.py:3287 src/main.py:6099 -msgid "Copy" -msgstr "Kopieren" - -#: src/main.py:3288 src/main.py:6100 -msgid "Paste" -msgstr "Einfügen" - -#: src/main.py:3290 -msgid "Select All" -msgstr "Alles auswählen" - -#: src/main.py:3291 src/main.py:6101 -msgid "Clear Edits" -msgstr "Alle Änderungen rückgängig" - -#: src/main.py:3293 -msgid "Swap with Selected Pane" -msgstr "Mit ausgewähltem Fenster tauschen" - -#: src/main.py:5124 -msgid "Find..." -msgstr "Suchen..." - -#: src/main.py:5132 -msgid "Search For: " -msgstr "Suchen nach: " - -#: src/main.py:5157 -msgid "Match Case" -msgstr "Übereinstimmen von Groß- und Kleinschreibung" - -#: src/main.py:5162 -msgid "Search Backwards" -msgstr "Rückwärts suchen" - -#: src/main.py:5176 -#, python-format -msgid "Closing this tab will quit %s." -msgstr "Schließen des letzten Tabs beendet %s." - -#: src/main.py:5198 -msgid "Encoding: " -msgstr "Kodierung: " - -#: src/main.py:5208 -msgid "Revision: " -msgstr "Revision: " - -#: src/main.py:5272 -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/main.py:5277 -msgid "translator-credits" -msgstr "Henri Menke " - -#: src/main.py:5281 -#, fuzzy -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -msgstr "" -"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n" -"\n" -"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.\n" -"\n" -"Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe .\n" - -#: src/main.py:5322 +#: src/diffuse/main.py:77 msgid "Close Tab" msgstr "Reiter schließen" -#: src/main.py:5377 +#: src/diffuse/main.py:120 msgid "Open File..." msgstr "Datei öffnen..." -#: src/main.py:5378 +#: src/diffuse/main.py:121 msgid "Reload File" msgstr "Datei neu laden" -#: src/main.py:5379 +#: src/diffuse/main.py:122 msgid "Save File" msgstr "Datei speichern" -#: src/main.py:5380 +#: src/diffuse/main.py:123 msgid "Save File As..." msgstr "Datei speichern unter..." -#: src/main.py:5525 +#: src/diffuse/main.py:268 msgid "Save changes before loading the new file?" msgstr "Änderungen speichern vor dem Laden der neuen Datei?" -#: src/main.py:5635 +#: src/diffuse/main.py:377 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "Fehler beim lesen der Revision %(rev)s von %(file)s." -#: src/main.py:5637 src/main.py:6900 +#: src/diffuse/main.py:379 src/diffuse/main.py:1712 #, python-format msgid "Error reading %s." msgstr "Fehler beim Lesen von %s." -#: src/main.py:5658 +#: src/diffuse/main.py:400 msgid "Open File" msgstr "Datei öffnen" -#: src/main.py:5708 +#: src/diffuse/main.py:450 #, 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/main.py:5728 +#: src/diffuse/main.py:470 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "Speichern %(title)s Fenster %(pane)d" -#: src/main.py:5754 +#: src/diffuse/main.py:496 #, 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/main.py:5759 +#: src/diffuse/main.py:501 #, 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?" +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/main.py:5800 +#: src/diffuse/main.py:540 #, python-format msgid "Error encoding to %s." msgstr "Fehler bei der Kodierung nach %s." -#: src/main.py:5830 +#: src/diffuse/main.py:542 +#, python-format +msgid "Error writing %s." +msgstr "Fehler beim Schreiben von %s." + +#: src/diffuse/main.py:570 msgid "Go To Line..." msgstr "Gehe zu Zeile..." -#: src/main.py:5830 +#: src/diffuse/main.py:570 msgid "Line Number: " msgstr "Zeilennummer: " -#: src/main.py:5856 -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/diffuse/main.py:596 +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/main.py:5858 +#: src/diffuse/main.py:598 msgid "Press the escape key to finish editing." msgstr "Drücken Sie die Escape Taste um die Bearbeitung zu beenden." -#: src/main.py:5860 -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/diffuse/main.py:600 +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/main.py:5971 +#: src/diffuse/main.py:711 msgid "_File" msgstr "_Datei" -#: src/main.py:5972 +#: src/diffuse/main.py:712 msgid "_Open File..." msgstr "_Öffne Datei..." -#: src/main.py:5973 +#: src/diffuse/main.py:713 msgid "Open File In New _Tab..." msgstr "Datei _in neuem Reiter öffnen..." -#: src/main.py:5974 +#: src/diffuse/main.py:714 msgid "Open _Modified Files..." msgstr "_Bearbeitete Dateien öffnen..." -#: src/main.py:5975 +#: src/diffuse/main.py:715 msgid "Open Commi_t..." msgstr "Revi_sion öffnen..." -#: src/main.py:5976 +#: src/diffuse/main.py:716 msgid "_Reload File" msgstr "Datei _neu laden" -#: src/main.py:5978 +#: src/diffuse/main.py:718 msgid "_Save File" msgstr "Datei _speichern" -#: src/main.py:5979 +#: src/diffuse/main.py:719 msgid "Save File _As..." msgstr "Datei speichern _unter..." -#: src/main.py:5980 +#: src/diffuse/main.py:720 msgid "Save A_ll" msgstr "_Alle speichern" -#: src/main.py:5982 +#: src/diffuse/main.py:722 msgid "New _2-Way File Merge" msgstr "Neues _2-Wege-Datei-Zusammenführen" -#: src/main.py:5983 +#: src/diffuse/main.py:723 msgid "New _3-Way File Merge" msgstr "Neues _3-Wege-Datei-Zusammenführen" -#: src/main.py:5984 +#: src/diffuse/main.py:724 msgid "New _N-Way File Merge..." msgstr "Neues _N-Wege-Datei-Zusammenführen..." -#: src/main.py:5986 +#: src/diffuse/main.py:726 msgid "_Close Tab" msgstr "_Reiter schließen" -#: src/main.py:5987 +#: src/diffuse/main.py:727 msgid "_Undo Close Tab" msgstr "_Reiter schließen rückgängig" -#: src/main.py:5988 +#: src/diffuse/main.py:728 msgid "_Quit" msgstr "_Beenden" -#: src/main.py:5990 +#: src/diffuse/main.py:730 msgid "_Edit" msgstr "_Bearbeiten" -#: src/main.py:5991 +#: src/diffuse/main.py:731 msgid "_Undo" msgstr "_Rückgängig" -#: src/main.py:5992 +#: src/diffuse/main.py:732 msgid "_Redo" msgstr "_Wiederholen" -#: src/main.py:5994 +#: src/diffuse/main.py:734 msgid "Cu_t" msgstr "_Ausschneiden" -#: src/main.py:5995 +#: src/diffuse/main.py:735 msgid "_Copy" msgstr "_Kopieren" -#: src/main.py:5996 +#: src/diffuse/main.py:736 msgid "_Paste" msgstr "_Einfügen" -#: src/main.py:5998 +#: src/diffuse/main.py:738 msgid "Select _All" msgstr "_Alles auswählen" -#: src/main.py:5999 +#: src/diffuse/main.py:739 msgid "C_lear Edits" msgstr "Alle _Änderungen rückgängig" -#: src/main.py:6000 +#: src/diffuse/main.py:740 msgid "_Dismiss All Edits" msgstr "Alle Än_derungen verwerfen" -#: src/main.py:6002 +#: src/diffuse/main.py:742 msgid "_Find..." msgstr "_Suchen..." -#: src/main.py:6003 +#: src/diffuse/main.py:743 msgid "Find _Next" msgstr "_Nächstes suchen" -#: src/main.py:6004 +#: src/diffuse/main.py:744 msgid "Find Pre_vious" msgstr "_Rückwärts suchen" -#: src/main.py:6005 +#: src/diffuse/main.py:745 msgid "_Go To Line..." msgstr "_Gehe zu Zeile..." -#: src/main.py:6007 +#: src/diffuse/main.py:747 msgid "Pr_eferences..." msgstr "_Einstellungen..." -#: src/main.py:6009 +#: src/diffuse/main.py:749 msgid "None" msgstr "Keine" -#: src/main.py:6017 +#: src/diffuse/main.py:757 msgid "_View" msgstr "_Ansicht" -#: src/main.py:6018 +#: src/diffuse/main.py:758 msgid "_Syntax Highlighting" msgstr "_Syntax Hervorhebung" -#: src/main.py:6020 +#: src/diffuse/main.py:760 msgid "Re_align All" msgstr "Alle neu _ausrichten" -#: src/main.py:6021 +#: src/diffuse/main.py:761 msgid "_Isolate" msgstr "_Isolieren" -#: src/main.py:6023 +#: src/diffuse/main.py:763 msgid "_First Difference" msgstr "_Erster Unterschied" -#: src/main.py:6024 +#: src/diffuse/main.py:764 msgid "_Previous Difference" msgstr "_Voriger Unterschied" -#: src/main.py:6025 +#: src/diffuse/main.py:765 msgid "_Next Difference" msgstr "_Nächster Unterschied" -#: src/main.py:6026 +#: src/diffuse/main.py:766 msgid "_Last Difference" msgstr "_Letzter Unterschied" -#: src/main.py:6028 +#: src/diffuse/main.py:768 msgid "Fir_st Tab" msgstr "Er_ster Reiter" -#: src/main.py:6029 +#: src/diffuse/main.py:769 msgid "Pre_vious Tab" msgstr "V_origer Reiter" -#: src/main.py:6030 +#: src/diffuse/main.py:770 msgid "Next _Tab" msgstr "N_ächster Reiter" -#: src/main.py:6031 +#: src/diffuse/main.py:771 msgid "Las_t Tab" msgstr "Letz_ter Reiter" -#: src/main.py:6033 +#: src/diffuse/main.py:773 msgid "Shift Pane _Right" msgstr "Fenster nach _rechts verschieben" -#: src/main.py:6034 +#: src/diffuse/main.py:774 msgid "Shift Pane _Left" msgstr "Fenster nach _links verschieben" -#: src/main.py:6036 +#: src/diffuse/main.py:776 msgid "F_ormat" msgstr "F_ormat" -#: src/main.py:6037 +#: src/diffuse/main.py:777 msgid "Convert To _Upper Case" msgstr "In Großb_uchstaben konvertieren" -#: src/main.py:6038 +#: src/diffuse/main.py:778 msgid "Convert To _Lower Case" msgstr "In K_leinbuchstaben konvertieren" -#: src/main.py:6040 +#: src/diffuse/main.py:780 msgid "Sort Lines In _Ascending Order" msgstr "Zeile in _aufsteigender Reihenfolge sortieren" -#: src/main.py:6041 +#: src/diffuse/main.py:781 msgid "Sort Lines In D_escending Order" msgstr "Zeile in abst_eigender Reihenfolge sortieren" -#: src/main.py:6043 +#: src/diffuse/main.py:783 msgid "Remove Trailing _White Space" msgstr "Entferne angehängte _Leerzeichen" -#: src/main.py:6044 +#: src/diffuse/main.py:784 msgid "Convert Tabs To _Spaces" msgstr "Tabulatoren in Leer_zeichen konvertieren" -#: src/main.py:6045 +#: src/diffuse/main.py:785 msgid "Convert Leading Spaces To _Tabs" msgstr "Vorangestellte Leerzeichen in _Tabulatoren konvertieren" -#: src/main.py:6047 +#: src/diffuse/main.py:787 msgid "_Increase Indenting" msgstr "Einzug er_höhen" -#: src/main.py:6048 +#: src/diffuse/main.py:788 msgid "De_crease Indenting" msgstr "Einzug _vermindern" -#: src/main.py:6050 +#: src/diffuse/main.py:790 msgid "Convert To _DOS Format" msgstr "Ins _DOS Format konvertieren" -#: src/main.py:6051 +#: src/diffuse/main.py:791 msgid "Convert To _Mac Format" msgstr "Ins _Mac Format konvertieren" -#: src/main.py:6052 +#: src/diffuse/main.py:792 msgid "Convert To Uni_x Format" msgstr "Ins Uni_x Format konvertieren" -#: src/main.py:6054 +#: src/diffuse/main.py:794 msgid "_Merge" msgstr "_Zusammenführen" -#: src/main.py:6055 +#: src/diffuse/main.py:795 msgid "Copy Selection _Right" msgstr "Auswahl nach _rechts kopieren" -#: src/main.py:6056 +#: src/diffuse/main.py:796 msgid "Copy Selection _Left" msgstr "Auswahl nach _links kopieren" -#: src/main.py:6058 +#: src/diffuse/main.py:798 msgid "Copy Left _Into Selection" msgstr "Von links _in die Auswahl kopieren" -#: src/main.py:6059 +#: src/diffuse/main.py:799 msgid "Copy Right I_nto Selection" msgstr "Von rechts i_n die Auswahl kopieren" -#: src/main.py:6060 +#: src/diffuse/main.py:800 msgid "_Merge From Left Then Right" msgstr "Zusammenführen von links, dann von rechts" -#: src/main.py:6061 +#: src/diffuse/main.py:801 msgid "M_erge From Right Then Left" msgstr "Zusammenführen von rechts, dann von links" -#: src/main.py:6063 +#: src/diffuse/main.py:803 msgid "_Help" msgstr "_Hilfe" -#: src/main.py:6064 +#: src/diffuse/main.py:804 msgid "_Help Contents..." msgstr "_Inhalt..." -#: src/main.py:6066 +#: src/diffuse/main.py:806 #, python-format msgid "_About %s..." msgstr "_Über %s..." -#: src/main.py:6080 +#: src/diffuse/main.py:820 msgid "New 2-Way File Merge" msgstr "Neues 2-Wege-Datei-Zusammenführen" -#: src/main.py:6081 +#: src/diffuse/main.py:821 msgid "New 3-Way File Merge" msgstr "Neues 3-Wege-Datei-Zusammenführen" -#: src/main.py:6083 +#: src/diffuse/main.py:823 msgid "Realign All" msgstr "Alle neu ausrichten" -#: src/main.py:6084 +#: src/diffuse/main.py:824 msgid "First Difference" msgstr "Erster Unterschied" -#: src/main.py:6085 +#: src/diffuse/main.py:825 msgid "Previous Difference" msgstr "Voriger Unterschied" -#: src/main.py:6086 +#: src/diffuse/main.py:826 msgid "Next Difference" msgstr "Nächster Unterschied" -#: src/main.py:6087 +#: src/diffuse/main.py:827 msgid "Last Difference" msgstr "Letzter Unterschied" -#: src/main.py:6089 +#: src/diffuse/main.py:829 msgid "Copy Selection Right" msgstr "Auswahl nach rechts kopieren" -#: src/main.py:6090 +#: src/diffuse/main.py:830 msgid "Copy Selection Left" msgstr "Auswahl nach links kopieren" -#: src/main.py:6091 +#: src/diffuse/main.py:831 msgid "Copy Left Into Selection" msgstr "Von links in die Auswahl kopieren" -#: src/main.py:6092 +#: src/diffuse/main.py:832 msgid "Copy Right Into Selection" msgstr "Von rechts in die Auswahl kopieren" -#: src/main.py:6093 +#: src/diffuse/main.py:833 msgid "Merge From Left Then Right" msgstr "Zusammenführen von links, dann von rechts" -#: src/main.py:6094 +#: src/diffuse/main.py:834 msgid "Merge From Right Then Left" msgstr "Zusammenführen von rechts, dann von links" -#: src/main.py:6096 +#: src/diffuse/main.py:836 msgid "Undo" msgstr "Rückgängig" -#: src/main.py:6097 +#: src/diffuse/main.py:837 msgid "Redo" msgstr "Wiederholen" -#: src/main.py:6221 -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/diffuse/main.py:838 +msgid "Cut" +msgstr "Ausschneiden" -#: src/main.py:6234 +#: src/diffuse/main.py:839 +msgid "Copy" +msgstr "Kopieren" + +#: src/diffuse/main.py:840 +msgid "Paste" +msgstr "Einfügen" + +#: src/diffuse/main.py:841 +msgid "Clear Edits" +msgstr "Alle Änderungen rückgängig" + +#: src/diffuse/main.py:961 +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/diffuse/main.py:974 msgid "Tab" msgstr "Reiter" -#: src/main.py:6239 +#: src/diffuse/main.py:979 msgid "Pane" msgstr "Fenster" -#: src/main.py:6250 +#: src/diffuse/main.py:990 msgid "Close _Without Saving" msgstr "Ohne speichern schließen" -#: src/main.py:6361 +#: src/diffuse/main.py:1026 +#, python-format +msgid "Closing this tab will quit %s." +msgstr "Schließen des letzten Tabs beendet %s." + +#: src/diffuse/main.py:1108 #, python-format msgid "File Merge %d" msgstr "Dateien zusammenführen %d" -#: src/main.py:6464 +#: src/diffuse/main.py:1211 #, python-format msgid "Error retrieving commits for %s." msgstr "Fehler beim Empfangen der Revisionen von %s." -#: src/main.py:6493 +#: src/diffuse/main.py:1240 #, python-format msgid "Error retrieving modifications for %s." msgstr "Fehler beim Empfangen der Bearbeitungen von %s." -#: src/main.py:6523 +#: src/diffuse/main.py:1270 msgid "Open File In New Tab" msgstr "Datei in neuem Reiter öffnen" -#: src/main.py:6539 +#: src/diffuse/main.py:1286 msgid "Choose Folder With Modified Files" msgstr "Ordner mit bearbeiteten Dateien auswählen" -#: src/main.py:6552 +#: src/diffuse/main.py:1299 msgid "No modified files found." msgstr "Keine bearbeiteten Dateien gefunden." -#: src/main.py:6557 +#: src/diffuse/main.py:1304 msgid "Choose Folder With Commit" msgstr "Ordner mit Revisionen auswählen" -#: src/main.py:6570 +#: src/diffuse/main.py:1317 msgid "No committed files found." msgstr "Keine revidierten Dateien gefunden." -#: src/main.py:6604 +#: src/diffuse/main.py:1351 msgid "New N-Way File Merge..." msgstr "Neues N-Wege-Datei-Zusammenführen..." -#: src/main.py:6604 +#: src/diffuse/main.py:1351 msgid "Number of panes: " msgstr "Anzahl der Fenster: " -#: src/main.py:6669 +#: src/diffuse/main.py:1416 msgid "Phrase not found. Continue from the end of the file?" msgstr "Ausdruck nicht gefunden. Am Ende der Datei fortsetzen?" -#: src/main.py:6671 +#: src/diffuse/main.py:1418 msgid "Phrase not found. Continue from the start of the file?" msgstr "Ausdruck nicht gefunden. Am Anfang der Datei fortsetzen?" -#: src/main.py:6819 +#: src/diffuse/main.py:1631 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" @@ -1039,10 +615,13 @@ msgstr "" " diffuse ( -h | -? | --help | -v | --version )\n" "\n" "Diffuse ist ein graphisches Werkzeug zum Zusammenführen und Vergleichen von\n" -"Textdateien. Diffuse ist in der Lage eine beliebige Anzahl von Dateien direkt\n" +"Textdateien. Diffuse ist in der Lage eine beliebige Anzahl von Dateien " +"direkt\n" "zu vergleichen und gibt Nutzern die Möglichkeit manuell die Übereinstimmung\n" -"anzupassen und Dateien direkt zu bearbeiten. Diffuse kann ebenfalls Revisionen\n" -"von Bazaar, CVS, Darcs, Git und Mercurial, Monotone, RCS, Subversion und SVK\n" +"anzupassen und Dateien direkt zu bearbeiten. Diffuse kann ebenfalls " +"Revisionen\n" +"von Bazaar, CVS, Darcs, Git und Mercurial, Monotone, RCS, Subversion und " +"SVK\n" "Depots empfangen um sie zu Vergleichen und zusammenzuführen.\n" "\n" "Hilfe Optionen:\n" @@ -1056,48 +635,51 @@ msgstr "" "Generelle Optionen:\n" " ( -c | --commit ) Datei Revisionen und \n" " ( -D | --close-if-same ) Alle Reiter ohne Unterschiede schließen\n" -" ( -e | --encoding ) verwenden zum Lesen und Schreiben von\n" +" ( -e | --encoding ) verwenden zum Lesen und Schreiben " +"von\n" " Dateien\n" " ( -L | --label )