[meld] Updated Czech translation

From: Marek ÄernockÃ <mcernocky src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated Czech translation
Date: Mon, 1 Aug 2011 23:50:46 +0000 (UTC)
commit 3399c41492b614ee07f886baeb49d0ab5c66b9b1
Author: Marek ÄernockÃ <marek manet cz>
Date:   Tue Aug 2 01:50:51 2011 +0200

    Updated Czech translation

 po/cs.po |  804 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 442 insertions(+), 362 deletions(-)
---
diff --git a/po/cs.po b/po/cs.po
index 7fa42bd..4686ed2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,20 +2,23 @@
 # Copyright (C) 2003, 2004, 2005, 2008, 2009, 2010 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, 2009, 2010, 2011.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
-"Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2011-01-26 21:19+0100\n"
-"PO-Revision-Date: 2011-01-28 20:26+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=meld&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-05-29 02:18+0000\n"
+"PO-Revision-Date: 2011-08-02 01:49+0200\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"
+"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Lokalize 1.1\n"
 
@@ -44,6 +47,60 @@ msgstr "Meld"
 msgid "Meld Diff Viewer"
 msgstr "ProhlÃÅeÄ rozdÃlÅ Meld"
 
+#: ../data/ui/EditableList.ui.h:1
+msgid "Active"
+msgstr "AktivnÃ"
+
+#: ../data/ui/EditableList.ui.h:2
+#, fuzzy
+#| msgid "File filters"
+msgid "Add new filter"
+msgstr "Filtry souborÅ"
+
+#: ../data/ui/EditableList.ui.h:3
+#, fuzzy
+#| msgid "Edit files with:"
+msgid "Editable List"
+msgstr "Upravit soubory s:"
+
+#: ../data/ui/EditableList.ui.h:4
+msgid "Move _Down"
+msgstr ""
+
+#: ../data/ui/EditableList.ui.h:5
+msgid "Move _Up"
+msgstr ""
+
+#: ../data/ui/EditableList.ui.h:6
+msgid "Move item down"
+msgstr ""
+
+#: ../data/ui/EditableList.ui.h:7
+msgid "Move item up"
+msgstr ""
+
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:157
+msgid "Name"
+msgstr "NÃzev"
+
+#: ../data/ui/EditableList.ui.h:9
+msgid "Pattern"
+msgstr "Vzorek"
+
+#: ../data/ui/EditableList.ui.h:10
+#, fuzzy
+#| msgid "Select file"
+msgid "Remove selected filter"
+msgstr "Vybrat soubor"
+
+#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:122
+msgid "_Add"
+msgstr "_PÅidat"
+
+#: ../data/ui/EditableList.ui.h:12 ../meld/vcview.py:124
+msgid "_Remove"
+msgstr "_Odstranit"
+
 #: ../data/ui/filediff.ui.h:1
 msgid "Save modified files?"
 msgstr "UloÅit zmÄnÄnÃ soubory?"
@@ -92,7 +149,7 @@ msgstr "_NÃsledujÃcÃ"
 msgid "_Previous"
 msgstr "_PÅedchozÃ"
 
-#: ../data/ui/findbar.ui.h:8 ../meld/meldapp.py:147
+#: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:141
 msgid "_Replace"
 msgstr "Nahradi_t"
 
@@ -109,8 +166,8 @@ 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"
+"Copyright &#xA9; 2002 â 2009 Stephen Kennedy\n"
+"Copyright &#xA9; 2009 â 2010 Kai Willadsen"
 
 #: ../data/ui/meldapp.ui.h:4
 msgid "Directory"
@@ -328,7 +385,7 @@ msgstr "ZprÃva zÃznamu"
 msgid "Previous Logs"
 msgstr "PÅedchozÃ zÃznamy"
 
-#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:179
+#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:180
 msgid "Tag"
 msgstr "Tag"
 
@@ -336,153 +393,175 @@ msgstr "Tag"
 msgid "VC Log"
 msgstr "ZÃznam sprÃvy verzÃ"
 
-#: ../meld/dirdiff.py:142 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
 msgid "_Compare"
 msgstr "_Porovnat"
 
-#: ../meld/dirdiff.py:142 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
 msgid "Compare selected"
 msgstr "Porovnat vybranÃ"
 
-#: ../meld/dirdiff.py:143
+#: ../meld/dirdiff.py:228
 msgid "Copy _Left"
 msgstr "KopÃrovat na_levo"
 
-#: ../meld/dirdiff.py:143
+#: ../meld/dirdiff.py:228
 msgid "Copy to left"
 msgstr "KopÃrovat doleva"
 
-#: ../meld/dirdiff.py:144
+#: ../meld/dirdiff.py:229
 msgid "Copy _Right"
 msgstr "KopÃ_rovat napravo"
 
-#: ../meld/dirdiff.py:144
+#: ../meld/dirdiff.py:229
 msgid "Copy to right"
 msgstr "KopÃrovat doprava"
 
-#: ../meld/dirdiff.py:145
+#: ../meld/dirdiff.py:230
 msgid "Delete selected"
 msgstr "Odstranit vybranÃ"
 
-#: ../meld/dirdiff.py:146 ../meld/filediff.py:982
+#: ../meld/dirdiff.py:231 ../meld/filediff.py:1117
 msgid "Hide"
 msgstr "SkrÃt"
 
-#: ../meld/dirdiff.py:146
+#: ../meld/dirdiff.py:231
 msgid "Hide selected"
 msgstr "SkrÃt vybranÃ"
 
-#: ../meld/dirdiff.py:148 ../meld/filediff.py:250 ../meld/vcview.py:119
+#: ../meld/dirdiff.py:233 ../meld/filediff.py:267 ../meld/vcview.py:119
 msgid "Open selected"
 msgstr "OtevÅÃt vybranÃ"
 
-#: ../meld/dirdiff.py:152
+#: ../meld/dirdiff.py:237
 msgid "Case"
 msgstr "Velikost pÃsmen"
 
-#: ../meld/dirdiff.py:152
+#: ../meld/dirdiff.py:237
 msgid "Ignore case of entries"
 msgstr "Ignorovat velikost pÃsmen"
 
-#: ../meld/dirdiff.py:153
+#: ../meld/dirdiff.py:238
 msgid "Same"
 msgstr "StejnÃ"
 
-#: ../meld/dirdiff.py:153
+#: ../meld/dirdiff.py:238
 msgid "Show identical"
 msgstr "Zobrazovat stejnÃ"
 
-#: ../meld/dirdiff.py:154
+#: ../meld/dirdiff.py:239
 msgid "New"
 msgstr "NovÃ"
 
-#: ../meld/dirdiff.py:154
+#: ../meld/dirdiff.py:239
 msgid "Show new"
 msgstr "Zobrazovat novÃ"
 
-#: ../meld/dirdiff.py:155
+#: ../meld/dirdiff.py:240
 msgid "Modified"
 msgstr "ZmÄnÄnÃ"
 
-#: ../meld/dirdiff.py:155 ../meld/vcview.py:132
+#: ../meld/dirdiff.py:240 ../meld/vcview.py:132
 msgid "Show modified"
 msgstr "Zobrazovat zmÄnÄnÃ"
 
-#: ../meld/dirdiff.py:157
+#: ../meld/dirdiff.py:242
 msgid "Filters"
 msgstr "Filtry"
 
-#: ../meld/dirdiff.py:157
+#: ../meld/dirdiff.py:242
 msgid "Set active filters"
 msgstr "Nastavte aktivnÃ filtry"
 
-#: ../meld/dirdiff.py:213 ../meld/dirdiff.py:261
-#, 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:272
+#: ../meld/dirdiff.py:359
 #, python-format
 msgid "Hide %s"
 msgstr "SkrÃt %s"
 
-#: ../meld/dirdiff.py:357 ../meld/dirdiff.py:367 ../meld/vcview.py:304
-#: ../meld/vcview.py:332
+#: ../meld/dirdiff.py:462 ../meld/dirdiff.py:475 ../meld/vcview.py:305
+#: ../meld/vcview.py:333
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] ProchÃzÃ se %s"
 
-#: ../meld/dirdiff.py:396
+#: ../meld/dirdiff.py:574
 #, python-format
-msgid "'%s' hidden by '%s'"
-msgstr "\"%s\" skryto \"%s\""
+msgid "[%s] Done"
+msgstr "[%s] Hotovo"
 
-#: ../meld/dirdiff.py:402
-#, python-format
+#: ../meld/dirdiff.py:578
+msgid "Multiple errors occurred while scanning this folder"
+msgstr ""
+
+#: ../meld/dirdiff.py:579
+#, fuzzy
+#| msgid "%s is not in encodings: %s"
+msgid "Files with invalid encodings found"
+msgstr "%s nenÃ v kÃdovÃnÃch: %s"
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:581
+msgid "Some files were in an incorrect encoding. The names are something like:"
+msgstr ""
+
+#: ../meld/dirdiff.py:583
+msgid "Files hidden by case insensitive comparison"
+msgstr ""
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:585
+#, fuzzy
+#| msgid ""
+#| "You are running a case insensitive comparison on a case sensitive "
+#| "filesystem. Some files are not visible:\n"
+#| "%s"
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
-"filesystem. Some files are not visible:\n"
-"%s"
+"filesystem. The following files in this folder are hidden:"
 msgstr ""
 "ProvÃdÃ se porovnÃnÃ nerozliÅujÃcÃ velikost pÃsmen na systÃmu souborÅ "
 "rozliÅujÃcÃm velikost pÃsmen. NÄkterÃ soubory nejsou zobrazenÃ:\n"
 "%s"
 
-#: ../meld/dirdiff.py:479
+#: ../meld/dirdiff.py:596
 #, python-format
-msgid "[%s] Done"
-msgstr "[%s] Hotovo"
+msgid "'%s' hidden by '%s'"
+msgstr "â%sâ skryto v â%sâ"
+
+#: ../meld/dirdiff.py:621 ../meld/filediff.py:981 ../meld/filediff.py:1121
+msgid "Hi_de"
+msgstr "_SkrÃt"
 
-#: ../meld/dirdiff.py:525
+#: ../meld/dirdiff.py:671
 #, python-format
 msgid ""
 "'%s' exists.\n"
 "Overwrite?"
 msgstr ""
-"\"%s\" existuje.\n"
+"â%sâ existuje.\n"
 "PÅepsat?"
 
-#: ../meld/dirdiff.py:532
+#: ../meld/dirdiff.py:678
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
 "\n"
 "%s."
 msgstr ""
-"Chyba pÅi kopÃrovÃnÃ \"%s\" do \"%s\"\n"
+"Chyba pÅi kopÃrovÃnÃ â%sâ do â%sâ\n"
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:550 ../meld/vcview.py:504
+#: ../meld/dirdiff.py:696 ../meld/vcview.py:505
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
 "Remove recursively?"
 msgstr ""
-"\"%s\" je adresÃÅem.\n"
+"â%sâ je adresÃÅem.\n"
 "Odstranit rekurzivnÄ?"
 
-#: ../meld/dirdiff.py:557 ../meld/vcview.py:509
+#: ../meld/dirdiff.py:703 ../meld/vcview.py:510
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -493,7 +572,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:569
+#: ../meld/dirdiff.py:715
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -501,7 +580,7 @@ msgstr[0] "%i sekunda"
 msgstr[1] "%i sekundy"
 msgstr[2] "%i sekund"
 
-#: ../meld/dirdiff.py:570
+#: ../meld/dirdiff.py:716
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -509,7 +588,7 @@ msgstr[0] "%i minuta"
 msgstr[1] "%i minuty"
 msgstr[2] "%i minut"
 
-#: ../meld/dirdiff.py:571
+#: ../meld/dirdiff.py:717
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -517,7 +596,7 @@ msgstr[0] "%i hodina"
 msgstr[1] "%i hodiny"
 msgstr[2] "%i hodin"
 
-#: ../meld/dirdiff.py:572
+#: ../meld/dirdiff.py:718
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -525,7 +604,7 @@ msgstr[0] "%i den"
 msgstr[1] "%i dny"
 msgstr[2] "%i dnÅ"
 
-#: ../meld/dirdiff.py:573
+#: ../meld/dirdiff.py:719
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -533,7 +612,7 @@ msgstr[0] "%i tÃden"
 msgstr[1] "%i tÃdny"
 msgstr[2] "%i tÃdnÅ"
 
-#: ../meld/dirdiff.py:574
+#: ../meld/dirdiff.py:720
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -541,7 +620,7 @@ msgstr[0] "%i mÄsÃc"
 msgstr[1] "%i mÄsÃce"
 msgstr[2] "%i mÄsÃcÅ"
 
-#: ../meld/dirdiff.py:575
+#: ../meld/dirdiff.py:721
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -549,217 +628,236 @@ msgstr[0] "%i rok"
 msgstr[1] "%i roky"
 msgstr[2] "%i let"
 
-#: ../meld/filediff.py:251
+#: ../meld/filediff.py:268
 msgid "Format as patch..."
-msgstr "FormÃtovat jako zÃplatu..."
+msgstr "FormÃtovat jako zÃplatuâ"
 
-#: ../meld/filediff.py:251
+#: ../meld/filediff.py:268
 msgid "Create a patch using differences between files"
 msgstr "VytvoÅit zÃplatu pouÅitÃm rozdÃlÅ mezi soubory"
 
-#: ../meld/filediff.py:252
+#: ../meld/filediff.py:269
 msgid "Previous conflict"
 msgstr "PÅedchozÃ konflikt"
 
-#: ../meld/filediff.py:252
+#: ../meld/filediff.py:269
 msgid "Go to the previous conflict"
 msgstr "PÅejÃt na pÅedchozÃ konflikt"
 
-#: ../meld/filediff.py:253
+#: ../meld/filediff.py:270
 msgid "Next conflict"
 msgstr "NÃsledujÃcÃ konflikt"
 
-#: ../meld/filediff.py:253
+#: ../meld/filediff.py:270
 msgid "Go to the next conflict"
 msgstr "PÅejÃt na nÃsledujÃcÃ konflikt"
 
-#: ../meld/filediff.py:254
+#: ../meld/filediff.py:271
 msgid "Push to left"
 msgstr "ZatlaÄit doleva"
 
-#: ../meld/filediff.py:254
+#: ../meld/filediff.py:271
 msgid "Push current change to the left"
 msgstr "ZatlaÄit aktuÃlnÃ zmÄnu doleva"
 
-#: ../meld/filediff.py:255
+#: ../meld/filediff.py:272
 msgid "Push to right"
 msgstr "ZatlaÄit doprava"
 
-#: ../meld/filediff.py:255
+#: ../meld/filediff.py:272
 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:257
+#: ../meld/filediff.py:274
 msgid "Pull from left"
 msgstr "VytÃhnout zleva"
 
-#: ../meld/filediff.py:257
+#: ../meld/filediff.py:274
 msgid "Pull change from the left"
 msgstr "VytÃhnout zmÄnu zleva"
 
-#: ../meld/filediff.py:258
+#: ../meld/filediff.py:275
 msgid "Pull from right"
 msgstr "VytÃhnout zprava"
 
-#: ../meld/filediff.py:258
+#: ../meld/filediff.py:275
 msgid "Pull change from the right"
 msgstr "VytÃhnout zmÄnu zprava"
 
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:276
 msgid "Copy above left"
 msgstr "KopÃrovat z levÃ vrchnÃ ÄÃsti"
 
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:276
 msgid "Copy change above the left chunk"
 msgstr "KopÃrovat zmÄnu nad levÃm blokem"
 
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:277
 msgid "Copy below left"
 msgstr "KopÃrovat z levÃ spodnÃ ÄÃsti"
 
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:277
 msgid "Copy change below the left chunk"
 msgstr "KopÃrovat zmÄnu pod levÃm blokem"
 
-#: ../meld/filediff.py:261
+#: ../meld/filediff.py:278
 msgid "Copy above right"
 msgstr "KopÃrovat z pravÃ vrchnÃ ÄÃsti"
 
-#: ../meld/filediff.py:261
+#: ../meld/filediff.py:278
 msgid "Copy change above the right chunk"
 msgstr "KopÃrovat zmÄnu nad pravÃm blokem"
 
-#: ../meld/filediff.py:262
+#: ../meld/filediff.py:279
 msgid "Copy below right"
 msgstr "KopÃrovat z pravÃ spodnÃ ÄÃsti"
 
-#: ../meld/filediff.py:262
+#: ../meld/filediff.py:279
 msgid "Copy change below the right chunk"
 msgstr "KopÃrovat zmÄnu pod pravÃm blokem"
 
-#: ../meld/filediff.py:263
+#: ../meld/filediff.py:280
 msgid "Delete"
 msgstr "Smazat"
 
-#: ../meld/filediff.py:263
+#: ../meld/filediff.py:280
 msgid "Delete change"
 msgstr "Smazat zmÄnu"
 
-#: ../meld/filediff.py:264
+#: ../meld/filediff.py:281
 msgid "Merge all changes from left"
 msgstr "SlouÄit veÅkerÃ zmÄny zleva"
 
-#: ../meld/filediff.py:264
+#: ../meld/filediff.py:281
 msgid "Merge all non-conflicting changes from the left"
 msgstr "SlouÄit veÅkerÃ zmÄny bez konfliktÅ zleva"
 
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:282
 msgid "Merge all changes from right"
 msgstr "SlouÄit veÅkerÃ zmÄny zprava"
 
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:282
 msgid "Merge all non-conflicting changes from the right"
 msgstr "SlouÄit veÅkerÃ zmÄny bez konfliktÅ zprava"
 
-#: ../meld/filediff.py:266
+#: ../meld/filediff.py:283
 msgid "Merge all non-conflicting"
 msgstr "SlouÄit vÅe bez konfliktÅ"
 
-#: ../meld/filediff.py:266
+#: ../meld/filediff.py:283
 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"
 
-#: ../meld/filediff.py:270
+#: ../meld/filediff.py:284
+msgid "Cycle through documents"
+msgstr ""
+
+#: ../meld/filediff.py:284
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr ""
+
+#: ../meld/filediff.py:288
 msgid "Lock scrolling"
 msgstr "Uzamknout posouvÃnÃ"
 
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:289
 msgid "Lock scrolling of all panes"
 msgstr "Uzamknout posouvÃnÃ vÅech panelÅ"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:345
+#: ../meld/filediff.py:381
 msgid "INS"
 msgstr "VKL"
 
-#: ../meld/filediff.py:345
+#: ../meld/filediff.py:381
 msgid "OVR"
 msgstr "PÅE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:347
+#: ../meld/filediff.py:383
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "ÅÃd %i, sl %i"
 
-#: ../meld/filediff.py:549
-#, python-format
+#: ../meld/filediff.py:693
+#, fuzzy, python-format
+#| msgid ""
+#| "Regular expression '%s' changed the number of lines in the file. "
+#| "Comparison will be incorrect. See the user manual for more details."
 msgid ""
-"Regular expression '%s' changed the number of lines in the file. Comparison "
-"will be incorrect. See the user manual for more details."
+"Filter '%s' changed the number of lines in the file. Comparison will be "
+"incorrect. See the user manual for more details."
 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."
+"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."
 
 #. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:657
+#: ../meld/filediff.py:780
 msgid "<unnamed>"
 msgstr "<bez nÃzvu>"
 
-#: ../meld/filediff.py:847
+#: ../meld/filediff.py:969
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Nastaven poÄet panelÅ"
 
-#: ../meld/filediff.py:853
+#: ../meld/filediff.py:975
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] OtevÃrajÃ se soubory"
 
-#: ../meld/filediff.py:859 ../meld/filediff.py:986
-msgid "Hi_de"
-msgstr "_SkrÃt"
-
-#: ../meld/filediff.py:880 ../meld/filediff.py:889 ../meld/filediff.py:901
-#: ../meld/filediff.py:907
+#: ../meld/filediff.py:999 ../meld/filediff.py:1008 ../meld/filediff.py:1020
+#: ../meld/filediff.py:1026
 msgid "Could not read file"
 msgstr "Nelze pÅeÄÃst soubor"
 
-#: ../meld/filediff.py:881
+#: ../meld/filediff.py:1000
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Ätou se soubory"
 
-#: ../meld/filediff.py:890
+#: ../meld/filediff.py:1009
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je zÅejmÄ binÃrnÃm souborem."
 
-#: ../meld/filediff.py:902
+#: ../meld/filediff.py:1021
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s nenÃ v kÃdovÃnÃch: %s"
 
-#: ../meld/filediff.py:932 ../meld/filemerge.py:69
+#: ../meld/filediff.py:1051 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] PoÄÃtajÃ se rozdÃly"
 
-#: ../meld/filediff.py:980
+#: ../meld/filediff.py:1108
+msgid ""
+"Text filters are being used, and may be masking differences between files. "
+"Would you like to compare the unfiltered files?"
+msgstr ""
+
+#: ../meld/filediff.py:1114
 msgid "Files are identical"
 msgstr "Soubory jsou stejnÃ"
 
-#: ../meld/filediff.py:1123
+#: ../meld/filediff.py:1124
+#, fuzzy
+#| msgid "Show ignored files"
+msgid "Show without filters"
+msgstr "Zobrazovat ignorovanÃ soubory"
+
+#: ../meld/filediff.py:1278
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
 "Overwrite?"
 msgstr ""
-"\"%s\" existuje!\n"
+"â%sâ existuje!\n"
 "PÅepsat?"
 
-#: ../meld/filediff.py:1136
+#: ../meld/filediff.py:1291
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -770,32 +868,32 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1145
+#: ../meld/filediff.py:1300
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Zvolte nÃzev vyrovnÃvacÃ pamÄti %i."
 
-#: ../meld/filediff.py:1160
+#: ../meld/filediff.py:1315
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
 "\n"
 "Which format would you like to use?"
 msgstr ""
-"Soubor \"%s\" obsahuje rÅznÃ konce ÅÃdkÅ.\n"
+"Soubor â%sâ obsahuje rÅznÃ konce ÅÃdkÅ.\n"
 "\n"
 "JakÃ formÃt chcete pouÅÃvat?"
 
-#: ../meld/filediff.py:1176
+#: ../meld/filediff.py:1331
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
 "Would you like to save as UTF-8?"
 msgstr ""
-"\"%s\" obsahuje znaky, kterÃ nelze kÃdovat v \"%s\"\n"
+"â%sâ obsahuje znaky, kterÃ nelze kÃdovat v â%sâ\n"
 "Chcete uloÅit jako UTF-8?"
 
-#: ../meld/filediff.py:1235
+#: ../meld/filediff.py:1390
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -813,332 +911,388 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] SluÄujÃ se soubory"
 
-#: ../meld/meldapp.py:132
+#: ../meld/meldapp.py:149
+msgid "wrong number of arguments supplied to --diff"
+msgstr "poskytnut nesprÃvnÃ poÄet argumentÅ --diff"
+
+#: ../meld/meldapp.py:153
+msgid "Start with an empty window"
+msgstr "Spustit s prÃzdnÃm oknem"
+
+#: ../meld/meldapp.py:154 ../meld/meldapp.py:155 ../meld/meldapp.py:157
+msgid "file"
+msgstr "soubor"
+
+#: ../meld/meldapp.py:154 ../meld/meldapp.py:156 ../meld/meldapp.py:157
+msgid "dir"
+msgstr "adr"
+
+#: ../meld/meldapp.py:154
+msgid "Start a version control comparison"
+msgstr "Spustit novÃ porovnÃnÃ sprÃvy verzÃ"
+
+#: ../meld/meldapp.py:155
+msgid "Start a 2- or 3-way file comparison"
+msgstr "Spustit dvojcestnÃ nebo trojcestnÃ porovnÃnÃ souborÅ"
+
+#: ../meld/meldapp.py:156
+msgid "Start a 2- or 3-way directory comparison"
+msgstr "Spustit dvojcestnÃ nebo trojcestnÃ porovnÃnÃ adresÃÅÅ"
+
+#: ../meld/meldapp.py:157
+msgid "Start a comparison between file and dir/file"
+msgstr "Spustit porovnÃnÃ souboru a adresÃÅe/souboru"
+
+#: ../meld/meldapp.py:163
+msgid "Meld is a file and directory comparison tool."
+msgstr "Meld je nÃstroj porovnÃvajÃcÃ soubory a adresÃÅe."
+
+#: ../meld/meldapp.py:166
+msgid "Set label to use instead of file name"
+msgstr "Nastavit k pouÅitÃ popisek namÃsto nÃzvu souboru"
+
+#: ../meld/meldapp.py:168
+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:170
+msgid "Ignored for compatibility"
+msgstr "IgnorovÃno z dÅvodu kompatibility"
+
+#: ../meld/meldapp.py:173
+msgid "Set the target file for saving a merge result"
+msgstr ""
+"Nastavte cÃlovÃ soubor, do kterÃho chcete uloÅit vÃsledek sluÄovÃnÃ slo"
+
+#: ../meld/meldapp.py:176
+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:179
+#, 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/meldapp.py:181 ../meld/meldapp.py:185
+#, fuzzy
+#| msgid "Cannot compare a mixture of files and directories.\n"
+msgid "can't compare more than three directories"
+msgstr "Nelze porovnÃvat kombinaci souborÅ a adresÃÅÅ.\n"
+
+#: ../meld/melddoc.py:51 ../meld/melddoc.py:52
+msgid "untitled"
+msgstr "nepojmenovanÃ"
+
+#: ../meld/meldwindow.py:125
 msgid "_File"
 msgstr "_Soubor"
 
-#: ../meld/meldapp.py:133
+#: ../meld/meldwindow.py:126
 msgid "_New..."
-msgstr "_NovÃ..."
+msgstr "_NovÃâ"
 
-#: ../meld/meldapp.py:133
+#: ../meld/meldwindow.py:126
 msgid "Start a new comparison"
 msgstr "Spustit novÃ porovnÃnÃ"
 
-#: ../meld/meldapp.py:134
+#: ../meld/meldwindow.py:127
 msgid "Save the current file"
 msgstr "UloÅit aktuÃlnÃ soubor"
 
-#: ../meld/meldapp.py:136
+#: ../meld/meldwindow.py:129
 msgid "Close the current file"
 msgstr "ZavÅÃt aktuÃlnÃ soubor"
 
-#: ../meld/meldapp.py:137
+#: ../meld/meldwindow.py:130
 msgid "Quit the program"
 msgstr "UkonÄit program"
 
-#: ../meld/meldapp.py:139
+#: ../meld/meldwindow.py:132
 msgid "_Edit"
 msgstr "_Upravit"
 
-#: ../meld/meldapp.py:140
+#: ../meld/meldwindow.py:133
 msgid "Undo the last action"
 msgstr "VrÃtit zpÄt poslednÃ Äinnost"
 
-#: ../meld/meldapp.py:141
+#: ../meld/meldwindow.py:134
 msgid "Redo the last undone action"
 msgstr "Zopakovat poslednÃ Äinnost vrÃcenou zpÄt"
 
-#: ../meld/meldapp.py:142
+#: ../meld/meldwindow.py:135
 msgid "Cut the selection"
 msgstr "Vyjmout vÃbÄr"
 
-#: ../meld/meldapp.py:143
+#: ../meld/meldwindow.py:136
 msgid "Copy the selection"
 msgstr "KopÃrovat vÃbÄr"
 
-#: ../meld/meldapp.py:144
+#: ../meld/meldwindow.py:137
 msgid "Paste the clipboard"
 msgstr "VloÅit obsah schrÃnky"
 
-#: ../meld/meldapp.py:145
+#: ../meld/meldwindow.py:138
 msgid "Search for text"
 msgstr "Hledat text"
 
-#: ../meld/meldapp.py:146
+#: ../meld/meldwindow.py:139
 msgid "Find Ne_xt"
 msgstr "_NajÃt nÃsledujÃcÃ"
 
-#: ../meld/meldapp.py:146
+#: ../meld/meldwindow.py:139
 msgid "Search forwards for the same text"
 msgstr "Hledat tentÃÅ text vpÅed"
 
-#: ../meld/meldapp.py:147
+#: ../meld/meldwindow.py:140
+#, fuzzy
+#| msgid "_Previous"
+msgid "Find _Previous"
+msgstr "_PÅedchozÃ"
+
+#: ../meld/meldwindow.py:140
+#, fuzzy
+#| msgid "Search forwards for the same text"
+msgid "Search backwards for the same text"
+msgstr "Hledat tentÃÅ text vpÅed"
+
+#: ../meld/meldwindow.py:141
 msgid "Find and replace text"
 msgstr "NajÃt a nahradit text"
 
-#: ../meld/meldapp.py:148
+#: ../meld/meldwindow.py:142
 msgid "Prefere_nces"
 msgstr "_PÅedvolby"
 
-#: ../meld/meldapp.py:148
+#: ../meld/meldwindow.py:142
 msgid "Configure the application"
 msgstr "Nastavit aplikaci"
 
-#: ../meld/meldapp.py:150
+#: ../meld/meldwindow.py:144
 msgid "_Changes"
 msgstr "_ZmÄny"
 
-#: ../meld/meldapp.py:151
+#: ../meld/meldwindow.py:145
 msgid "Next change"
 msgstr "NÃsledujÃcÃ zmÄna"
 
-#: ../meld/meldapp.py:151
+#: ../meld/meldwindow.py:145
 msgid "Go to the next change"
 msgstr "PÅejÃt na nÃsledujÃcÃ zmÄnu"
 
-#: ../meld/meldapp.py:152
+#: ../meld/meldwindow.py:146
 msgid "Previous change"
 msgstr "PÅedchozÃ zmÄna"
 
-#: ../meld/meldapp.py:152
+#: ../meld/meldwindow.py:146
 msgid "Go to the previous change"
 msgstr "PÅejÃt na pÅedchozÃ zmÄnu"
 
-#: ../meld/meldapp.py:154
+#: ../meld/meldwindow.py:148
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: ../meld/meldapp.py:155
+#: ../meld/meldwindow.py:149
 msgid "File status"
 msgstr "Stav souboru"
 
-#: ../meld/meldapp.py:156
+#: ../meld/meldwindow.py:150
 msgid "Version status"
 msgstr "Stav verze"
 
-#: ../meld/meldapp.py:157
+#: ../meld/meldwindow.py:151
 msgid "File filters"
 msgstr "Filtry souborÅ"
 
-#: ../meld/meldapp.py:158
+#: ../meld/meldwindow.py:152
 msgid "Stop the current action"
 msgstr "Zastavit aktuÃlnÃ Äinnost"
 
-#: ../meld/meldapp.py:159
+#: ../meld/meldwindow.py:153
 msgid "Refresh the view"
 msgstr "Obnovit zobrazenÃ"
 
-#: ../meld/meldapp.py:160
+#: ../meld/meldwindow.py:154
 msgid "Reload"
 msgstr "Znovu naÄÃst"
 
-#: ../meld/meldapp.py:160
+#: ../meld/meldwindow.py:154
 msgid "Reload the comparison"
 msgstr "Znovu naÄÃst porovnÃnÃ"
 
-#: ../meld/meldapp.py:162
+#: ../meld/meldwindow.py:156
+msgid "_Tabs"
+msgstr ""
+
+#: ../meld/meldwindow.py:157
+#, fuzzy
+#| msgid "_Previous"
+msgid "_Previous Tab"
+msgstr "_PÅedchozÃ"
+
+#: ../meld/meldwindow.py:157
+#, fuzzy
+#| msgid "Go to the previous change"
+msgid "Activate previous tab"
+msgstr "PÅejÃt na pÅedchozÃ zmÄnu"
+
+#: ../meld/meldwindow.py:158
+#, fuzzy
+#| msgid "_Next"
+msgid "_Next Tab"
+msgstr "_NÃsledujÃcÃ"
+
+#: ../meld/meldwindow.py:158
+msgid "Activate next tab"
+msgstr ""
+
+#: ../meld/meldwindow.py:159
+msgid "Move Tab _Left"
+msgstr ""
+
+#: ../meld/meldwindow.py:159
+#, fuzzy
+#| msgid "Push current change to the left"
+msgid "Move current tab to left"
+msgstr "ZatlaÄit aktuÃlnÃ zmÄnu doleva"
+
+#: ../meld/meldwindow.py:160
+#, fuzzy
+#| msgid "Copy _Right"
+msgid "Move Tab _Right"
+msgstr "KopÃ_rovat napravo"
+
+#: ../meld/meldwindow.py:160
+#, fuzzy
+#| msgid "Push current change to the right"
+msgid "Move current tab to right"
+msgstr "ZatlaÄit aktuÃlnÃ zmÄnu doprava"
+
+#: ../meld/meldwindow.py:162
 msgid "_Help"
 msgstr "_NÃpovÄda"
 
-#: ../meld/meldapp.py:163
+#: ../meld/meldwindow.py:163
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../meld/meldapp.py:163
+#: ../meld/meldwindow.py:163
 msgid "Open the Meld manual"
 msgstr "OtevÅÃt pÅÃruÄku aplikace Meld"
 
-#: ../meld/meldapp.py:164
+#: ../meld/meldwindow.py:164
 msgid "Report _Bug"
 msgstr "OhlÃsit _chybu"
 
-#: ../meld/meldapp.py:164
+#: ../meld/meldwindow.py:164
 msgid "Report a bug in Meld"
 msgstr "NahlÃsit chybu v aplikaci Meld"
 
-#: ../meld/meldapp.py:165
+#: ../meld/meldwindow.py:165
 msgid "About this program"
 msgstr "O tÃto aplikaci"
 
-#: ../meld/meldapp.py:168
+#: ../meld/meldwindow.py:168
 msgid "Full Screen"
 msgstr "CelÃ obrazovka"
 
-#: ../meld/meldapp.py:168
+#: ../meld/meldwindow.py:168
 msgid "View the comparison in full screen"
 msgstr "Zobrazit porovnÃnÃ pÅes celou obrazovku"
 
-#: ../meld/meldapp.py:169
+#: ../meld/meldwindow.py:169
 msgid "_Toolbar"
 msgstr "NÃstrojovÃ _liÅta"
 
-#: ../meld/meldapp.py:169
+#: ../meld/meldwindow.py:169
 msgid "Show or hide the toolbar"
 msgstr "Zobrazit nebo skrÃt nÃstrojovou liÅtu"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldwindow.py:170
 msgid "_Statusbar"
 msgstr "_StavovÃ liÅta"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldwindow.py:170
 msgid "Show or hide the statusbar"
 msgstr "Zobrazit nebo skrÃt stavovou liÅtu"
 
+#: ../meld/meldwindow.py:534
+msgid "Switch to this tab"
+msgstr ""
+
 #. exit at first non found directory + file
-#: ../meld/meldapp.py:544
+#: ../meld/meldwindow.py:625
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Nelze porovnÃvat kombinaci souborÅ a adresÃÅÅ.\n"
 
-#: ../meld/meldapp.py:599
-msgid "wrong number of arguments supplied to --diff"
-msgstr "poskytnut nesprÃvnÃ poÄet argumentÅ --diff"
-
-#: ../meld/meldapp.py:603
-msgid "Start with an empty window"
-msgstr "Spustit s prÃzdnÃm oknem"
-
-#: ../meld/meldapp.py:604 ../meld/meldapp.py:605 ../meld/meldapp.py:607
-msgid "file"
-msgstr "soubor"
-
-#: ../meld/meldapp.py:604 ../meld/meldapp.py:606 ../meld/meldapp.py:607
-msgid "dir"
-msgstr "adr"
-
-#: ../meld/meldapp.py:604
-msgid "Start a version control comparison"
-msgstr "Spustit novÃ porovnÃnÃ sprÃvy verzÃ"
-
-#: ../meld/meldapp.py:605
-msgid "Start a 2- or 3-way file comparison"
-msgstr "Spustit dvojcestnÃ nebo trojcestnÃ porovnÃnÃ souborÅ"
-
-#: ../meld/meldapp.py:606
-msgid "Start a 2- or 3-way directory comparison"
-msgstr "Spustit dvojcestnÃ nebo trojcestnÃ porovnÃnÃ adresÃÅÅ"
-
-#: ../meld/meldapp.py:607
-msgid "Start a comparison between file and dir/file"
-msgstr "Spustit porovnÃnÃ souboru a adresÃÅe/souboru"
-
-#: ../meld/meldapp.py:613
-msgid "Meld is a file and directory comparison tool."
-msgstr "Meld je nÃstroj porovnÃvajÃcÃ soubory a adresÃÅe."
-
-#: ../meld/meldapp.py:616
-msgid "Set label to use instead of file name"
-msgstr "Nastavit k pouÅitÃ popisek namÃsto nÃzvu souboru"
-
-#: ../meld/meldapp.py:618
-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:621
-msgid "Set the target file for saving a merge result"
-msgstr ""
-"Nastavte cÃlovÃ soubor, do kterÃho chcete uloÅit vÃsledek sluÄovÃnÃ slo"
-
-#: ../meld/meldapp.py:624
-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:627
-#, 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:51 ../meld/melddoc.py:52
-msgid "untitled"
-msgstr "nepojmenovanÃ"
-
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:192
+#: ../meld/misc.py:174
 msgid "[None]"
 msgstr "[ÅÃdnÃ]"
 
-#: ../meld/patchdialog.py:119
+#: ../meld/patchdialog.py:122
 msgid "Save Patch As..."
-msgstr "UloÅit zÃplatu jako..."
+msgstr "UloÅit zÃplatu jakoâ"
 
-#: ../meld/preferences.py:81
+#: ../meld/preferences.py:37
 msgid "label"
 msgstr "popisek"
 
-#: ../meld/preferences.py:81
+#: ../meld/preferences.py:37
 msgid "pattern"
 msgstr "vzorek"
 
-#: ../meld/preferences.py:142
+#: ../meld/preferences.py:105
 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:167 ../meld/preferences.py:172 ../meld/vcview.py:156
-msgid "Name"
-msgstr "NÃzev"
-
-#: ../meld/preferences.py:167 ../meld/preferences.py:172
-msgid "Active"
-msgstr "AktivnÃ"
-
-#: ../meld/preferences.py:167
-msgid "Pattern"
-msgstr "Vzorek"
-
-#: ../meld/preferences.py:172
-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:269
+#: ../meld/preferences.py:233
 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:271
+#: ../meld/preferences.py:235
 #, 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:273
+#: ../meld/preferences.py:237
 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:275
+#: ../meld/preferences.py:239
 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:277
+#: ../meld/preferences.py:241
 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:279
+#: ../meld/preferences.py:243
 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:281
+#: ../meld/preferences.py:245
 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:283
+#: ../meld/preferences.py:247
 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:285
+#: ../meld/preferences.py:249
 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:287
+#: ../meld/preferences.py:251
 msgid "Script comment\t0\t#.*"
 msgstr "KomentÃÅ skriptu\t0\t#.*"
 
@@ -1159,10 +1313,6 @@ msgid "Update"
 msgstr "Update"
 
 #: ../meld/vcview.py:122
-msgid "_Add"
-msgstr "_PÅidat"
-
-#: ../meld/vcview.py:122
 msgid "Add to VC"
 msgstr "PÅidat do sprÃvy verzÃ"
 
@@ -1175,10 +1325,6 @@ msgid "Add binary to VC"
 msgstr "PÅidat binÃrnÃ soubor do sprÃvy verzÃ"
 
 #: ../meld/vcview.py:124
-msgid "_Remove"
-msgstr "_Odstranit"
-
-#: ../meld/vcview.py:124
 msgid "Remove from VC"
 msgstr "Odstranit ze sprÃvy verzÃ"
 
@@ -1234,73 +1380,73 @@ msgstr "IgnorovanÃ"
 msgid "Show ignored files"
 msgstr "Zobrazovat ignorovanÃ soubory"
 
-#: ../meld/vcview.py:176 ../meld/vcview.py:300
+#: ../meld/vcview.py:177 ../meld/vcview.py:301
 msgid "Location"
 msgstr "UmÃstÄnÃ"
 
-#: ../meld/vcview.py:177
+#: ../meld/vcview.py:178
 msgid "Status"
 msgstr "Stav"
 
-#: ../meld/vcview.py:178
+#: ../meld/vcview.py:179
 msgid "Rev"
 msgstr "Rev"
 
-#: ../meld/vcview.py:180
+#: ../meld/vcview.py:181
 msgid "Options"
 msgstr "MoÅnosti"
 
-#: ../meld/vcview.py:232
+#: ../meld/vcview.py:233
 msgid "Choose one Version Control"
 msgstr "Vyberte jednu sprÃvu verzÃ"
 
-#: ../meld/vcview.py:233
+#: ../meld/vcview.py:234
 msgid "Only one Version Control in this directory"
 msgstr "V tomto adresÃÅi pouze jedna sprÃva verzÃ"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:246
+#: ../meld/vcview.py:247
 #, 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:250
+#: ../meld/vcview.py:251
 msgid "Invalid Repository"
 msgstr "NeplatnÃ ÃloÅiÅtÄ"
 
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:260
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:300
+#: ../meld/vcview.py:301
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:348
+#: ../meld/vcview.py:349
 msgid "(Empty)"
 msgstr "(PrÃzdnÃ)"
 
-#: ../meld/vcview.py:386
+#: ../meld/vcview.py:387
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] StahujÃ se rozdÃly"
 
-#: ../meld/vcview.py:394
+#: ../meld/vcview.py:395
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] PouÅitÃ zÃplaty"
 
-#: ../meld/vcview.py:479
+#: ../meld/vcview.py:480
 msgid "Select some files first."
 msgstr "NejdÅÃve je nutnÃ vybrat soubory."
 
-#: ../meld/vcview.py:552
+#: ../meld/vcview.py:553
 #, python-format
 msgid ""
 "\n"
@@ -1327,9 +1473,9 @@ msgid ""
 "                    "
 msgstr ""
 "\n"
-"                    SpuÅtÄnÃ \"patch\" se nezdaÅilo.\n"
+"                    SpuÅtÄnÃ âpatchâ se nezdaÅilo.\n"
 "                    \n"
-"                    MoÅnÃ nemÃte nainstalovÃn \"GNU patch\",\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"
@@ -1349,18 +1495,18 @@ msgstr ""
 "                    softwaru ke sprÃvÄ zdrojovÃch kÃdÅ.\n"
 "                    "
 
-#: ../meld/ui/findbar.py:120
+#: ../meld/ui/findbar.py:127
 #, python-format
 msgid ""
 "Regular expression error\n"
 "'%s'"
 msgstr ""
 "Chyba v regulÃrnÃm vÃrazu\n"
-"\"%s\""
+"â%sâ"
 
 #: ../meld/ui/historyentry.py:293
 msgid "_Browse..."
-msgstr "_ProchÃzet..."
+msgstr "_ProchÃzetâ"
 
 #: ../meld/ui/historyentry.py:301
 msgid "Path"
@@ -1401,71 +1547,5 @@ msgid ""
 "The error was '%s'"
 msgstr ""
 "Chyba pÅi pÅevodu na regulÃrnÃ vÃraz\n"
-"Vzorkem byl \"%s\"\n"
-"Chyba byla nÃsledujÃcÃ: \"%s\""
-
-#~ msgid "Left"
-#~ msgstr "LevÃ"
-
-#~ msgid "Right"
-#~ msgstr "PravÃ"
-
-#~ msgid "_Commit"
-#~ msgstr "_Commit"
-
-#~ 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"
+"Vzorkem byl â%sâ\n"
+"Chyba byla nÃsledujÃcÃ: â%sâ"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]