GNOME.org
 

[meld] Update Czech translation

commit 91cb866babca72934bae68227bbf11641a0ea80b
Author: Petr Kovar <pknbe volny cz>
Date:   Sun Oct 31 11:33:56 2010 +0100

    Update Czech translation

 po/cs.po |  999 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 549 insertions(+), 450 deletions(-)
---
diff --git a/po/cs.po b/po/cs.po
index 2785169..fc8a8ed 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,21 +8,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2010-03-20 02:39+0100\n"
-"PO-Revision-Date: 2010-03-20 02:38+0100\n"
+"POT-Creation-Date: 2010-10-31 11:33+0100\n"
+"PO-Revision-Date: 2010-10-31 11:31+0100\n"
 "Last-Translator: Petr Kovar <pknbe volny cz>\n"
 "Language-Team: Czech <gnome-cs-list gnome org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.1\n"
 
-#: ../bin/meld:77
+#: ../bin/meld:96
 msgid "Cannot import: "
 msgstr "Nelze importovat: "
 
-#: ../bin/meld:80
+#: ../bin/meld:99
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld vyžaduje %s nebo vyšší."
@@ -35,7 +36,7 @@ msgstr "Porovnává a sluÄ?uje soubory"
 msgid "Diff Viewer"
 msgstr "ProhlížeÄ? rozdílů"
 
-#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.glade.h:20
+#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.ui.h:5
 msgid "Meld"
 msgstr "Meld"
 
@@ -43,211 +44,189 @@ msgstr "Meld"
 msgid "Meld Diff Viewer"
 msgstr "ProhlížeÄ? rozdílů Meld"
 
-#: ../data/ui/filediff.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
-"Which ones would you like to save?</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">NÄ?které soubory byly zmÄ?nÄ?ny.\n"
-"Které z nich chcete uložit?</span>"
-
-#: ../data/ui/filediff.glade.h:3
-msgid "Copy to Clipboard"
-msgstr "Kopírovat do schránky"
-
-#: ../data/ui/filediff.glade.h:4 ../meld/filediff.py:177
-msgid "Create Patch"
-msgstr "VytvoÅ?it patch"
-
-#: ../data/ui/filediff.glade.h:5
+#: ../data/ui/filediff.ui.h:1
 msgid "Save modified files?"
 msgstr "Uložit zmÄ?nÄ?né soubory?"
 
-#: ../data/ui/filediff.glade.h:6
+#: ../data/ui/filediff.ui.h:2
+msgid ""
+"Some files have been modified.\n"
+"Which ones would you like to save?"
+msgstr ""
+"NÄ?které soubory byly zmÄ?nÄ?ny.\n"
+"Které z nich chcete uložit?"
+
+#: ../data/ui/filediff.ui.h:4
 msgid "_Discard Changes"
 msgstr "_Zahodit zmÄ?ny"
 
-#: ../data/ui/filediff.glade.h:7
+#: ../data/ui/filediff.ui.h:5
 msgid "_Save Selected"
 msgstr "_Uložit vybrané"
 
-#: ../data/ui/findbar.glade.h:1
+#: ../data/ui/findbar.ui.h:1
 msgid "Regular E_xpression"
 msgstr "Re_gulární výraz"
 
-#: ../data/ui/findbar.glade.h:2
+#: ../data/ui/findbar.ui.h:2
 msgid "Replace _All"
 msgstr "Nahradit _vše"
 
-#: ../data/ui/findbar.glade.h:3
+#: ../data/ui/findbar.ui.h:3
 msgid "Replace _With"
 msgstr "Nahradit _s"
 
-#: ../data/ui/findbar.glade.h:4
+#: ../data/ui/findbar.ui.h:4
 msgid "Who_le word"
 msgstr "Ce_lé slovo"
 
-#: ../data/ui/findbar.glade.h:5
+#: ../data/ui/findbar.ui.h:5
 msgid "_Match Case"
 msgstr "_Rozlišovat velikost písmen"
 
-#: ../data/ui/findbar.glade.h:6
+#: ../data/ui/findbar.ui.h:6
 msgid "_Next"
 msgstr "_Následující"
 
-#: ../data/ui/findbar.glade.h:7
+#: ../data/ui/findbar.ui.h:7
 msgid "_Previous"
 msgstr "_PÅ?edchozí"
 
-#: ../data/ui/findbar.glade.h:8 ../meld/meldapp.py:443
+#: ../data/ui/findbar.ui.h:8 ../meld/meldapp.py:147
 msgid "_Replace"
 msgstr "Nahradi_t"
 
-#: ../data/ui/findbar.glade.h:9
+#: ../data/ui/findbar.ui.h:9
 msgid "_Search for"
 msgstr "_Hledat"
 
-#: ../data/ui/meldapp.glade.h:1
-msgid "<b>Edit Menu</b>"
-msgstr "<b>Upravit menu</b>"
+#: ../data/ui/meldapp.ui.h:1
+msgid "Choose Files"
+msgstr "Zvolte soubory"
 
-#: ../data/ui/meldapp.glade.h:2
-msgid "<b>Font</b>"
-msgstr "<b>Písmo</b>"
+#: ../data/ui/meldapp.ui.h:2
+msgid ""
+"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
+"Copyright &#xA9; 2009-2010 Kai Willadsen"
+msgstr ""
+"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
+"Copyright &#xA9; 2009-2010 Kai Willadsen"
 
-#: ../data/ui/meldapp.glade.h:3
-msgid "<b>Loading</b>"
-msgstr "<b>NaÄ?ítání</b>"
+#: ../data/ui/meldapp.ui.h:4
+msgid "Directory"
+msgstr "AdresáÅ?"
 
-#: ../data/ui/meldapp.glade.h:4
-msgid "<b>Misc</b>"
-msgstr "<b>Různé</b>"
+#: ../data/ui/meldapp.ui.h:6
+msgid "Mine"
+msgstr "Moje"
 
-#: ../data/ui/meldapp.glade.h:5
-msgid "Automatically supply missing newline at end of file"
-msgstr "Automaticky pÅ?idávat chybÄ?jící nový Å?ádek na konci souboru"
+#: ../data/ui/meldapp.ui.h:7
+msgid "Original"
+msgstr "Původní"
 
-#: ../data/ui/meldapp.glade.h:6
-msgid "Choose Files"
-msgstr "Zvolte soubory"
+#: ../data/ui/meldapp.ui.h:8
+msgid "Other"
+msgstr "Jiné"
 
-#: ../data/ui/meldapp.glade.h:7
-msgid "Copyright © 2002-2009 Stephen Kennedy"
-msgstr "Copyright © 2002-2009 Stephen Kennedy"
+#: ../data/ui/meldapp.ui.h:9
+msgid "Select VC Directory"
+msgstr "Vybrat adresáÅ? správy verzí"
 
-#: ../data/ui/meldapp.glade.h:8
-msgid "Custom command"
-msgstr "Vlastní pÅ?íkaz"
+#: ../data/ui/meldapp.ui.h:10
+msgid "_Directory Comparison"
+msgstr "Porovnávání _adresáÅ?ů"
 
-#: ../data/ui/meldapp.glade.h:9
-msgid "Directory"
-msgstr "AdresáÅ?"
+#: ../data/ui/meldapp.ui.h:11
+msgid "_File Comparison"
+msgstr "Porovnávání _souborů"
+
+#: ../data/ui/meldapp.ui.h:12
+msgid "_Three Way Compare"
+msgstr "_Trojcestné porovnávání"
 
-#: ../data/ui/meldapp.glade.h:10
-msgid "Edit files with:"
-msgstr "Upravit soubory s:"
+#: ../data/ui/meldapp.ui.h:13
+msgid "_Version Control Browser"
+msgstr "_ProhlížeÄ? správy verzí"
+
+#: ../data/ui/meldapp.ui.h:14
+msgid "translator-credits"
+msgstr ""
+"Miloslav TrmaÄ? <mitr volny cz>\n"
+"Petr KováÅ? <pknbe volny cz>"
 
-#: ../data/ui/meldapp.glade.h:11
+#: ../data/ui/preferences.ui.h:1
+msgid "Display"
+msgstr "Zobrazení"
+
+#: ../data/ui/preferences.ui.h:2
+msgid "Do not _split words over two lines"
+msgstr "NerozdÄ?lovat _slova na dva Å?ádky"
+
+#: ../data/ui/preferences.ui.h:3
+msgid "Edito_r command:"
+msgstr "PÅ?íkaz edito_ru:"
+
+#: ../data/ui/preferences.ui.h:4
 msgid "Editor"
 msgstr "Editor"
 
-#: ../data/ui/meldapp.glade.h:12
+#: ../data/ui/preferences.ui.h:5
+msgid "Enable text _wrapping"
+msgstr "Povolit zalamování _textu"
+
+#: ../data/ui/preferences.ui.h:6
 msgid "Encoding"
 msgstr "Kódování"
 
-#: ../data/ui/meldapp.glade.h:13
+#: ../data/ui/preferences.ui.h:7
+msgid "External editor"
+msgstr "Externí editor"
+
+#: ../data/ui/preferences.ui.h:8
 msgid "File Filters"
 msgstr "Filtry souborů"
 
-#: ../data/ui/meldapp.glade.h:14
-msgid "Gnome default editor"
-msgstr "Výchozí editor GNOME"
+#: ../data/ui/preferences.ui.h:9
+msgid "Font"
+msgstr "Písmo"
 
-#: ../data/ui/meldapp.glade.h:15
+#: ../data/ui/preferences.ui.h:10
 msgid "Ignore changes which insert or delete blank lines"
 msgstr "Ignorovat zmÄ?ny, které pÅ?idávají nebo odstraÅ?ují prázdné Å?ádky"
 
-#: ../data/ui/meldapp.glade.h:16
+#: ../data/ui/preferences.ui.h:11
 msgid "Ignore symbolic links"
 msgstr "Ignorovat symbolické odkazy"
 
-#: ../data/ui/meldapp.glade.h:17
-msgid "Insert spaces instead of tabs"
-msgstr "Vkládat mezery namísto tabulátorů"
-
-#: ../data/ui/meldapp.glade.h:18
-msgid "Internal editor"
-msgstr "VnitÅ?ní editor"
-
-#: ../data/ui/meldapp.glade.h:19
-msgid "Line Wrapping "
-msgstr "Zalamování Å?ádků "
-
-#: ../data/ui/meldapp.glade.h:21
-msgid "Mine"
-msgstr "Moje"
-
-#: ../data/ui/meldapp.glade.h:22
-msgid "Original"
-msgstr "Původní"
-
-#: ../data/ui/meldapp.glade.h:23
-msgid "Other"
-msgstr "Jiné"
-
-#: ../data/ui/meldapp.glade.h:24
-msgid "Preferences : Meld"
-msgstr "PÅ?edvolby: Meld"
+#: ../data/ui/preferences.ui.h:12
+msgid "Loading"
+msgstr "NaÄ?ítání"
 
-#: ../data/ui/meldapp.glade.h:25
-msgid "Show line numbers"
-msgstr "Zobrazovat Ä?ísla Å?ádků"
+#: ../data/ui/preferences.ui.h:13
+msgid "Meld Preferences"
+msgstr "PÅ?edvolby aplikace Meld"
 
-#: ../data/ui/meldapp.glade.h:26
-msgid "Tab width"
-msgstr "ŠíÅ?ka tabulátoru"
+#: ../data/ui/preferences.ui.h:14
+msgid "Show _line numbers"
+msgstr "Zobrazovat Ä?ís_la Å?ádků"
 
-#: ../data/ui/meldapp.glade.h:27
+#: ../data/ui/preferences.ui.h:15
 msgid "Text Filters"
 msgstr "Filtry textu"
 
-#: ../data/ui/meldapp.glade.h:28
-msgid "Three way directory"
-msgstr "TÅ?i adresáÅ?e"
+#: ../data/ui/preferences.ui.h:16
+msgid "Use _default system editor"
+msgstr "Používat výchozí e_ditor systému"
 
-#: ../data/ui/meldapp.glade.h:29
-msgid "Three way file"
-msgstr "TÅ?i soubory"
+#: ../data/ui/preferences.ui.h:17
+msgid "Use s_yntax highlighting"
+msgstr "Používat zvýrazÅ?ování s_yntaxe"
 
-#: ../data/ui/meldapp.glade.h:30
-msgid "Two way directory"
-msgstr "Dva adresáÅ?e"
-
-#: ../data/ui/meldapp.glade.h:31
-msgid "Two way file"
-msgstr "Dva soubory"
-
-#: ../data/ui/meldapp.glade.h:32
-msgid "Use GNOME monospace font"
-msgstr "Používat neproporcionální písmo GNOME"
-
-#: ../data/ui/meldapp.glade.h:33
-msgid "Use custom font"
-msgstr "Používat vlastní písmo"
-
-#: ../data/ui/meldapp.glade.h:34
-msgid "Use syntax highlighting"
-msgstr "Používat zvýrazÅ?ování syntaxe"
-
-#: ../data/ui/meldapp.glade.h:35
-msgid "Version control view"
-msgstr "Zobrazení správy verzí"
-
-#: ../data/ui/meldapp.glade.h:36
+#: ../data/ui/preferences.ui.h:18
 msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
 msgstr "PÅ?i naÄ?ítání zkusit postupnÄ? tyto kodeky (napÅ?. utf8, iso8859)"
 
-#: ../data/ui/meldapp.glade.h:37
+#: ../data/ui/preferences.ui.h:19
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -257,7 +236,7 @@ msgstr ""
 "Každý vzorek je seznamem zástupných znaků ve stylu shellu oddÄ?lovaný "
 "mezerami."
 
-#: ../data/ui/meldapp.glade.h:38
+#: ../data/ui/preferences.ui.h:20
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -270,172 +249,160 @@ msgstr ""
 "pÅ?ed provedením porovnání. Pokud výraz obsahuje skupiny, jsou nahrazeny jen "
 "skupiny. Více podrobností viz pÅ?íruÄ?ka uživatele."
 
-#: ../data/ui/meldapp.glade.h:39
-msgid "_Character"
-msgstr "Zna_k"
+#: ../data/ui/preferences.ui.h:21
+msgid "_Editor font:"
+msgstr "Písmo _editoru:"
 
-#: ../data/ui/meldapp.glade.h:40
-msgid "_Directory Comparison"
-msgstr "Porovnávání _adresáÅ?ů"
+#: ../data/ui/preferences.ui.h:22
+msgid "_Insert spaces instead of tabs"
+msgstr "V_kládat mezery namísto tabulátorů"
 
-#: ../data/ui/meldapp.glade.h:41
-msgid "_File Comparison"
-msgstr "Porovnávání _souborů"
-
-#: ../data/ui/meldapp.glade.h:42
-msgid "_None"
-msgstr "Žád_né"
-
-#: ../data/ui/meldapp.glade.h:43
-msgid "_Three Way Compare"
-msgstr "_Trojcestné porovnávání"
-
-#: ../data/ui/meldapp.glade.h:44
-msgid "_Version Control Browser"
-msgstr "_ProhlížeÄ? správy verzí"
+#: ../data/ui/preferences.ui.h:23
+msgid "_Tab width:"
+msgstr "ŠíÅ?ka _tabulátoru:"
 
-#: ../data/ui/meldapp.glade.h:45
-msgid "_Word"
-msgstr "_Slovo"
+#: ../data/ui/preferences.ui.h:24
+msgid "_Use the system fixed width font"
+msgstr "Po_užívat systémové písmo s pevnou šíÅ?kou"
 
-#: ../data/ui/vcview.glade.h:1
+#: ../data/ui/vcview.ui.h:1
 msgid "Commit Files"
 msgstr "Commit souborů"
 
-#: ../data/ui/vcview.glade.h:2
+#: ../data/ui/vcview.ui.h:2
 msgid "Compare Options"
 msgstr "Možnosti porovnávání"
 
-#: ../data/ui/vcview.glade.h:3
+#: ../data/ui/vcview.ui.h:3
 msgid "Date"
 msgstr "Datum"
 
-#: ../data/ui/vcview.glade.h:4
+#: ../data/ui/vcview.ui.h:4
 msgid "Local copy against other remote revision"
 msgstr "Místní kopii s jinou vzdálenou verzí"
 
-#: ../data/ui/vcview.glade.h:5
+#: ../data/ui/vcview.ui.h:5
 msgid "Local copy against same remote revision"
 msgstr "Místní kopii se stejnou vzdálenou verzí"
 
-#: ../data/ui/vcview.glade.h:6
+#: ../data/ui/vcview.ui.h:6
 msgid "Log Message"
 msgstr "Zpráva záznamu"
 
-#: ../data/ui/vcview.glade.h:7
+#: ../data/ui/vcview.ui.h:7
 msgid "Previous Logs"
 msgstr "PÅ?edchozí záznamy"
 
-#: ../data/ui/vcview.glade.h:8 ../meld/vcview.py:183
+#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:189
 msgid "Tag"
 msgstr "Tag"
 
-#: ../data/ui/vcview.glade.h:9
+#: ../data/ui/vcview.ui.h:9
 msgid "VC Log"
 msgstr "Záznam správy verzí"
 
-#: ../meld/dirdiff.py:184 ../meld/vcview.py:125
+#: ../meld/dirdiff.py:142 ../meld/vcview.py:128
 msgid "_Compare"
 msgstr "_Porovnat"
 
-#: ../meld/dirdiff.py:184 ../meld/vcview.py:125
+#: ../meld/dirdiff.py:142 ../meld/vcview.py:128
 msgid "Compare selected"
 msgstr "Porovnat vybrané"
 
-#: ../meld/dirdiff.py:185
+#: ../meld/dirdiff.py:143
 msgid "Left"
 msgstr "Levé"
 
-#: ../meld/dirdiff.py:185 ../meld/filediff.py:184
+#: ../meld/dirdiff.py:143
 msgid "Copy To Left"
 msgstr "Kopírovat doleva"
 
-#: ../meld/dirdiff.py:186
+#: ../meld/dirdiff.py:144
 msgid "Right"
 msgstr "Pravé"
 
-#: ../meld/dirdiff.py:186 ../meld/filediff.py:185
+#: ../meld/dirdiff.py:144
 msgid "Copy To Right"
 msgstr "Kopírovat doprava"
 
-#: ../meld/dirdiff.py:187
+#: ../meld/dirdiff.py:145
 msgid "Delete selected"
 msgstr "Odstranit vybrané"
 
-#: ../meld/dirdiff.py:188 ../meld/filediff.py:762
+#: ../meld/dirdiff.py:146 ../meld/filediff.py:913
 msgid "Hide"
 msgstr "Skrýt"
 
-#: ../meld/dirdiff.py:188
+#: ../meld/dirdiff.py:146
 msgid "Hide selected"
 msgstr "Skrýt vybrané"
 
-#: ../meld/dirdiff.py:190 ../meld/filediff.py:176 ../meld/vcview.py:126
+#: ../meld/dirdiff.py:148 ../meld/filediff.py:226 ../meld/vcview.py:129
 msgid "Open selected"
 msgstr "OtevÅ?ít vybrané"
 
-#: ../meld/dirdiff.py:194
+#: ../meld/dirdiff.py:152
 msgid "Case"
 msgstr "Velikost písmen"
 
-#: ../meld/dirdiff.py:194
+#: ../meld/dirdiff.py:152
 msgid "Ignore case of entries"
 msgstr "Ignorovat velikost písmen"
 
-#: ../meld/dirdiff.py:195
+#: ../meld/dirdiff.py:153
 msgid "Same"
 msgstr "Stejné"
 
-#: ../meld/dirdiff.py:195
+#: ../meld/dirdiff.py:153
 msgid "Show identical"
 msgstr "Zobrazovat stejné"
 
-#: ../meld/dirdiff.py:196
+#: ../meld/dirdiff.py:154
 msgid "New"
 msgstr "Nové"
 
-#: ../meld/dirdiff.py:196
+#: ../meld/dirdiff.py:154
 msgid "Show new"
 msgstr "Zobrazovat nové"
 
-#: ../meld/dirdiff.py:197
+#: ../meld/dirdiff.py:155
 msgid "Modified"
 msgstr "ZmÄ?nÄ?né"
 
-#: ../meld/dirdiff.py:197 ../meld/vcview.py:139
+#: ../meld/dirdiff.py:155 ../meld/vcview.py:142
 msgid "Show modified"
 msgstr "Zobrazovat zmÄ?nÄ?né"
 
-#: ../meld/dirdiff.py:199
+#: ../meld/dirdiff.py:157
 msgid "Filters"
 msgstr "Filtry"
 
-#: ../meld/dirdiff.py:199
+#: ../meld/dirdiff.py:157
 msgid "Set active filters"
 msgstr "Nastavte aktivní filtry"
 
-#: ../meld/dirdiff.py:252 ../meld/dirdiff.py:298
+#: ../meld/dirdiff.py:213 ../meld/dirdiff.py:259
 #, python-format
 msgid "Error converting pattern '%s' to regular expression"
 msgstr "Chyba pÅ?i pÅ?evodu vzorku \"%s\" na regulární výraz"
 
-#: ../meld/dirdiff.py:309
+#: ../meld/dirdiff.py:270
 #, python-format
 msgid "Hide %s"
 msgstr "Skrýt %s"
 
-#: ../meld/dirdiff.py:394 ../meld/dirdiff.py:404 ../meld/vcview.py:272
-#: ../meld/vcview.py:300
+#: ../meld/dirdiff.py:355 ../meld/dirdiff.py:365 ../meld/vcview.py:309
+#: ../meld/vcview.py:337
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Prochází se %s"
 
-#: ../meld/dirdiff.py:433
+#: ../meld/dirdiff.py:394
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "\"%s\" skryto \"%s\""
 
-#: ../meld/dirdiff.py:439
+#: ../meld/dirdiff.py:400
 #, python-format
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
@@ -446,12 +413,12 @@ msgstr ""
 "rozliÅ¡ujícím velikost písmen. NÄ?které soubory nejsou zobrazené:\n"
 "%s"
 
-#: ../meld/dirdiff.py:516
+#: ../meld/dirdiff.py:477
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Hotovo"
 
-#: ../meld/dirdiff.py:562
+#: ../meld/dirdiff.py:523
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -460,7 +427,7 @@ msgstr ""
 "\"%s\" existuje.\n"
 "PÅ?epsat?"
 
-#: ../meld/dirdiff.py:569
+#: ../meld/dirdiff.py:530
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -471,7 +438,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:587 ../meld/vcview.py:459
+#: ../meld/dirdiff.py:548 ../meld/vcview.py:496
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -480,7 +447,7 @@ msgstr ""
 "\"%s\" je adresáÅ?em.\n"
 "Odstranit rekurzivnÄ??"
 
-#: ../meld/dirdiff.py:594 ../meld/vcview.py:464
+#: ../meld/dirdiff.py:555 ../meld/vcview.py:501
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -491,7 +458,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:606
+#: ../meld/dirdiff.py:567
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -499,7 +466,7 @@ msgstr[0] "%i sekunda"
 msgstr[1] "%i sekundy"
 msgstr[2] "%i sekund"
 
-#: ../meld/dirdiff.py:607
+#: ../meld/dirdiff.py:568
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -507,7 +474,7 @@ msgstr[0] "%i minuta"
 msgstr[1] "%i minuty"
 msgstr[2] "%i minut"
 
-#: ../meld/dirdiff.py:608
+#: ../meld/dirdiff.py:569
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -515,7 +482,7 @@ msgstr[0] "%i hodina"
 msgstr[1] "%i hodiny"
 msgstr[2] "%i hodin"
 
-#: ../meld/dirdiff.py:609
+#: ../meld/dirdiff.py:570
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -523,7 +490,7 @@ msgstr[0] "%i den"
 msgstr[1] "%i dny"
 msgstr[2] "%i dnů"
 
-#: ../meld/dirdiff.py:610
+#: ../meld/dirdiff.py:571
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -531,7 +498,7 @@ msgstr[0] "%i týden"
 msgstr[1] "%i týdny"
 msgstr[2] "%i týdnů"
 
-#: ../meld/dirdiff.py:611
+#: ../meld/dirdiff.py:572
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -539,7 +506,7 @@ msgstr[0] "%i mÄ?síc"
 msgstr[1] "%i mÄ?síce"
 msgstr[2] "%i mÄ?síců"
 
-#: ../meld/dirdiff.py:612
+#: ../meld/dirdiff.py:573
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -547,75 +514,111 @@ msgstr[0] "%i rok"
 msgstr[1] "%i roky"
 msgstr[2] "%i let"
 
-#: ../meld/filediff.py:177
-msgid "Create a patch"
-msgstr "VytvoÅ?it patch"
+#: ../meld/filediff.py:227
+msgid "Format as patch..."
+msgstr "Formátovat jako záplatu..."
+
+#: ../meld/filediff.py:227
+msgid "Create a patch using differences between files"
+msgstr "VytvoÅ?it záplatu použitím rozdílů mezi soubory"
+
+#: ../meld/filediff.py:228
+msgid "Previous conflict"
+msgstr "PÅ?edchozí konflikt"
+
+#: ../meld/filediff.py:228
+msgid "Go to the previous conflict"
+msgstr "PÅ?ejít na pÅ?edchozí konflikt"
 
-#: ../meld/filediff.py:178
+#: ../meld/filediff.py:229
+msgid "Next conflict"
+msgstr "Následující konflikt"
+
+#: ../meld/filediff.py:229
+msgid "Go to the next conflict"
+msgstr "PÅ?ejít na následující konflikt"
+
+#: ../meld/filediff.py:230
 msgid "Push to left"
 msgstr "ZatlaÄ?it doleva"
 
-#: ../meld/filediff.py:178
+#: ../meld/filediff.py:230
 msgid "Push current change to the left"
 msgstr "ZatlaÄ?it aktuální zmÄ?nu doleva"
 
-#: ../meld/filediff.py:179
+#: ../meld/filediff.py:231
 msgid "Push to right"
 msgstr "ZatlaÄ?it doprava"
 
-#: ../meld/filediff.py:179
+#: ../meld/filediff.py:231
 msgid "Push current change to the right"
 msgstr "ZatlaÄ?it aktuální zmÄ?nu doprava"
 
 #. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:181
+#: ../meld/filediff.py:233
 msgid "Pull from left"
 msgstr "Vytáhnout zleva"
 
-#: ../meld/filediff.py:181
+#: ../meld/filediff.py:233
 msgid "Pull change from the left"
 msgstr "Vytáhnout zmÄ?nu zleva"
 
-#: ../meld/filediff.py:182
+#: ../meld/filediff.py:234
 msgid "Pull from right"
 msgstr "Vytáhnout zprava"
 
-#: ../meld/filediff.py:182
+#: ../meld/filediff.py:234
 msgid "Pull change from the right"
 msgstr "Vytáhnout zmÄ?nu zprava"
 
-#: ../meld/filediff.py:183
+#: ../meld/filediff.py:235
 msgid "Delete"
 msgstr "Smazat"
 
-#: ../meld/filediff.py:183
+#: ../meld/filediff.py:235
 msgid "Delete change"
 msgstr "Smazat zmÄ?nu"
 
-#: ../meld/filediff.py:184
-msgid "Copy all changes from right pane to left pane"
-msgstr "Kopírovat vÅ¡echny zmÄ?ny z pravého panelu do levého"
+#: ../meld/filediff.py:236
+msgid "Merge all changes from left"
+msgstr "SlouÄ?it veÅ¡keré zmÄ?ny zleva"
+
+#: ../meld/filediff.py:236
+msgid "Merge all non-conflicting changes from the left"
+msgstr "SlouÄ?it veÅ¡keré zmÄ?ny bez konfliktů zleva"
+
+#: ../meld/filediff.py:237
+msgid "Merge all changes from right"
+msgstr "SlouÄ?it veÅ¡keré zmÄ?ny zprava"
 
-#: ../meld/filediff.py:185
-msgid "Copy all changes from left pane to right pane"
-msgstr "Kopírovat vÅ¡echny zmÄ?ny z levého panelu do pravého"
+#: ../meld/filediff.py:237
+msgid "Merge all non-conflicting changes from the right"
+msgstr "SlouÄ?it veÅ¡keré zmÄ?ny bez konfliktů zprava"
+
+#: ../meld/filediff.py:238
+msgid "Merge all non-conflicting"
+msgstr "SlouÄ?it vÅ¡e bez konfliktů"
+
+#: ../meld/filediff.py:238
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr "SlouÄ?it veÅ¡keré zmÄ?ny bez konfliktů z levého a pravého panelu"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:252
+#: ../meld/filediff.py:309
 msgid "INS"
 msgstr "VKL"
 
-#: ../meld/filediff.py:252
+#: ../meld/filediff.py:309
 msgid "OVR"
 msgstr "PÅ?E"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:254
+#: ../meld/filediff.py:311
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Å?ád %i, sl %i"
 
-#: ../meld/filediff.py:389
+#: ../meld/filediff.py:493
 #, python-format
 msgid ""
 "Regular expression '%s' changed the number of lines in the file. Comparison "
@@ -625,54 +628,54 @@ msgstr ""
 "správné. Další podrobnosti viz pÅ?íruÄ?ka uživatele."
 
 #. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:486
+#: ../meld/filediff.py:596
 msgid "<unnamed>"
 msgstr "<bez názvu>"
 
-#: ../meld/filediff.py:667
+#: ../meld/filediff.py:774
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Nastaven poÄ?et panelů"
 
-#: ../meld/filediff.py:673
+#: ../meld/filediff.py:780
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Otevírají se soubory"
 
-#: ../meld/filediff.py:679 ../meld/filediff.py:766
+#: ../meld/filediff.py:786 ../meld/filediff.py:917
 msgid "Hi_de"
 msgstr "_Skrýt"
 
-#: ../meld/filediff.py:700 ../meld/filediff.py:711 ../meld/filediff.py:724
-#: ../meld/filediff.py:730
+#: ../meld/filediff.py:807 ../meld/filediff.py:816 ../meld/filediff.py:828
+#: ../meld/filediff.py:834
 msgid "Could not read file"
 msgstr "Nelze pÅ?eÄ?íst soubor"
 
-#: ../meld/filediff.py:703
+#: ../meld/filediff.py:808
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Ä?tou se soubory"
 
-#: ../meld/filediff.py:712
+#: ../meld/filediff.py:817
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je zÅ?ejmÄ? binárním souborem."
 
-#: ../meld/filediff.py:725
+#: ../meld/filediff.py:829
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s není v kódováních: %s"
 
-#: ../meld/filediff.py:750
+#: ../meld/filediff.py:859 ../meld/filemerge.py:69
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] PoÄ?ítají se rozdíly"
 
-#: ../meld/filediff.py:761
+#: ../meld/filediff.py:911
 msgid "Files are identical"
 msgstr "Soubory jsou stejné"
 
-#: ../meld/filediff.py:914
+#: ../meld/filediff.py:1046
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -681,7 +684,7 @@ msgstr ""
 "\"%s\" existuje!\n"
 "PÅ?epsat?"
 
-#: ../meld/filediff.py:927
+#: ../meld/filediff.py:1059
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -692,12 +695,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:936
+#: ../meld/filediff.py:1068
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Zvolte název vyrovnávací pamÄ?ti %i."
 
-#: ../meld/filediff.py:950
+#: ../meld/filediff.py:1083
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -708,7 +711,7 @@ msgstr ""
 "\n"
 "Jaký formát chcete používat?"
 
-#: ../meld/filediff.py:966
+#: ../meld/filediff.py:1099
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -717,12 +720,7 @@ msgstr ""
 "\"%s\" obsahuje znaky, které nelze kódovat v \"%s\"\n"
 "Chcete uložit jako UTF-8?"
 
-#. save as
-#: ../meld/filediff.py:1004
-msgid "Save patch as..."
-msgstr "Uložit patch jako..."
-
-#: ../meld/filediff.py:1062
+#: ../meld/filediff.py:1156
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -735,463 +733,503 @@ msgstr ""
 "\n"
 "Tuto operaci nelze vzít zpÄ?t."
 
-#: ../meld/meldapp.py:151
-msgid "label"
-msgstr "popisek"
-
-#: ../meld/meldapp.py:151
-msgid "pattern"
-msgstr "vzorek"
-
-#: ../meld/meldapp.py:219
-msgid "Only available if you have gnome-python-desktop installed"
-msgstr "K dispozici jen pokud je nainstalován gnome-python-desktop"
-
-#. file filters
-#. text filters
-#: ../meld/meldapp.py:229 ../meld/meldapp.py:234 ../meld/vcview.py:163
-msgid "Name"
-msgstr "Název"
-
-#: ../meld/meldapp.py:229 ../meld/meldapp.py:234
-msgid "Active"
-msgstr "Aktivní"
-
-#: ../meld/meldapp.py:229
-msgid "Pattern"
-msgstr "Vzorek"
-
-#: ../meld/meldapp.py:234
-msgid "Regex"
-msgstr "Reg. výraz"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:341
-msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-msgstr "Zálohy\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:343
+#: ../meld/filemerge.py:82
 #, python-format
-msgid "Version Control\t1\t%s\n"
-msgstr "Správa verzí\t1\t%s\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:345
-msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
-msgstr "Binární soubory\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:347
-msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
-msgstr "Multimédia\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:349
-msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
-msgstr "KlíÄ?ová slova CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:351
-msgid "C++ comment\t0\t//.*\n"
-msgstr "KomentáÅ? C++\t0\t//.*\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:353
-msgid "C comment\t0\t/\\*.*?\\*/\n"
-msgstr "KomentáÅ? C\t0\t/\\*.*?\\*/\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:355
-msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
-msgstr "VÅ¡echny mezery\t0\t[ \\t\\r\\f\\v]*\n"
+msgid "[%s] Merging files"
+msgstr "[%s] SluÄ?ují se soubory"
 
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:357
-msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
-msgstr "PoÄ?áteÄ?ní mezery\t0\t^[ \\t\\r\\f\\v]*\n"
-
-#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/meldapp.py:359
-msgid "Script comment\t0\t#.*"
-msgstr "KomentáÅ? skriptu\t0\t#.*"
-
-#: ../meld/meldapp.py:428
+#: ../meld/meldapp.py:132
 msgid "_File"
 msgstr "_Soubor"
 
-#: ../meld/meldapp.py:429
+#: ../meld/meldapp.py:133
 msgid "_New..."
 msgstr "_Nový..."
 
-#: ../meld/meldapp.py:429
+#: ../meld/meldapp.py:133
 msgid "Start a new comparison"
 msgstr "Spustit nové porovnání"
 
-#: ../meld/meldapp.py:430
+#: ../meld/meldapp.py:134
 msgid "Save the current file"
 msgstr "Uložit aktuální soubor"
 
-#: ../meld/meldapp.py:432
+#: ../meld/meldapp.py:136
 msgid "Close the current file"
 msgstr "ZavÅ?ít aktuální soubor"
 
-#: ../meld/meldapp.py:433
+#: ../meld/meldapp.py:137
 msgid "Quit the program"
 msgstr "UkonÄ?it program"
 
-#: ../meld/meldapp.py:435
+#: ../meld/meldapp.py:139
 msgid "_Edit"
 msgstr "_Upravit"
 
-#: ../meld/meldapp.py:436
+#: ../meld/meldapp.py:140
 msgid "Undo the last action"
 msgstr "Vrátit zpÄ?t poslední Ä?innost"
 
-#: ../meld/meldapp.py:437
+#: ../meld/meldapp.py:141
 msgid "Redo the last undone action"
 msgstr "Zopakovat poslední Ä?innost vrácenou zpÄ?t"
 
-#: ../meld/meldapp.py:438
+#: ../meld/meldapp.py:142
 msgid "Cut the selection"
 msgstr "Vyjmout výbÄ?r"
 
-#: ../meld/meldapp.py:439
+#: ../meld/meldapp.py:143
 msgid "Copy the selection"
 msgstr "Kopírovat výbÄ?r"
 
-#: ../meld/meldapp.py:440
+#: ../meld/meldapp.py:144
 msgid "Paste the clipboard"
 msgstr "Vložit obsah schránky"
 
-#: ../meld/meldapp.py:441
+#: ../meld/meldapp.py:145
 msgid "Search for text"
 msgstr "Hledat text"
 
-#: ../meld/meldapp.py:442
+#: ../meld/meldapp.py:146
 msgid "Find Ne_xt"
 msgstr "_Najít následující"
 
-#: ../meld/meldapp.py:442
+#: ../meld/meldapp.py:146
 msgid "Search forwards for the same text"
 msgstr "Hledat tentýž text vpÅ?ed"
 
-#: ../meld/meldapp.py:443
+#: ../meld/meldapp.py:147
 msgid "Find and replace text"
 msgstr "Najít a nahradit text"
 
-#: ../meld/meldapp.py:444
-msgid "Go to the next difference"
-msgstr "PÅ?ejít na následující rozdíl"
-
-#: ../meld/meldapp.py:445
-msgid "Go to the previous difference"
-msgstr "PÅ?ejít na pÅ?edchozí rozdíl"
-
-#: ../meld/meldapp.py:446
+#: ../meld/meldapp.py:148
 msgid "Prefere_nces"
 msgstr "_PÅ?edvolby"
 
-#: ../meld/meldapp.py:446
+#: ../meld/meldapp.py:148
 msgid "Configure the application"
 msgstr "Nastavit aplikaci"
 
-#: ../meld/meldapp.py:448
+#: ../meld/meldapp.py:150
+msgid "_Changes"
+msgstr "_ZmÄ?ny"
+
+#: ../meld/meldapp.py:151
+msgid "Next change"
+msgstr "Následující zmÄ?na"
+
+#: ../meld/meldapp.py:151
+msgid "Go to the next change"
+msgstr "PÅ?ejít na následující zmÄ?nu"
+
+#: ../meld/meldapp.py:152
+msgid "Previous change"
+msgstr "PÅ?edchozí zmÄ?na"
+
+#: ../meld/meldapp.py:152
+msgid "Go to the previous change"
+msgstr "PÅ?ejít na pÅ?edchozí zmÄ?nu"
+
+#: ../meld/meldapp.py:154
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: ../meld/meldapp.py:449
+#: ../meld/meldapp.py:155
 msgid "File status"
 msgstr "Stav souboru"
 
-#: ../meld/meldapp.py:450
+#: ../meld/meldapp.py:156
 msgid "Version status"
 msgstr "Stav verze"
 
-#: ../meld/meldapp.py:451
+#: ../meld/meldapp.py:157
 msgid "File filters"
 msgstr "Filtry souborů"
 
-#: ../meld/meldapp.py:452
+#: ../meld/meldapp.py:158
 msgid "Stop the current action"
 msgstr "Zastavit aktuální Ä?innost"
 
-#: ../meld/meldapp.py:453
+#: ../meld/meldapp.py:159
 msgid "Refresh the view"
 msgstr "Obnovit zobrazení"
 
-#: ../meld/meldapp.py:454
+#: ../meld/meldapp.py:160
 msgid "Reload"
 msgstr "Znovu naÄ?íst"
 
-#: ../meld/meldapp.py:454
+#: ../meld/meldapp.py:160
 msgid "Reload the comparison"
 msgstr "Znovu naÄ?íst porovnání"
 
-#: ../meld/meldapp.py:456
+#: ../meld/meldapp.py:162
 msgid "_Help"
 msgstr "_NápovÄ?da"
 
-#: ../meld/meldapp.py:457
+#: ../meld/meldapp.py:163
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../meld/meldapp.py:457
+#: ../meld/meldapp.py:163
 msgid "Open the Meld manual"
 msgstr "OtevÅ?ít pÅ?íruÄ?ku aplikace Meld"
 
-#: ../meld/meldapp.py:458
+#: ../meld/meldapp.py:164
 msgid "Report _Bug"
 msgstr "Ohlásit _chybu"
 
-#: ../meld/meldapp.py:458
+#: ../meld/meldapp.py:164
 msgid "Report a bug in Meld"
 msgstr "Nahlásit chybu v aplikaci Meld"
 
-#: ../meld/meldapp.py:459
+#: ../meld/meldapp.py:165
 msgid "About this program"
 msgstr "O této aplikaci"
 
-#: ../meld/meldapp.py:462
+#: ../meld/meldapp.py:168
 msgid "Full Screen"
 msgstr "Celá obrazovka"
 
-#: ../meld/meldapp.py:462
+#: ../meld/meldapp.py:168
 msgid "View the comparison in full screen"
 msgstr "Zobrazit porovnání pÅ?es celou obrazovku"
 
-#: ../meld/meldapp.py:463
+#: ../meld/meldapp.py:169
 msgid "_Toolbar"
 msgstr "Nástrojová _lišta"
 
-#: ../meld/meldapp.py:463
+#: ../meld/meldapp.py:169
 msgid "Show or hide the toolbar"
 msgstr "Zobrazit nebo skrýt nástrojovou lištu"
 
-#: ../meld/meldapp.py:464
+#: ../meld/meldapp.py:170
 msgid "_Statusbar"
 msgstr "_Stavová lišta"
 
-#: ../meld/meldapp.py:464
+#: ../meld/meldapp.py:170
 msgid "Show or hide the statusbar"
 msgstr "Zobrazit nebo skrýt stavovou lištu"
 
 #. exit at first non found directory + file
-#: ../meld/meldapp.py:816
+#: ../meld/meldapp.py:542
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Nelze porovnávat kombinaci souborů a adresáÅ?ů.\n"
 
-#: ../meld/meldapp.py:870
+#: ../meld/meldapp.py:597
 msgid "wrong number of arguments supplied to --diff"
 msgstr "poskytnut nesprávný poÄ?et argumentů --diff"
 
-#: ../meld/meldapp.py:874
+#: ../meld/meldapp.py:601
 msgid "Start with an empty window"
 msgstr "Spustit s prázdným oknem"
 
-#: ../meld/meldapp.py:875 ../meld/meldapp.py:876 ../meld/meldapp.py:878
+#: ../meld/meldapp.py:602 ../meld/meldapp.py:603 ../meld/meldapp.py:605
 msgid "file"
 msgstr "soubor"
 
-#: ../meld/meldapp.py:875 ../meld/meldapp.py:877 ../meld/meldapp.py:878
+#: ../meld/meldapp.py:602 ../meld/meldapp.py:604 ../meld/meldapp.py:605
 msgid "dir"
 msgstr "adr"
 
-#: ../meld/meldapp.py:875
+#: ../meld/meldapp.py:602
 msgid "Start a version control comparison"
 msgstr "Spustit nové porovnání správy verzí"
 
-#: ../meld/meldapp.py:876
+#: ../meld/meldapp.py:603
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Spustit dvojcestné nebo trojcestné porovnání souborů"
 
-#: ../meld/meldapp.py:877
+#: ../meld/meldapp.py:604
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "Spustit dvojcestné nebo trojcestné porovnání adresáÅ?ů"
 
-#: ../meld/meldapp.py:878
+#: ../meld/meldapp.py:605
 msgid "Start a comparison between file and dir/file"
 msgstr "Spustit porovnání souboru a adresáÅ?e/souboru"
 
-#: ../meld/meldapp.py:884
+#: ../meld/meldapp.py:611
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je nástroj porovnávající soubory a adresáÅ?e."
 
-#: ../meld/meldapp.py:887
+#: ../meld/meldapp.py:614
 msgid "Set label to use instead of file name"
 msgstr "Nastavit k použití popisek namísto názvu souboru"
 
-#: ../meld/meldapp.py:889
+#: ../meld/meldapp.py:616
 msgid "Automatically compare all differing files on startup"
 msgstr "Automaticky pÅ?i spuÅ¡tÄ?ní porovnat vÅ¡echny lišící se soubory"
 
-#: ../meld/meldapp.py:890 ../meld/meldapp.py:891 ../meld/meldapp.py:892
-#: ../meld/meldapp.py:893
-msgid "Ignored for compatibility"
-msgstr "Ignorováno z důvodu kompatibility"
-
-#: ../meld/meldapp.py:896
+#: ../meld/meldapp.py:619
 msgid "Creates a diff tab for up to 3 supplied files or directories."
 msgstr "VytvoÅ?í kartu s rozdílem až pro tÅ?i poskytnuté soubory nebo adresáÅ?e."
 
-#: ../meld/meldapp.py:899
+#: ../meld/meldapp.py:622
 #, python-format
 msgid "too many arguments (wanted 0-4, got %d)"
 msgstr "pÅ?íliÅ¡ mnoho argumentů (požadováno 0-4, obdrženo %d)"
 
-#: ../meld/melddoc.py:48
+#: ../meld/melddoc.py:51 ../meld/melddoc.py:52
 msgid "untitled"
 msgstr "nepojmenovaný"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:189
+#: ../meld/misc.py:192
 msgid "[None]"
 msgstr "[Žádný]"
 
-#: ../meld/vcview.py:127
+#: ../meld/patchdialog.py:119
+msgid "Save Patch As..."
+msgstr "Uložit záplatu jako..."
+
+#: ../meld/preferences.py:81
+msgid "label"
+msgstr "popisek"
+
+#: ../meld/preferences.py:81
+msgid "pattern"
+msgstr "vzorek"
+
+#: ../meld/preferences.py:141
+msgid "Only available if you have gnome-python-desktop installed"
+msgstr "K dispozici jen pokud je nainstalován gnome-python-desktop"
+
+#. file filters
+#. text filters
+#: ../meld/preferences.py:165 ../meld/preferences.py:170 ../meld/vcview.py:166
+msgid "Name"
+msgstr "Název"
+
+#: ../meld/preferences.py:165 ../meld/preferences.py:170
+msgid "Active"
+msgstr "Aktivní"
+
+#: ../meld/preferences.py:165
+msgid "Pattern"
+msgstr "Vzorek"
+
+#: ../meld/preferences.py:170
+msgid "Regex"
+msgstr "Reg. výraz"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:264
+msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+msgstr "Zálohy\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:266
+#, python-format
+msgid "Version Control\t1\t%s\n"
+msgstr "Správa verzí\t1\t%s\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:268
+msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+msgstr "Binární soubory\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:270
+msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+msgstr "Multimédia\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:272
+msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+msgstr "KlíÄ?ová slova CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:274
+msgid "C++ comment\t0\t//.*\n"
+msgstr "KomentáÅ? C++\t0\t//.*\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:276
+msgid "C comment\t0\t/\\*.*?\\*/\n"
+msgstr "KomentáÅ? C\t0\t/\\*.*?\\*/\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:278
+msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
+msgstr "VÅ¡echny mezery\t0\t[ \\t\\r\\f\\v]*\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:280
+msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
+msgstr "PoÄ?áteÄ?ní mezery\t0\t^[ \\t\\r\\f\\v]*\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:282
+msgid "Script comment\t0\t#.*"
+msgstr "KomentáÅ? skriptu\t0\t#.*"
+
+#: ../meld/vcview.py:130
 msgid "_Commit"
 msgstr "_Commit"
 
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:130
 msgid "Commit"
 msgstr "Commit"
 
 #. FIXME: popup used to use gtk.STOCK_GO_BACK
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:131
 msgid "_Update"
 msgstr "_Update"
 
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:131
 msgid "Update"
 msgstr "Update"
 
 #. FIXME: popup used to use gtk.STOCK_GO_FORWARD
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:132
 msgid "_Add"
 msgstr "_PÅ?idat"
 
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:132
 msgid "Add to VC"
 msgstr "PÅ?idat do správy verzí"
 
 #. FIXME: popup used to use gtk.STOCK_ADD
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:133
 msgid "Add _Binary"
 msgstr "PÅ?idat _binární"
 
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:133
 msgid "Add binary to VC"
 msgstr "PÅ?idat binární soubor do správy verzí"
 
 #. FIXME: stock is inconsistent with other VC actions
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:134
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:134
 msgid "Remove from VC"
 msgstr "Odstranit ze správy verzí"
 
 #. FIXME: popup used to use gtk.STOCK_REMOVE
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:135
 msgid "_Resolved"
 msgstr "_VyÅ?eÅ¡eno"
 
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:135
 msgid "Mark as resolved for VC"
 msgstr "OznaÄ?it jako vyÅ?eÅ¡ené ve vztahu ke správÄ? verzí"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:136
 msgid "Revert to original"
 msgstr "Vrátit zpÄ?t na původní"
 
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:137
 msgid "Delete locally"
 msgstr "Odstranit místnÄ?"
 
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:141
 msgid "_Flatten"
 msgstr "Z_ploštit"
 
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:141
 msgid "Flatten directories"
 msgstr "ZploÅ¡tit adresáÅ?e"
 
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:142
 msgid "_Modified"
 msgstr "_ZmÄ?nÄ?né"
 
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:143
 msgid "_Normal"
 msgstr "_Normální"
 
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:143
 msgid "Show normal"
 msgstr "Zobrazovat bÄ?žné"
 
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:144
 msgid "Non _VC"
 msgstr "Ni_koliv ve správÄ? verzí"
 
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:144
 msgid "Show unversioned files"
 msgstr "Zobrazovat soubory bez verzí"
 
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:145
 msgid "Ignored"
 msgstr "Ignorované"
 
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:145
 msgid "Show ignored files"
 msgstr "Zobrazovat ignorované soubory"
 
-#: ../meld/vcview.py:180
+#: ../meld/vcview.py:186 ../meld/vcview.py:305
 msgid "Location"
 msgstr "UmístÄ?ní"
 
-#: ../meld/vcview.py:181
+#: ../meld/vcview.py:187
 msgid "Status"
 msgstr "Stav"
 
-#: ../meld/vcview.py:182
+#: ../meld/vcview.py:188
 msgid "Rev"
 msgstr "Rev"
 
-#: ../meld/vcview.py:184
+#: ../meld/vcview.py:190
 msgid "Options"
 msgstr "Možnosti"
 
-#: ../meld/vcview.py:230
+#: ../meld/vcview.py:237
 msgid "Choose one Version Control"
 msgstr "Vyberte jednu správu verzí"
 
-#: ../meld/vcview.py:231
+#: ../meld/vcview.py:238
 msgid "Only one Version Control in this directory"
 msgstr "V tomto adresáÅ?i pouze jedna správa verzí"
 
-#: ../meld/vcview.py:316
+#. TRANSLATORS: this is an error message when a version control
+#. application isn't installed or can't be found
+#: ../meld/vcview.py:251
+#, python-format
+msgid "%s Not Installed"
+msgstr "%s není nainstalováno"
+
+#. TRANSLATORS: this is an error message when a version
+#. controlled repository is invalid or corrupted
+#: ../meld/vcview.py:255
+msgid "Invalid Repository"
+msgstr "Neplatné úložiÅ¡tÄ?"
+
+#: ../meld/vcview.py:264
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#. TRANSLATORS: This is the location of the directory the user is diffing
+#: ../meld/vcview.py:305
+#, python-format
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: ../meld/vcview.py:353
 msgid "(Empty)"
 msgstr "(Prázdný)"
 
-#: ../meld/vcview.py:349
+#: ../meld/vcview.py:386
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Stahují se rozdíly"
 
-#: ../meld/vcview.py:356
+#: ../meld/vcview.py:393
 #, python-format
 msgid "[%s] Applying patch"
-msgstr "[%s] Použití patche"
+msgstr "[%s] Použití záplaty"
 
-#: ../meld/vcview.py:360
+#: ../meld/vcview.py:397
 msgid "No differences found."
 msgstr "Nenalezeny žádné rozdíly."
 
-#: ../meld/vcview.py:434
+#: ../meld/vcview.py:471
 msgid "Select some files first."
 msgstr "NejdÅ?íve je nutné vybrat soubory."
 
-#: ../meld/vcview.py:500
+#: ../meld/vcview.py:537
 #, python-format
 msgid ""
 "\n"
@@ -1240,7 +1278,7 @@ msgstr ""
 "                    softwaru ke správÄ? zdrojových kódů.\n"
 "                    "
 
-#: ../meld/ui/findbar.py:119
+#: ../meld/ui/findbar.py:120
 #, python-format
 msgid ""
 "Regular expression error\n"
@@ -1249,44 +1287,42 @@ msgstr ""
 "Chyba v regulárním výrazu\n"
 "\"%s\""
 
-#: ../meld/ui/historyentry.py:248
+#: ../meld/ui/historyentry.py:290
 msgid "_Browse..."
 msgstr "_Procházet..."
 
-#: ../meld/ui/historyentry.py:256
+#: ../meld/ui/historyentry.py:298
 msgid "Path"
 msgstr "Cesta"
 
-#: ../meld/ui/historyentry.py:257
+#: ../meld/ui/historyentry.py:299
 msgid "Path to file"
 msgstr "Cesta k souboru"
 
-#: ../meld/ui/historyentry.py:258
+#: ../meld/ui/historyentry.py:300
 msgid "Pop up a file selector to choose a file"
 msgstr "Zobrazit dialog výbÄ?ru souboru umožÅ?ující zvolit soubor"
 
-#: ../meld/ui/historyentry.py:379
+#: ../meld/ui/historyentry.py:419
 msgid "Select directory"
 msgstr "Vybrat adresáÅ?"
 
-#: ../meld/ui/historyentry.py:383
+#: ../meld/ui/historyentry.py:423
 msgid "Select file"
 msgstr "Vybrat soubor"
 
-#: ../meld/ui/notebooklabel.py:61
+#: ../meld/ui/notebooklabel.py:60
 msgid "Close tab"
 msgstr "ZavÅ?ít kartu"
 
 #. These are the possible states of files. Be sure to get the colons correct.
 #: ../meld/vc/_vc.py:40
 msgid ""
-"Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:"
-"Missing"
+"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
 msgstr ""
-"Ignorováno:Bez verze:::Chyba::NovÄ? pÅ?idáno:ZmÄ?nÄ?no:<b>Konflikt</b>:"
-"OdstranÄ?no:Chybí"
+"Ignorováno:Bez verze:::Chyba::NovÄ? pÅ?idáno:ZmÄ?nÄ?no:Konflikt:OdstranÄ?no:Chybí"
 
-#: ../meld/vc/cvs.py:151
+#: ../meld/vc/cvs.py:156
 #, python-format
 msgid ""
 "Error converting to a regular expression\n"
@@ -1296,3 +1332,66 @@ msgstr ""
 "Chyba pÅ?i pÅ?evodu na regulární výraz\n"
 "Vzorkem byl \"%s\"\n"
 "Chyba byla následující: \"%s\""
+
+#~ msgid "Copy to Clipboard"
+#~ msgstr "Kopírovat do schránky"
+
+#~ msgid "Create Patch"
+#~ msgstr "VytvoÅ?it patch"
+
+#~ msgid "<b>Edit Menu</b>"
+#~ msgstr "<b>Upravit menu</b>"
+
+#~ msgid "<b>Font</b>"
+#~ msgstr "<b>Písmo</b>"
+
+#~ msgid "<b>Misc</b>"
+#~ msgstr "<b>Různé</b>"
+
+#~ msgid "Automatically supply missing newline at end of file"
+#~ msgstr "Automaticky pÅ?idávat chybÄ?jící nový Å?ádek na konci souboru"
+
+#~ msgid "Edit files with:"
+#~ msgstr "Upravit soubory s:"
+
+#~ msgid "Line Wrapping "
+#~ msgstr "Zalamování Å?ádků "
+
+#~ msgid "Preferences : Meld"
+#~ msgstr "PÅ?edvolby: Meld"
+
+#~ msgid "Three way directory"
+#~ msgstr "TÅ?i adresáÅ?e"
+
+#~ msgid "Three way file"
+#~ msgstr "TÅ?i soubory"
+
+#~ msgid "Two way directory"
+#~ msgstr "Dva adresáÅ?e"
+
+#~ msgid "Two way file"
+#~ msgstr "Dva soubory"
+
+#~ msgid "Use GNOME monospace font"
+#~ msgstr "Používat neproporcionální písmo GNOME"
+
+#~ msgid "Use custom font"
+#~ msgstr "Používat vlastní písmo"
+
+#~ msgid "Version control view"
+#~ msgstr "Zobrazení správy verzí"
+
+#~ msgid "_Character"
+#~ msgstr "Zna_k"
+
+#~ msgid "_None"
+#~ msgstr "Žád_né"
+
+#~ msgid "_Word"
+#~ msgstr "_Slovo"
+
+#~ msgid "Copy all changes from right pane to left pane"
+#~ msgstr "Kopírovat vÅ¡echny zmÄ?ny z pravého panelu do levého"
+
+#~ msgid "Ignored for compatibility"
+#~ msgstr "Ignorováno z důvodu kompatibility"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]