[meld] Updated Czech translation

[Petr Kovář <pmkovar src gnome org>]

commit 211a52859c644a7bf47249b87811053644c67d78
Author: Petr Kovar <pknbe volny cz>
Date:   Fri May 15 21:05:18 2009 +0200

    Updated Czech translation
---
 po/ChangeLog |    4 +
 po/cs.po     |  990 +++++++++++++++++++++++++++++++++-------------------------
 2 files changed, 564 insertions(+), 430 deletions(-)

diff --git a/po/ChangeLog b/po/ChangeLog
index 03233ec..58dae53 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-15  Petr Kovar  <pknbe volny cz>
+
+	* cs.po: Updated Czech translation.
+
 2009-04-29  Takeshi AIHANA <takeshi aihana gmail com>
 
 	* ja.po: Updated Japanese translation.
diff --git a/po/cs.po b/po/cs.po
index 6b6a339..8ccbb4c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,16 +1,16 @@
 # Czech translation of meld.
-# Copyright (C) 2003, 2004, 2005, 2008 the author(s) of meld.
+# Copyright (C) 2003, 2004, 2005, 2008, 2009 the author(s) of meld.
 # Copyright (C) 2003, 2004, 2005 Miloslav Trmac <mitr volny cz>.
 # This file is distributed under the same license as the meld package.
 # Miloslav Trmac <mitr volny cz>, 2003, 2004, 2005.
-# Petr Kovar <pknbe volny cz>, 2008.
+# Petr Kovar <pknbe volny cz>, 2008, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2008-10-27 22:14+0100\n"
-"PO-Revision-Date: 2008-10-27 21:45+0100\n"
+"POT-Creation-Date: 2009-05-15 21:03+0200\n"
+"PO-Revision-Date: 2009-05-15 20:53+0200\n"
 "Last-Translator: Petr Kovar <pknbe volny cz>\n"
 "Language-Team: Czech <gnome-cs-list gnome org>\n"
 "MIME-Version: 1.0\n"
@@ -19,101 +19,107 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../dirdiff.py:189 ../glade2/meldapp.glade.h:67 ../vcview.py:118
+#: ../dirdiff.py:173 ../vcview.py:125
 msgid "_Compare"
 msgstr "_Porovnat"
 
-#: ../dirdiff.py:189 ../vcview.py:118
+#: ../dirdiff.py:173 ../vcview.py:125
 msgid "Compare selected"
 msgstr "Porovnat vybrané"
 
-#. FIXME: the glade files were inconsistent: GO_BACK vs GOTO_FIRST, "Left" vs "Copy To Left"
-#: ../dirdiff.py:191
+#: ../dirdiff.py:174
 msgid "Left"
 msgstr "Levé"
 
-#: ../dirdiff.py:191 ../filediff.py:137
+#: ../dirdiff.py:174 ../filediff.py:125
 msgid "Copy To Left"
 msgstr "Kopírovat doleva"
 
-#. FIXME: the glade files were inconsistent: GO_FORWARD vs GOTO_LAST, "Right" vs "Copy To Right"
-#: ../dirdiff.py:193
+#: ../dirdiff.py:175
 msgid "Right"
 msgstr "Pravé"
 
-#: ../dirdiff.py:193 ../filediff.py:138
+#: ../dirdiff.py:175 ../filediff.py:126
 msgid "Copy To Right"
 msgstr "Kopírovat doprava"
 
-#: ../dirdiff.py:194
+#: ../dirdiff.py:176
 msgid "Delete selected"
 msgstr "Odstranit vybrané"
 
-#: ../dirdiff.py:195
-msgid "Hide..."
-msgstr "Skrýt..."
+#: ../dirdiff.py:177
+msgid "Hide"
+msgstr "Skrýt"
 
-#: ../dirdiff.py:195
+#: ../dirdiff.py:177
 msgid "Hide selected"
 msgstr "Skrýt vybrané"
 
-#: ../dirdiff.py:197 ../filediff.py:135 ../vcview.py:119
+#: ../dirdiff.py:179 ../filediff.py:123 ../vcview.py:126
 msgid "Open selected"
 msgstr "OtevÅ?ít vybrané"
 
-#: ../dirdiff.py:201
+#: ../dirdiff.py:183
 msgid "Case"
 msgstr "Velikost písmen"
 
-#: ../dirdiff.py:201
+#: ../dirdiff.py:183
 msgid "Ignore case of entries"
 msgstr "Ignorovat velikost písmen"
 
-#: ../dirdiff.py:202
+#: ../dirdiff.py:184
 msgid "Same"
 msgstr "Stejné"
 
-#: ../dirdiff.py:202
+#: ../dirdiff.py:184
 msgid "Show identical"
 msgstr "Zobrazovat stejné"
 
-#: ../dirdiff.py:203
+#: ../dirdiff.py:185
 msgid "New"
 msgstr "Nové"
 
-#: ../dirdiff.py:203
+#: ../dirdiff.py:185
 msgid "Show new"
 msgstr "Zobrazovat nové"
 
-#: ../dirdiff.py:204
+#: ../dirdiff.py:186
 msgid "Modified"
 msgstr "ZmÄ?nÄ?né"
 
-#: ../dirdiff.py:204 ../vcview.py:131
+#: ../dirdiff.py:186 ../vcview.py:139
 msgid "Show modified"
 msgstr "Zobrazovat zmÄ?nÄ?né"
 
-#: ../dirdiff.py:265 ../dirdiff.py:280
+#: ../dirdiff.py:188
+msgid "Filters"
+msgstr "Filtry"
+
+#: ../dirdiff.py:188
+msgid "Set active filters"
+msgstr "Nastavte aktivní filtry"
+
+#: ../dirdiff.py:241 ../dirdiff.py:287
 #, python-format
 msgid "Error converting pattern '%s' to regular expression"
 msgstr "Chyba pÅ?i pÅ?evodu vzorku \"%s\" na regulární výraz"
 
-#: ../dirdiff.py:288
+#: ../dirdiff.py:298
 #, python-format
 msgid "Hide %s"
 msgstr "Skrýt %s"
 
-#: ../dirdiff.py:373 ../dirdiff.py:383 ../vcview.py:223 ../vcview.py:251
+#: ../dirdiff.py:383 ../dirdiff.py:393 ../vcview.py:272 ../vcview.py:300
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Prochází se %s"
 
-#: ../dirdiff.py:416
+#: ../dirdiff.py:422
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "\"%s\" skryto \"%s\""
 
-#: ../dirdiff.py:422
+#: ../dirdiff.py:428
 #, python-format
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
@@ -124,12 +130,12 @@ msgstr ""
 "rozliÅ¡ujícím velikost písmen. NÄ?které soubory nejsou zobrazené:\n"
 "%s"
 
-#: ../dirdiff.py:496
+#: ../dirdiff.py:501
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Hotovo"
 
-#: ../dirdiff.py:542
+#: ../dirdiff.py:547
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -138,7 +144,7 @@ msgstr ""
 "\"%s\" existuje.\n"
 "PÅ?epsat?"
 
-#: ../dirdiff.py:549
+#: ../dirdiff.py:554
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -149,16 +155,16 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../dirdiff.py:567 ../vcview.py:415
+#: ../dirdiff.py:572 ../vcview.py:464
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
-"Remove recusively?"
+"Remove recursively?"
 msgstr ""
-"\"%s\" je adresáÅ?.\n"
+"\"%s\" je adresáÅ?em.\n"
 "Odstranit rekurzivnÄ??"
 
-#: ../dirdiff.py:574 ../vcview.py:420
+#: ../dirdiff.py:579 ../vcview.py:469
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -169,7 +175,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../dirdiff.py:585
+#: ../dirdiff.py:590
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -177,7 +183,7 @@ msgstr[0] "%i sekunda"
 msgstr[1] "%i sekundy"
 msgstr[2] "%i sekund"
 
-#: ../dirdiff.py:586
+#: ../dirdiff.py:591
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -185,7 +191,7 @@ msgstr[0] "%i minuta"
 msgstr[1] "%i minuty"
 msgstr[2] "%i minut"
 
-#: ../dirdiff.py:587
+#: ../dirdiff.py:592
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -193,7 +199,7 @@ msgstr[0] "%i hodina"
 msgstr[1] "%i hodiny"
 msgstr[2] "%i hodin"
 
-#: ../dirdiff.py:588
+#: ../dirdiff.py:593
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -201,7 +207,7 @@ msgstr[0] "%i den"
 msgstr[1] "%i dny"
 msgstr[2] "%i dnů"
 
-#: ../dirdiff.py:589
+#: ../dirdiff.py:594
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -209,7 +215,7 @@ msgstr[0] "%i týden"
 msgstr[1] "%i týdny"
 msgstr[2] "%i týdnů"
 
-#: ../dirdiff.py:590
+#: ../dirdiff.py:595
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -217,7 +223,7 @@ msgstr[0] "%i mÄ?síc"
 msgstr[1] "%i mÄ?síce"
 msgstr[2] "%i mÄ?síců"
 
-#: ../dirdiff.py:591
+#: ../dirdiff.py:596
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -225,54 +231,34 @@ msgstr[0] "%i rok"
 msgstr[1] "%i roky"
 msgstr[2] "%i let"
 
-#: ../filediff.py:130 ../meldapp.py:558
-msgid "Save the current file"
-msgstr "Uložit aktuální soubor"
-
-#: ../filediff.py:131
-msgid "Save the current file with a different name"
-msgstr "Uložit aktuální soubor pod jiným jménem"
-
-#: ../filediff.py:132 ../meldapp.py:566
-msgid "Cut the selection"
-msgstr "Vyjmout výbÄ?r"
-
-#: ../filediff.py:133 ../meldapp.py:567
-msgid "Copy the selection"
-msgstr "Kopírovat výbÄ?r"
-
-#: ../filediff.py:134 ../meldapp.py:568
-msgid "Paste the clipboard"
-msgstr "Vložit obsah schránky"
-
-#: ../filediff.py:136 ../glade2/filediff.glade.h:4
+#: ../filediff.py:124 ../glade2/filediff.glade.h:4
 msgid "Create Patch"
 msgstr "VytvoÅ?it patch"
 
-#: ../filediff.py:136
+#: ../filediff.py:124
 msgid "Create a patch"
 msgstr "VytvoÅ?it patch"
 
-#: ../filediff.py:137
+#: ../filediff.py:125
 msgid "Copy all changes from right pane to left pane"
 msgstr "Kopírovat vÅ¡echny zmÄ?ny z pravého panelu do levého"
 
-#: ../filediff.py:138
+#: ../filediff.py:126
 msgid "Copy all changes from left pane to right pane"
 msgstr "Kopírovat vÅ¡echny zmÄ?ny z levého panelu do pravého"
 
 #. Abbreviation for insert,overwrite so that it will fit in the status bar
-#: ../filediff.py:187
+#: ../filediff.py:179
 msgid "INS,OVR"
 msgstr "VKL,PÅ?E"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../filediff.py:189
+#: ../filediff.py:181
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Å?ád %i, sl %i"
 
-#: ../filediff.py:247
+#: ../filediff.py:238
 #, python-format
 msgid ""
 "Regular expression '%s' changed the number of lines in the file. Comparison "
@@ -281,50 +267,31 @@ msgstr ""
 "Regulární výraz \"%s\" zmÄ?nil poÄ?et Å?ádků v souboru. Porovnání nebude "
 "správné. Další podrobnosti viz pÅ?íruÄ?ka uživatele."
 
-#: ../filediff.py:508
-#, python-format
-msgid ""
-"Regular expression error\n"
-"'%s'"
-msgstr ""
-"Chyba v regulárním výrazu\n"
-"\"%s\""
-
-#: ../filediff.py:520
-#, python-format
-msgid "The regular expression '%s' was not found."
-msgstr "Regulární výraz \"%s\" nebyl nalezen."
-
-#: ../filediff.py:522
-#, python-format
-msgid "The text '%s' was not found."
-msgstr "Text \"%s\" nebyl nalezen."
-
-#: ../filediff.py:575
+#: ../filediff.py:507
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Nastaven poÄ?et panelů"
 
-#: ../filediff.py:582
+#: ../filediff.py:513
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Otevírají se soubory"
 
-#: ../filediff.py:599 ../filediff.py:613 ../filediff.py:629 ../filediff.py:636
+#: ../filediff.py:531 ../filediff.py:545 ../filediff.py:561 ../filediff.py:568
 #, python-format
 msgid "Could not read from '%s'"
 msgstr "Nelze Ä?íst z \"%s\""
 
-#: ../filediff.py:600 ../filediff.py:637
+#: ../filediff.py:532 ../filediff.py:569
 msgid "The error was:"
 msgstr "Chyba byla následující:"
 
-#: ../filediff.py:605
+#: ../filediff.py:537
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Ä?tou se soubory"
 
-#: ../filediff.py:614
+#: ../filediff.py:546
 msgid ""
 "It contains ascii nulls.\n"
 "Perhaps it is a binary file."
@@ -332,17 +299,17 @@ msgstr ""
 "Obsahuje nuly ascii.\n"
 "Možná jde o binární soubor."
 
-#: ../filediff.py:630
+#: ../filediff.py:562
 #, python-format
 msgid "I tried encodings %s."
 msgstr "Vyzkoušena kódování %s."
 
-#: ../filediff.py:659
+#: ../filediff.py:589
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] PoÄ?ítají se rozdíly"
 
-#: ../filediff.py:765
+#: ../filediff.py:716
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -351,7 +318,7 @@ msgstr ""
 "\"%s\" existuje!\n"
 "PÅ?epsat?"
 
-#: ../filediff.py:778
+#: ../filediff.py:729
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -362,12 +329,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../filediff.py:787
+#: ../filediff.py:738
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Zvolte název vyrovnávací pamÄ?ti %i."
 
-#: ../filediff.py:800
+#: ../filediff.py:752
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -378,7 +345,7 @@ msgstr ""
 "\n"
 "Jaký formát chcete používat?"
 
-#: ../filediff.py:816
+#: ../filediff.py:768
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -388,11 +355,11 @@ msgstr ""
 "Chcete uložit jako UTF-8?"
 
 #. save as
-#: ../filediff.py:867
+#: ../filediff.py:808
 msgid "Save patch as..."
 msgstr "Uložit patch jako..."
 
-#: ../filediff.py:926
+#: ../filediff.py:875
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -405,6 +372,15 @@ msgstr ""
 "\n"
 "Tuto operaci nelze vzít zpÄ?t."
 
+#: ../findbar.py:120
+#, python-format
+msgid ""
+"Regular expression error\n"
+"'%s'"
+msgstr ""
+"Chyba v regulárním výrazu\n"
+"\"%s\""
+
 #: ../glade2/filediff.glade.h:1
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
@@ -418,297 +394,198 @@ msgid "Copy to Clipboard"
 msgstr "Kopírovat do schránky"
 
 #: ../glade2/filediff.glade.h:5
-msgid "Find"
-msgstr "Hledat"
+msgid "Save modified files?"
+msgstr "Uložit zmÄ?nÄ?né soubory?"
 
 #: ../glade2/filediff.glade.h:6
-msgid "Match _entire word only"
-msgstr "Hledat jen _celá slova"
+msgid "_Discard Changes"
+msgstr "_Zahodit zmÄ?ny"
 
 #: ../glade2/filediff.glade.h:7
-msgid "Regular e_xpression"
-msgstr "_Regulární výraz"
+msgid "_Save Selected"
+msgstr "_Uložit vybrané"
 
-#: ../glade2/filediff.glade.h:8
-msgid "Save modified files?"
-msgstr "Uložit zmÄ?nÄ?né soubory?"
+#: ../glade2/findbar.glade.h:1
+msgid "Regular E_xpression"
+msgstr "Re_gulární výraz"
 
-#: ../glade2/filediff.glade.h:9
-msgid "Search for:"
-msgstr "Hledat:"
+#: ../glade2/findbar.glade.h:2
+msgid "Replace _All"
+msgstr "Nahradit _vše"
 
-#: ../glade2/filediff.glade.h:10
-msgid "_Discard Changes"
-msgstr "_Zahodit zmÄ?ny"
+#: ../glade2/findbar.glade.h:3
+msgid "Replace _With"
+msgstr "Nahradit _s"
+
+#: ../glade2/findbar.glade.h:4
+msgid "Who_le word"
+msgstr "Ce_lé slovo"
 
-#: ../glade2/filediff.glade.h:11
-msgid "_Match case"
+#: ../glade2/findbar.glade.h:5
+msgid "_Match Case"
 msgstr "_Rozlišovat velikost písmen"
 
-#: ../glade2/filediff.glade.h:12
-msgid "_Save Selected"
-msgstr "_Uložit vybrané"
+#: ../glade2/findbar.glade.h:6
+msgid "_Next"
+msgstr "_Následující"
 
-#: ../glade2/filediff.glade.h:13
-msgid "_Wrap around"
-msgstr "PÅ?echázet pÅ?es _okraj"
+#: ../glade2/findbar.glade.h:7
+msgid "_Previous"
+msgstr "_PÅ?edchozí"
 
-#: ../glade2/meldapp.glade.h:1
-msgid "(gnome-default-editor)"
-msgstr "(gnome-default-editor)"
+#: ../glade2/findbar.glade.h:8 ../meldapp.py:524
+msgid "_Replace"
+msgstr "Nahradi_t"
 
-#: ../glade2/meldapp.glade.h:2
-msgid "<b>Drawing Style</b>"
-msgstr "<b>Styl vykreslení</b>"
+#: ../glade2/findbar.glade.h:9
+msgid "_Search for"
+msgstr "_Hledat"
 
-#: ../glade2/meldapp.glade.h:3
+#: ../glade2/meldapp.glade.h:1
 msgid "<b>Edit Menu</b>"
 msgstr "<b>Upravit menu</b>"
 
-#: ../glade2/meldapp.glade.h:4
+#: ../glade2/meldapp.glade.h:2
 msgid "<b>Font</b>"
 msgstr "<b>Písmo</b>"
 
-#: ../glade2/meldapp.glade.h:5
+#: ../glade2/meldapp.glade.h:3
 msgid "<b>Loading</b>"
 msgstr "<b>NaÄ?ítání</b>"
 
-#: ../glade2/meldapp.glade.h:6
+#: ../glade2/meldapp.glade.h:4
 msgid "<b>Misc</b>"
 msgstr "<b>Různé</b>"
 
-#: ../glade2/meldapp.glade.h:7
-msgid "<b>Saving</b>"
-msgstr "<b>Ukládání</b>"
-
-#: ../glade2/meldapp.glade.h:8
-msgid "<b>Toolbar Appearance</b>"
-msgstr "<b>Vzhled lišty nástrojů</b>"
-
-#: ../glade2/meldapp.glade.h:9
-msgid "<b>Whitespace</b>"
-msgstr "<b>Mezery</b>"
-
-#: ../glade2/meldapp.glade.h:10
-msgid "<span weight=\"bold\" size=\"x-large\">Compare</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Porovnávání</span>"
-
-#: ../glade2/meldapp.glade.h:11
-msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Zobrazení</span>"
-
-#: ../glade2/meldapp.glade.h:12
-msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Editor</span>"
-
-#: ../glade2/meldapp.glade.h:13
-msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Kódování</span>"
-
-#: ../glade2/meldapp.glade.h:14
-msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Filtry souborů</span>"
-
-#: ../glade2/meldapp.glade.h:15
-msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Filtry textu</span>"
-
-#: ../glade2/meldapp.glade.h:16
+#: ../glade2/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"
 
-#: ../glade2/meldapp.glade.h:17
+#: ../glade2/meldapp.glade.h:6
 msgid "Choose Files"
 msgstr "Zvolte soubory"
 
-#: ../glade2/meldapp.glade.h:18
-msgid ""
-"Choose how the central bar of the diff viewer is drawn. You may wish to "
-"choose a simpler mode if you find scrolling is slow."
-msgstr ""
-"Zvolte způsob vykreslení stÅ?edního sloupce zobrazovaÄ?e rozdílů. Pokud vám "
-"posouvání pÅ?ipadá pomalé, můžete zvolit jednodušší režim."
-
-#: ../glade2/meldapp.glade.h:19
-msgid "Copyright (C) 2002-2006 Stephen Kennedy"
-msgstr "Copyright (C) 2002-2006 Stephen Kennedy"
-
-#: ../glade2/meldapp.glade.h:20
-msgid "Curved: Filled Curves"
-msgstr "Oblý: vyplnÄ?né kÅ?ivky"
+#: ../glade2/meldapp.glade.h:7
+msgid "Copyright © 2002-2009 Stephen Kennedy"
+msgstr "Copyright © 2002-2009 Stephen Kennedy"
 
-#: ../glade2/meldapp.glade.h:21
+#: ../glade2/meldapp.glade.h:8
 msgid "Custom command"
 msgstr "Vlastní pÅ?íkaz"
 
-#: ../glade2/meldapp.glade.h:22
+#: ../glade2/meldapp.glade.h:9
 msgid "Directory"
 msgstr "AdresáÅ?"
 
-#: ../glade2/meldapp.glade.h:23
-msgid "Display"
-msgstr "Zobrazení"
-
-#: ../glade2/meldapp.glade.h:24
+#: ../glade2/meldapp.glade.h:10
 msgid "Edit files with:"
 msgstr "Upravit soubory s:"
 
-#: ../glade2/meldapp.glade.h:25
+#: ../glade2/meldapp.glade.h:11
 msgid "Editor"
 msgstr "Editor"
 
-#: ../glade2/meldapp.glade.h:26
+#: ../glade2/meldapp.glade.h:12
 msgid "Encoding"
 msgstr "Kódování"
 
-#: ../glade2/meldapp.glade.h:27
+#: ../glade2/meldapp.glade.h:13
 msgid "File Filters"
 msgstr "Filtry souborů"
 
-#: ../glade2/meldapp.glade.h:28
-msgid "Gnome Default"
-msgstr "Výchozí GNOME"
-
-#: ../glade2/meldapp.glade.h:29
+#: ../glade2/meldapp.glade.h:14
 msgid "Gnome default editor"
 msgstr "Výchozí editor GNOME"
 
-#: ../glade2/meldapp.glade.h:30
-msgid "Icons Only"
-msgstr "Jen ikony"
-
-#: ../glade2/meldapp.glade.h:31
-msgid "Ignore changes in amount of white space"
-msgstr "Ignorovat zmÄ?ny v poÄ?tu mezer"
-
-#: ../glade2/meldapp.glade.h:32
-msgid ""
-"Ignore changes in case; consider upper and lower-case letters equivalent"
-msgstr ""
-"Ignorovat zmÄ?ny velikosti písmen; považovat velká a malá písmena za "
-"ekvivalentní"
-
-#: ../glade2/meldapp.glade.h:33
-msgid "Ignore changes that just insert or delete blank lines"
-msgstr "Ignorovat zmÄ?ny, které jen pÅ?idávají nebo odstraÅ?ují prázdné Å?ádky"
-
-#: ../glade2/meldapp.glade.h:34
+#: ../glade2/meldapp.glade.h:15
 msgid "Ignore changes which insert or delete blank lines"
 msgstr "Ignorovat zmÄ?ny, které pÅ?idávají nebo odstraÅ?ují prázdné Å?ádky"
 
-#: ../glade2/meldapp.glade.h:35
+#: ../glade2/meldapp.glade.h:16
 msgid "Ignore symbolic links"
 msgstr "Ignorovat symbolické odkazy"
 
-#: ../glade2/meldapp.glade.h:36
+#: ../glade2/meldapp.glade.h:17
 msgid "Insert spaces instead of tabs"
 msgstr "Vkládat mezery namísto tabulátorů"
 
-#: ../glade2/meldapp.glade.h:37
+#: ../glade2/meldapp.glade.h:18
 msgid "Internal editor"
 msgstr "VnitÅ?ní editor"
 
-#: ../glade2/meldapp.glade.h:38
+#: ../glade2/meldapp.glade.h:19
 msgid "Line Wrapping "
 msgstr "Zalamování Å?ádků "
 
-#: ../glade2/meldapp.glade.h:39
+#: ../glade2/meldapp.glade.h:20
 msgid "Meld"
 msgstr "Meld"
 
-#: ../glade2/meldapp.glade.h:40
+#: ../glade2/meldapp.glade.h:21
 msgid "Mine"
 msgstr "Moje"
 
-#: ../glade2/meldapp.glade.h:41
+#: ../glade2/meldapp.glade.h:22
 msgid "Original"
 msgstr "Původní"
 
-#: ../glade2/meldapp.glade.h:42
+#: ../glade2/meldapp.glade.h:23
 msgid "Other"
 msgstr "Jiné"
 
-#: ../glade2/meldapp.glade.h:43
+#: ../glade2/meldapp.glade.h:24
 msgid "Preferences : Meld"
-msgstr "Nastavení: Meld"
+msgstr "PÅ?edvolby: Meld"
 
-#: ../glade2/meldapp.glade.h:44
-msgid "Save in UTF-8 encoding"
-msgstr "Ukládat v kódování UTF-8"
-
-#: ../glade2/meldapp.glade.h:45
-msgid "Save in the files original encoding"
-msgstr "Ukládat v původních kódováních souborů"
-
-#: ../glade2/meldapp.glade.h:46
+#: ../glade2/meldapp.glade.h:25
 msgid "Show line numbers"
 msgstr "Zobrazovat Ä?ísla Å?ádků"
 
-#: ../glade2/meldapp.glade.h:47
-msgid "Simple: Lines only"
-msgstr "Jednoduchý: jen úseÄ?ky"
-
-#: ../glade2/meldapp.glade.h:48
-msgid "Solid: Filled Quadilaterals"
-msgstr "Pevný: vyplnÄ?né Ä?tyÅ?úhelníky"
-
-#: ../glade2/meldapp.glade.h:49
+#: ../glade2/meldapp.glade.h:26
 msgid "Tab width"
 msgstr "ŠíÅ?ka tabulátoru"
 
-#: ../glade2/meldapp.glade.h:50
-msgid "Text Beside Icons"
-msgstr "Text vedle ikon"
-
-#: ../glade2/meldapp.glade.h:51
+#: ../glade2/meldapp.glade.h:27
 msgid "Text Filters"
 msgstr "Filtry textu"
 
-#: ../glade2/meldapp.glade.h:52
-msgid "Text Only"
-msgstr "Jen text"
-
-#: ../glade2/meldapp.glade.h:53
-msgid "Text Under Icons"
-msgstr "Text pod ikonami"
-
-#: ../glade2/meldapp.glade.h:54
+#: ../glade2/meldapp.glade.h:28
 msgid "Three way directory"
 msgstr "TÅ?i adresáÅ?e"
 
-#: ../glade2/meldapp.glade.h:55
+#: ../glade2/meldapp.glade.h:29
 msgid "Three way file"
 msgstr "TÅ?i soubory"
 
-#: ../glade2/meldapp.glade.h:56
+#: ../glade2/meldapp.glade.h:30
 msgid "Two way directory"
 msgstr "Dva adresáÅ?e"
 
-#: ../glade2/meldapp.glade.h:57
+#: ../glade2/meldapp.glade.h:31
 msgid "Two way file"
 msgstr "Dva soubory"
 
-#: ../glade2/meldapp.glade.h:58
+#: ../glade2/meldapp.glade.h:32
 msgid "Use GNOME monospace font"
 msgstr "Používat neproporcionální písmo GNOME"
 
-#: ../glade2/meldapp.glade.h:59
+#: ../glade2/meldapp.glade.h:33
 msgid "Use custom font"
 msgstr "Používat vlastní písmo"
 
-#: ../glade2/meldapp.glade.h:60
+#: ../glade2/meldapp.glade.h:34
 msgid "Use syntax highlighting"
 msgstr "Používat zvýrazÅ?ování syntaxe"
 
-#: ../glade2/meldapp.glade.h:61
+#: ../glade2/meldapp.glade.h:35
 msgid "Version control view"
 msgstr "Zobrazení správy verzí"
 
-#: ../glade2/meldapp.glade.h:62
+#: ../glade2/meldapp.glade.h:36
 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)"
 
-#: ../glade2/meldapp.glade.h:63
+#: ../glade2/meldapp.glade.h:37
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -718,7 +595,7 @@ msgstr ""
 "Každý vzorek je seznamem zástupných znaků ve stylu shellu oddÄ?lovaný "
 "mezerami."
 
-#: ../glade2/meldapp.glade.h:64
+#: ../glade2/meldapp.glade.h:38
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -731,39 +608,31 @@ 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."
 
-#: ../glade2/meldapp.glade.h:65
-msgid "Whitespace is significant"
-msgstr "Mezery mají význam"
-
-#: ../glade2/meldapp.glade.h:66
+#: ../glade2/meldapp.glade.h:39
 msgid "_Character"
 msgstr "Zna_k"
 
-#: ../glade2/meldapp.glade.h:68
+#: ../glade2/meldapp.glade.h:40
 msgid "_Directory Comparison"
 msgstr "Porovnávání _adresáÅ?ů"
 
-#: ../glade2/meldapp.glade.h:69
+#: ../glade2/meldapp.glade.h:41
 msgid "_File Comparison"
 msgstr "Porovnávání _souborů"
 
-#: ../glade2/meldapp.glade.h:70
-msgid "_Logo"
-msgstr "_Logo"
-
-#: ../glade2/meldapp.glade.h:71
+#: ../glade2/meldapp.glade.h:42
 msgid "_None"
 msgstr "Žád_né"
 
-#: ../glade2/meldapp.glade.h:72
+#: ../glade2/meldapp.glade.h:43
 msgid "_Three Way Compare"
 msgstr "_Trojcestné porovnávání"
 
-#: ../glade2/meldapp.glade.h:73
+#: ../glade2/meldapp.glade.h:44
 msgid "_Version Control Browser"
 msgstr "_ProhlížeÄ? správy verzí"
 
-#: ../glade2/meldapp.glade.h:74
+#: ../glade2/meldapp.glade.h:45
 msgid "_Word"
 msgstr "_Slovo"
 
@@ -801,256 +670,325 @@ msgstr "Tag"
 
 #: ../glade2/vcview.glade.h:9
 msgid "VC Log"
-msgstr "Záznam VC"
+msgstr "Záznam správy verzí"
+
+#: ../historyentry.py:248
+msgid "_Browse..."
+msgstr "_Procházet..."
+
+#: ../historyentry.py:256
+msgid "Path"
+msgstr "Cesta"
+
+#: ../historyentry.py:257
+msgid "Path to file"
+msgstr "Cesta k souboru"
+
+#: ../historyentry.py:258
+msgid "Pop up a file selector to choose a file"
+msgstr "Zobrazit dialog výbÄ?ru souboru umožÅ?ující zvolit soubor"
+
+#: ../historyentry.py:378
+msgid "Select directory"
+msgstr "Vybrat adresáÅ?"
+
+#: ../historyentry.py:382
+msgid "Select file"
+msgstr "Vybrat soubor"
 
 #: ../meld:47
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Meld vyžaduje %s nebo vyšší."
 
+#: ../meld:64 ../meld:71
+msgid "Cannot import: "
+msgstr "Nelze importovat: "
+
 #: ../meld.desktop.in.h:1
-msgid "Compare and merge your files."
-msgstr "Porovnává a sluÄ?uje soubory."
+msgid "Compare and merge your files"
+msgstr "Porovnává a sluÄ?uje soubory"
 
 #: ../meld.desktop.in.h:2
 msgid "Meld Diff Viewer"
 msgstr "ProhlížeÄ? rozdílů Meld"
 
-#: ../meldapp.py:150
+#: ../meldapp.py:153
 msgid "label"
 msgstr "popisek"
 
-#: ../meldapp.py:151
+#: ../meldapp.py:153
 msgid "pattern"
 msgstr "vzorek"
 
+#: ../meldapp.py:221
+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
-#: ../meldapp.py:258 ../meldapp.py:263 ../vcview.py:163
+#: ../meldapp.py:231 ../meldapp.py:236 ../vcview.py:163
 msgid "Name"
 msgstr "Název"
 
-#: ../meldapp.py:258 ../meldapp.py:263
+#: ../meldapp.py:231 ../meldapp.py:236
 msgid "Active"
 msgstr "Aktivní"
 
-#: ../meldapp.py:258
+#: ../meldapp.py:231
 msgid "Pattern"
 msgstr "Vzorek"
 
-#: ../meldapp.py:263
+#: ../meldapp.py:236
 msgid "Regex"
 msgstr "Reg. výraz"
 
-#: ../meldapp.py:293
-msgid ""
-"Spaces instead of_tab is only available if you have gnome-python-desktop "
-"installed."
-msgstr ""
-"Funkce mezer namísto _tabulátorů je k dispozici jen tehdy, pokud je "
-"nainstalován gnome-python-desktop."
-
-#: ../meldapp.py:301
-msgid ""
-"Line numbers are only available if you have gnome-python-desktop installed."
-msgstr ""
-"Ä?ísla Å?ádků jsou k dispozici, jen pokud je nainstalován gnome-python-desktop."
-
-#: ../meldapp.py:305
-msgid ""
-"Syntax highlighting is only available if you have gnome-python-desktop "
-"installed."
-msgstr ""
-"ZvýrazÅ?ování syntaxe je k dispozici, jen pokud je nainstalován gnome-python-"
-"desktop."
-
-#: ../meldapp.py:394
+#: ../meldapp.py:340
 msgid "Close tab"
 msgstr "ZavÅ?ít kartu"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:469
+#: ../meldapp.py:412
 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
-#: ../meldapp.py:471
-msgid ""
-"Version Control\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
-msgstr ""
-"Správa verzí\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
+#: ../meldapp.py:414
+#, 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
-#: ../meldapp.py:473
+#: ../meldapp.py:416
 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
-#: ../meldapp.py:475
+#: ../meldapp.py:418
 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
-#: ../meldapp.py:477
+#: ../meldapp.py:420
 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
-#: ../meldapp.py:479
+#: ../meldapp.py:422
 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
-#: ../meldapp.py:481
+#: ../meldapp.py:424
 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
-#: ../meldapp.py:483
+#: ../meldapp.py:426
 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
-#: ../meldapp.py:485
+#: ../meldapp.py:428
 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
-#: ../meldapp.py:487
+#: ../meldapp.py:430
 msgid "Script comment\t0\t#.*"
 msgstr "KomentáÅ? skriptu\t0\t#.*"
 
-#: ../meldapp.py:557
+#: ../meldapp.py:510
 msgid "_New..."
 msgstr "_Nový..."
 
-#: ../meldapp.py:557
+#: ../meldapp.py:510
 msgid "Start a new comparison"
 msgstr "Spustit nové porovnání"
 
-#: ../meldapp.py:560
+#: ../meldapp.py:511
+msgid "Save the current file"
+msgstr "Uložit aktuální soubor"
+
+#: ../meldapp.py:513
 msgid "Close the current file"
 msgstr "ZavÅ?ít aktuální soubor"
 
-#: ../meldapp.py:561
+#: ../meldapp.py:514
 msgid "Quit the program"
 msgstr "UkonÄ?it program"
 
-#: ../meldapp.py:564
+#: ../meldapp.py:517
 msgid "Undo the last action"
 msgstr "Vrátit zpÄ?t poslední Ä?innost"
 
-#: ../meldapp.py:565
+#: ../meldapp.py:518
 msgid "Redo the last undone action"
 msgstr "Zopakovat poslední Ä?innost vrácenou zpÄ?t"
 
-#: ../meldapp.py:569
+#: ../meldapp.py:519
+msgid "Cut the selection"
+msgstr "Vyjmout výbÄ?r"
+
+#: ../meldapp.py:520
+msgid "Copy the selection"
+msgstr "Kopírovat výbÄ?r"
+
+#: ../meldapp.py:521
+msgid "Paste the clipboard"
+msgstr "Vložit obsah schránky"
+
+#: ../meldapp.py:522
 msgid "Search for text"
 msgstr "Hledat text"
 
-#: ../meldapp.py:570
+#: ../meldapp.py:523
 msgid "Find Ne_xt"
 msgstr "_Najít následující"
 
-#: ../meldapp.py:570
+#: ../meldapp.py:523
 msgid "Search forwards for the same text"
 msgstr "Hledat tentýž text vpÅ?ed"
 
-#: ../meldapp.py:571
+#: ../meldapp.py:524
+msgid "Find and replace text"
+msgstr "Najít a nahradit text"
+
+#: ../meldapp.py:525
 msgid "Go to the next difference"
-msgstr "PÅ?ejít na další rozdíl"
+msgstr "PÅ?ejít na následující rozdíl"
 
-#: ../meldapp.py:572
+#: ../meldapp.py:526
 msgid "Go to the previous difference"
 msgstr "PÅ?ejít na pÅ?edchozí rozdíl"
 
-#: ../meldapp.py:573
+#: ../meldapp.py:527
+msgid "Prefere_nces"
+msgstr "_PÅ?edvolby"
+
+#: ../meldapp.py:527
 msgid "Configure the application"
 msgstr "Nastavit aplikaci"
 
-#: ../meldapp.py:576
+#: ../meldapp.py:533
 msgid "Stop the current action"
 msgstr "Zastavit aktuální Ä?innost"
 
-#: ../meldapp.py:577
+#: ../meldapp.py:534
 msgid "Refresh the view"
 msgstr "Obnovit zobrazení"
 
-#: ../meldapp.py:578
+#: ../meldapp.py:535
 msgid "Reload"
 msgstr "Znovu naÄ?íst"
 
-#: ../meldapp.py:578
+#: ../meldapp.py:535
 msgid "Reload the comparison"
 msgstr "Znovu naÄ?íst porovnání"
 
-#: ../meldapp.py:581
+#: ../meldapp.py:538
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../meldapp.py:581
+#: ../meldapp.py:538
 msgid "Open the Meld manual"
 msgstr "OtevÅ?ít pÅ?íruÄ?ku aplikace Meld"
 
-#: ../meldapp.py:582
+#: ../meldapp.py:539
 msgid "Report _Bug"
 msgstr "Ohlásit _chybu"
 
-#: ../meldapp.py:582
+#: ../meldapp.py:539
 msgid "Report a bug in Meld"
 msgstr "Nahlásit chybu v aplikaci Meld"
 
-#: ../meldapp.py:583
-msgid "Mailing _List"
-msgstr "_Elektronická konference"
-
-#: ../meldapp.py:583
-msgid "Go to the Meld mailing list"
-msgstr "PÅ?ejít na elektronickou konferenci aplikace Meld"
-
-#: ../meldapp.py:584
+#: ../meldapp.py:540
 msgid "About this program"
 msgstr "O této aplikaci"
 
-#: ../meldapp.py:849
+#: ../meldapp.py:545
+msgid "Full Screen"
+msgstr "Celá obrazovka"
+
+#: ../meldapp.py:545
+msgid "View the comparison in full screen"
+msgstr "Zobrazit porovnání pÅ?es celou obrazovku"
+
+#: ../meldapp.py:546
+msgid "_Toolbar"
+msgstr "Nástrojová _lišta"
+
+#: ../meldapp.py:546
+msgid "Show or hide the toolbar"
+msgstr "Zobrazit nebo skrýt nástrojovou lištu"
+
+#: ../meldapp.py:547
+msgid "_Statusbar"
+msgstr "_Stavová lišta"
+
+#: ../meldapp.py:547
+msgid "Show or hide the statusbar"
+msgstr "Zobrazit nebo skrýt stavovou lištu"
+
+#: ../meldapp.py:895
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Nelze porovnávat kombinaci souborů a adresáÅ?ů.\n"
 
-#. ###############################################################################
-#.
-#. usage
-#.
-#. ###############################################################################
-#: ../meldapp.py:899
+#: ../meldapp.py:938 ../meldapp.py:946
+msgid "file"
+msgstr "soubor"
+
+#: ../meldapp.py:939 ../meldapp.py:945
+msgid "dir"
+msgstr "adr"
+
+#: ../meldapp.py:944
+msgid "Start with no window open"
+msgstr "Spustit bez otevírání okna"
+
+#: ../meldapp.py:945
 #, python-format
-msgid ""
-"Meld %s\n"
-"Written by Stephen Kennedy <stevek gnome org>"
-msgstr ""
-"Meld %s\n"
-"Napsal Stephen Kennedy <stevek gnome org>"
+msgid "Start with Version Control browser in '%s'"
+msgstr "Spustit s prohlížeÄ?em správy verzí v \"%s\""
 
-#: ../meldapp.py:929
+#: ../meldapp.py:946
+#, python-format
+msgid "Start with Version Control diff of '%s'"
+msgstr "Spustit s rozdílem \"%s\" v rámci správy verzí"
+
+#: ../meldapp.py:947
+msgid "Start with 2 or 3 way file comparison"
+msgstr "Spustit s dvojcestným nebo trojcestným porovnáním souborů"
+
+#: ../meldapp.py:948
+msgid "Start with 2 or 3 way directory comparison"
+msgstr "Spustit s dvojcestným nebo trojcestným porovnáním adresáÅ?ů"
+
+#: ../meldapp.py:955
+msgid "Meld is a file and directory comparison tool."
+msgstr "Meld je nástroj porovnávající soubory a adresáÅ?e."
+
+#: ../meldapp.py:958
 msgid "Set label to use instead of file name"
 msgstr "Nastavit k použití popisek namísto názvu souboru"
 
-#: ../meldapp.py:930
+#: ../meldapp.py:960
 msgid "Automatically compare all differing files on startup"
 msgstr "Automaticky pÅ?i spuÅ¡tÄ?ní porovnat vÅ¡echny lišící se soubory"
 
-#: ../meldapp.py:931 ../meldapp.py:932 ../meldapp.py:933 ../meldapp.py:934
+#: ../meldapp.py:961 ../meldapp.py:962 ../meldapp.py:963 ../meldapp.py:964
 msgid "Ignored for compatibility"
 msgstr "Ignorováno z důvodu kompatibility"
 
-#: ../meldapp.py:937
-msgid "Creates a diff tab for up to 3 supplied files."
-msgstr "VytvoÅ?í kartu s porovnáním až pro tÅ?i poskytnuté soubory."
+#: ../meldapp.py:967
+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."
 
-#: ../meldapp.py:947
+#: ../meldapp.py:971
 msgid "Invalid number of arguments supplied for --diff."
 msgstr "Poskytnut nesprávný poÄ?et argumentů --diff."
 
-#: ../meldapp.py:970
+#: ../meldapp.py:974
 #, python-format
 msgid "Wrong number of arguments (Got %i)"
 msgstr "Nesprávný poÄ?et argumentů (obdrženo %i)"
@@ -1060,96 +998,104 @@ msgid "untitled"
 msgstr "nepojmenovaný"
 
 #. no common path. empty names get changed to "[None]"
-#: ../misc.py:120
+#: ../misc.py:191
 msgid "[None]"
 msgstr "[Žádný]"
 
-#: ../vcview.py:120
+#: ../vcview.py:127
 msgid "_Commit"
 msgstr "_Commit"
 
-#: ../vcview.py:120
+#: ../vcview.py:127
 msgid "Commit"
 msgstr "Commit"
 
 #. FIXME: popup used to use gtk.STOCK_GO_BACK
-#: ../vcview.py:121
+#: ../vcview.py:128
 msgid "_Update"
 msgstr "_Update"
 
-#: ../vcview.py:121
+#: ../vcview.py:128
 msgid "Update"
 msgstr "Update"
 
 #. FIXME: popup used to use gtk.STOCK_GO_FORWARD
-#: ../vcview.py:122
+#: ../vcview.py:129
 msgid "_Add"
 msgstr "_PÅ?idat"
 
-#: ../vcview.py:122
+#: ../vcview.py:129
 msgid "Add to VC"
-msgstr "PÅ?idat do VC"
+msgstr "PÅ?idat do správy verzí"
 
 #. FIXME: popup used to use gtk.STOCK_ADD
-#: ../vcview.py:123
+#: ../vcview.py:130
 msgid "Add _Binary"
 msgstr "PÅ?idat _binární"
 
-#: ../vcview.py:123
+#: ../vcview.py:130
 msgid "Add binary to VC"
-msgstr "PÅ?idat binární soubor do VC"
+msgstr "PÅ?idat binární soubor do správy verzí"
 
 #. FIXME: stock is inconsistent with other VC actions
-#: ../vcview.py:124
+#: ../vcview.py:131
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: ../vcview.py:124
+#: ../vcview.py:131
 msgid "Remove from VC"
-msgstr "Odstranit z VC"
+msgstr "Odstranit ze správy verzí"
 
 #. FIXME: popup used to use gtk.STOCK_REMOVE
-#: ../vcview.py:125
+#: ../vcview.py:132
+msgid "_Resolved"
+msgstr "_VyÅ?eÅ¡eno"
+
+#: ../vcview.py:132
+msgid "Mark as resolved for VC"
+msgstr "OznaÄ?it jako vyÅ?eÅ¡ené ve vztahu ke správÄ? verzí"
+
+#: ../vcview.py:133
 msgid "Revert to original"
 msgstr "Vrátit zpÄ?t na původní"
 
-#: ../vcview.py:126
+#: ../vcview.py:134
 msgid "Delete locally"
 msgstr "Odstranit místnÄ?"
 
-#: ../vcview.py:130
+#: ../vcview.py:138
 msgid "_Flatten"
 msgstr "Z_ploštit"
 
-#: ../vcview.py:130
+#: ../vcview.py:138
 msgid "Flatten directories"
 msgstr "ZploÅ¡tit adresáÅ?e"
 
-#: ../vcview.py:131
+#: ../vcview.py:139
 msgid "_Modified"
 msgstr "_ZmÄ?nÄ?né"
 
-#: ../vcview.py:132
+#: ../vcview.py:140
 msgid "_Normal"
 msgstr "_Normální"
 
-#: ../vcview.py:132
+#: ../vcview.py:140
 msgid "Show normal"
 msgstr "Zobrazovat bÄ?žné"
 
-#: ../vcview.py:133
+#: ../vcview.py:141
 msgid "Non _VC"
-msgstr "Nikoliv V_C"
+msgstr "Ni_koliv ve správÄ? verzí"
 
-#: ../vcview.py:133
+#: ../vcview.py:141
 msgid "Show unversioned files"
 msgstr "Zobrazovat soubory bez verzí"
 
-#: ../vcview.py:134
+#: ../vcview.py:142
 msgid "Ignored"
 msgstr "Ignorované"
 
-#: ../vcview.py:134
+#: ../vcview.py:142
 msgid "Show ignored files"
 msgstr "Zobrazovat ignorované soubory"
 
@@ -1169,34 +1115,77 @@ msgstr "Rev"
 msgid "Options"
 msgstr "Možnosti"
 
-#: ../vcview.py:267
+#: ../vcview.py:230
+msgid "Choose one Version Control"
+msgstr "Vyberte jednu správu verzí"
+
+#: ../vcview.py:231
+msgid "Only one Version Control in this directory"
+msgstr "V tomto adresáÅ?i pouze jedna správa verzí"
+
+#: ../vcview.py:316
 msgid "(Empty)"
 msgstr "(Prázdný)"
 
-#: ../vcview.py:304
+#: ../vcview.py:349
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Stahují se rozdíly"
 
-#: ../vcview.py:311
+#: ../vcview.py:356
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Použití patche"
 
-#: ../vcview.py:315
+#: ../vcview.py:360
 msgid "No differences found."
 msgstr "Nenalezeny žádné rozdíly."
 
-#: ../vcview.py:392
+#: ../vcview.py:439
 msgid "Select some files first."
 msgstr "NejdÅ?íve je nutné vybrat soubory."
 
-#: ../vcview.py:459
-msgid "Invoking patch failed, you need GNU patch."
-msgstr "Použití patche selhalo, je vyžadován GNU patch."
+#: ../vcview.py:505
+#, python-format
+msgid ""
+"\n"
+"                    Invoking 'patch' failed.\n"
+"                    \n"
+"                    Maybe you don't have 'GNU patch' installed,\n"
+"                    or you use an untested version of %s.\n"
+"                    \n"
+"                    Please send email bug report to:\n"
+"                    meld-list gnome org\n"
+"                    \n"
+"                    Containing the following information:\n"
+"                    \n"
+"                    - meld version: '%s'\n"
+"                    - source control software type: '%s'\n"
+"                    - source control software version: 'X.Y.Z'\n"
+"                    - the output of '%s somefile.txt'\n"
+"                    - patch command: '%s'\n"
+"                    "
+msgstr ""
+"\n"
+"                    SpuÅ¡tÄ?ní \"patch\" se nezdaÅ?ilo.\n"
+"                    \n"
+"                    Možná nemáte nainstalován \"GNU patch\",\n"
+"                    nebo používáte netestovanou verzi %s.\n"
+"                    \n"
+"                    ZaÅ¡lete prosím e-mail s hlášením o chybÄ? na:\n"
+"                    meld-list gnome org\n"
+"                    \n"
+"                    S uvedením následujících informací:\n"
+"                    \n"
+"                    - meld version: '%s'\n"
+"                    - source control software type: '%s'\n"
+"                    - source control software version: 'X.Y.Z'\n"
+"                    - the output of '%s somefile.txt'\n"
+"                    - patch command: '%s'\n"
+"                    "
 
 #. These are the possible states of files. Be sure to get the colons correct.
-#: ../vc/_vc.py:40
+#: ../vc/_vc.py:39
 msgid ""
 "Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:"
 "Missing"
@@ -1204,7 +1193,7 @@ msgstr ""
 "Ignorováno:Bez verze:::Chyba::NovÄ? pÅ?idáno:ZmÄ?nÄ?no:<b>Konflikt</b>:"
 "OdstranÄ?no:Chybí"
 
-#: ../vc/cvs.py:155
+#: ../vc/cvs.py:151
 #, python-format
 msgid ""
 "Error converting to a regular expression\n"
@@ -1215,6 +1204,150 @@ msgstr ""
 "Vzorkem byl \"%s\"\n"
 "Chyba byla následující: \"%s\""
 
+#~ msgid "Save the current file with a different name"
+#~ msgstr "Uložit aktuální soubor pod jiným jménem"
+
+#~ msgid "The regular expression '%s' was not found."
+#~ msgstr "Regulární výraz \"%s\" nebyl nalezen."
+
+#~ msgid "The text '%s' was not found."
+#~ msgstr "Text \"%s\" nebyl nalezen."
+
+#~ msgid "Find"
+#~ msgstr "Hledat"
+
+#~ msgid "Match _entire word only"
+#~ msgstr "Hledat jen _celá slova"
+
+#~ msgid "_Wrap around"
+#~ msgstr "PÅ?echázet pÅ?es _okraj"
+
+#~ msgid "(gnome-default-editor)"
+#~ msgstr "(gnome-default-editor)"
+
+#~ msgid "<b>Drawing Style</b>"
+#~ msgstr "<b>Styl vykreslení</b>"
+
+#~ msgid "<b>Saving</b>"
+#~ msgstr "<b>Ukládání</b>"
+
+#~ msgid "<b>Toolbar Appearance</b>"
+#~ msgstr "<b>Vzhled lišty nástrojů</b>"
+
+#~ msgid "<b>Whitespace</b>"
+#~ msgstr "<b>Mezery</b>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Compare</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Porovnávání</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Zobrazení</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Editor</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Kódování</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Filtry souborů</span>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Filtry textu</span>"
+
+#~ msgid ""
+#~ "Choose how the central bar of the diff viewer is drawn. You may wish to "
+#~ "choose a simpler mode if you find scrolling is slow."
+#~ msgstr ""
+#~ "Zvolte způsob vykreslení stÅ?edního sloupce zobrazovaÄ?e rozdílů. Pokud vám "
+#~ "posouvání pÅ?ipadá pomalé, můžete zvolit jednodušší režim."
+
+#~ msgid "Curved: Filled Curves"
+#~ msgstr "Oblý: vyplnÄ?né kÅ?ivky"
+
+#~ msgid "Display"
+#~ msgstr "Zobrazení"
+
+#~ msgid "Gnome Default"
+#~ msgstr "Výchozí GNOME"
+
+#~ msgid "Icons Only"
+#~ msgstr "Jen ikony"
+
+#~ msgid "Ignore changes in amount of white space"
+#~ msgstr "Ignorovat zmÄ?ny v poÄ?tu mezer"
+
+#~ msgid ""
+#~ "Ignore changes in case; consider upper and lower-case letters equivalent"
+#~ msgstr ""
+#~ "Ignorovat zmÄ?ny velikosti písmen; považovat velká a malá písmena za "
+#~ "ekvivalentní"
+
+#~ msgid "Ignore changes that just insert or delete blank lines"
+#~ msgstr "Ignorovat zmÄ?ny, které jen pÅ?idávají nebo odstraÅ?ují prázdné Å?ádky"
+
+#~ msgid "Save in UTF-8 encoding"
+#~ msgstr "Ukládat v kódování UTF-8"
+
+#~ msgid "Save in the files original encoding"
+#~ msgstr "Ukládat v původních kódováních souborů"
+
+#~ msgid "Simple: Lines only"
+#~ msgstr "Jednoduchý: jen úseÄ?ky"
+
+#~ msgid "Solid: Filled Quadilaterals"
+#~ msgstr "Pevný: vyplnÄ?né Ä?tyÅ?úhelníky"
+
+#~ msgid "Text Beside Icons"
+#~ msgstr "Text vedle ikon"
+
+#~ msgid "Text Only"
+#~ msgstr "Jen text"
+
+#~ msgid "Text Under Icons"
+#~ msgstr "Text pod ikonami"
+
+#~ msgid "Whitespace is significant"
+#~ msgstr "Mezery mají význam"
+
+#~ msgid "_Logo"
+#~ msgstr "_Logo"
+
+#~ msgid ""
+#~ "Spaces instead of_tab is only available if you have gnome-python-desktop "
+#~ "installed."
+#~ msgstr ""
+#~ "Funkce mezer namísto _tabulátorů je k dispozici jen tehdy, pokud je "
+#~ "nainstalován gnome-python-desktop."
+
+#~ msgid ""
+#~ "Syntax highlighting is only available if you have gnome-python-desktop "
+#~ "installed."
+#~ msgstr ""
+#~ "ZvýrazÅ?ování syntaxe je k dispozici, jen pokud je nainstalován gnome-"
+#~ "python-desktop."
+
+#~ msgid ""
+#~ "Version Control\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
+#~ msgstr ""
+#~ "Správa verzí\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
+
+#~ msgid "Mailing _List"
+#~ msgstr "_Elektronická konference"
+
+#~ msgid "Go to the Meld mailing list"
+#~ msgstr "PÅ?ejít na elektronickou konferenci aplikace Meld"
+
+#~ msgid ""
+#~ "Meld %s\n"
+#~ "Written by Stephen Kennedy <stevek gnome org>"
+#~ msgstr ""
+#~ "Meld %s\n"
+#~ "Napsal Stephen Kennedy <stevek gnome org>"
+
+#~ msgid "Invoking patch failed, you need GNU patch."
+#~ msgstr "Použití patche selhalo, je vyžadován GNU patch."
+
 #~ msgid "Edit"
 #~ msgstr "Upravit"
 
@@ -1299,9 +1432,6 @@ msgstr ""
 #~ msgid "_Down"
 #~ msgstr "_Dolů"
 
-#~ msgid "_File"
-#~ msgstr "_Soubor"
-
 #~ msgid "_Help"
 #~ msgstr "_NápovÄ?da"