[meld] Updated Czech translation



commit 6a05fbcad2bc998df5b58e9ccfed28c3ede711ed
Author: Marek Äernockà <marek manet cz>
Date:   Sat Sep 1 18:49:16 2012 +0200

    Updated Czech translation

 po/cs.po |  443 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 242 insertions(+), 201 deletions(-)
---
diff --git a/po/cs.po b/po/cs.po
index ad04415..fdce753 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,14 +12,14 @@ msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-04-28 23:20+0000\n"
-"PO-Revision-Date: 2012-05-05 23:06+0200\n"
+"POT-Creation-Date: 2012-08-19 21:28+0000\n"
+"PO-Revision-Date: 2012-09-01 18:43+0200\n"
 "Last-Translator: Marek Äernockà <marek manet 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: Virtaal 0.6.1\n"
 
@@ -116,7 +116,7 @@ msgstr "_Zahodit zmÄny"
 msgid "_Save Selected"
 msgstr "_UloÅit vybranÃ"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:141
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:147
 msgid "_Replace"
 msgstr "Nahradi_t"
 
@@ -161,51 +161,81 @@ msgstr ""
 "Copyright &#xA9; 2009 â 2012 Kai Willadsen"
 
 #: ../data/ui/meldapp.ui.h:4
+msgid ""
+"Meld is free software: you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation, either version 2 of the License, or (at your option) any later "
+"version.\n"
+"\n"
+"Meld is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details. \n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program.  If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Aplikace Meld je svobodnà software: MÅÅete ji dÃle ÅÃÅit a/nebo upravovat za "
+"podmÃnek licence GNU General Public License v podobÄ, v jakà ji vydala Free "
+"Software Foundation, a to buÄ ve verzi 2 tÃto licence nebo (dle vaÅÃ volby) "
+"v libovolnà novÄjÅà verzi.\n"
+"\n"
+"Aplikace Meld je ÅÃÅena ve vÃÅe, Åe bude uÅiteÄnÃ, ale BEZ JAKÃCHKOLIV "
+"ZÃRUK, a to i bez pÅedpoklÃdanà zÃruky na PRODEJNOST nebo VHODNOST PRO "
+"KONKRÃTNà ÃÄEL. VÃce podrobnostà najdete pÅÃmo v licenci GNU General Public "
+"License.\n"
+"\n"
+"Spolu s aplikacà Almanah byste mÄli obdrÅet kopii licence GNU General Public "
+"License. Pokud se tak nestalo, podÃvejte se na <http://www.gnu.org/licenses/";
+">."
+
+#: ../data/ui/meldapp.ui.h:9
 msgid "translator-credits"
 msgstr ""
 "Miloslav TrmaÄ <mitr volny cz>\n"
-"Petr KovÃÅ <pknbe volny cz>"
+"Petr KovÃÅ <pknbe volny cz>\n"
+"Marek Äernockà <marek manet cz>"
 
-#: ../data/ui/meldapp.ui.h:5
+#: ../data/ui/meldapp.ui.h:10
 msgid "Choose Files"
 msgstr "Zvolte soubory"
 
-#: ../data/ui/meldapp.ui.h:6
+#: ../data/ui/meldapp.ui.h:11
 msgid "_Three Way Compare"
 msgstr "_Trojcestnà porovnÃvÃnÃ"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:8
+#: ../data/ui/meldapp.ui.h:13
 msgid "Mine"
 msgstr "Moje"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:10
+#: ../data/ui/meldapp.ui.h:15
 msgid "Original"
 msgstr "PÅvodnÃ"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:12
+#: ../data/ui/meldapp.ui.h:17
 msgid "Other"
 msgstr "JinÃ"
 
-#: ../data/ui/meldapp.ui.h:13
+#: ../data/ui/meldapp.ui.h:18
 msgid "_File Comparison"
 msgstr "PorovnÃvÃnà _souborÅ"
 
-#: ../data/ui/meldapp.ui.h:14
+#: ../data/ui/meldapp.ui.h:19
 msgid "_Directory Comparison"
 msgstr "PorovnÃvÃnà _sloÅek"
 
-#: ../data/ui/meldapp.ui.h:15
+#: ../data/ui/meldapp.ui.h:20
 msgid "Select VC Directory"
 msgstr "Vybrat sloÅku sprÃvy verzÃ"
 
-#: ../data/ui/meldapp.ui.h:16
+#: ../data/ui/meldapp.ui.h:21
 msgid "Directory"
 msgstr "SloÅka"
 
-#: ../data/ui/meldapp.ui.h:17
+#: ../data/ui/meldapp.ui.h:22
 msgid "_Version Control Browser"
 msgstr "_ProhlÃÅeÄ sprÃvy verzÃ"
 
@@ -368,118 +398,122 @@ msgstr "PÅedchozà zÃznamy"
 msgid "Log Message"
 msgstr "ZprÃva zÃznamu"
 
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
+#: ../meld/dirdiff.py:230 ../meld/vcview.py:127
 msgid "_Compare"
 msgstr "_Porovnat"
 
-#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
+#: ../meld/dirdiff.py:230 ../meld/vcview.py:127
 msgid "Compare selected"
 msgstr "Porovnat vybranÃ"
 
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:231
 msgid "Copy _Left"
 msgstr "KopÃrovat na_levo"
 
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:231
 msgid "Copy to left"
 msgstr "KopÃrovat doleva"
 
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:232
 msgid "Copy _Right"
 msgstr "KopÃ_rovat napravo"
 
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:232
 msgid "Copy to right"
 msgstr "KopÃrovat doprava"
 
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:233
 msgid "Delete selected"
 msgstr "Odstranit vybranÃ"
 
-#: ../meld/dirdiff.py:236 ../meld/filediff.py:1167
+#: ../meld/dirdiff.py:234 ../meld/filediff.py:1079
 msgid "Hide"
 msgstr "SkrÃt"
 
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:234
 msgid "Hide selected"
 msgstr "SkrÃt vybranÃ"
 
-#: ../meld/dirdiff.py:240
-msgid "Case"
-msgstr "Velikost pÃsmen"
+#: ../meld/dirdiff.py:238
+msgid "Ignore filename case"
+msgstr "Ignorovat velikost pÃsmen v nÃzvu souboru"
 
-#: ../meld/dirdiff.py:240
-msgid "Ignore case of entries"
-msgstr "Ignorovat velikost pÃsmen"
+#: ../meld/dirdiff.py:238
+msgid ""
+"Consider differently-cased filenames that are otherwise-identical to be the "
+"same"
+msgstr ""
+"PovaÅovat nÃzvy souborÅ, kterà se odliÅujà velikostà pÃsmen, ale jinak jsou "
+"stejnÃ, za shodnÃ"
 
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:239
 msgid "Same"
 msgstr "StejnÃ"
 
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:239
 msgid "Show identical"
 msgstr "Zobrazovat stejnÃ"
 
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:240
 msgid "New"
 msgstr "NovÃ"
 
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:240
 msgid "Show new"
 msgstr "Zobrazovat novÃ"
 
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:241
 msgid "Modified"
 msgstr "ZmÄnÄnÃ"
 
-#: ../meld/dirdiff.py:243 ../meld/vcview.py:140
+#: ../meld/dirdiff.py:241 ../meld/vcview.py:140
 msgid "Show modified"
 msgstr "Zobrazovat zmÄnÄnÃ"
 
-#: ../meld/dirdiff.py:245
+#: ../meld/dirdiff.py:243
 msgid "Filters"
 msgstr "Filtry"
 
-#: ../meld/dirdiff.py:245
+#: ../meld/dirdiff.py:243
 msgid "Set active filters"
 msgstr "Nastavte aktivnà filtry"
 
-#: ../meld/dirdiff.py:362
+#: ../meld/dirdiff.py:360
 #, python-format
 msgid "Hide %s"
 msgstr "SkrÃt %s"
 
-#: ../meld/dirdiff.py:466 ../meld/dirdiff.py:479 ../meld/vcview.py:323
+#: ../meld/dirdiff.py:464 ../meld/dirdiff.py:477 ../meld/vcview.py:323
 #: ../meld/vcview.py:347
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] ProchÃzà se %s"
 
-#: ../meld/dirdiff.py:578
+#: ../meld/dirdiff.py:576
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Hotovo"
 
-#: ../meld/dirdiff.py:582
+#: ../meld/dirdiff.py:580
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "PÅi skenovÃnà tÃto sloÅky doÅlo k nÄkolika chybÃm"
 
-#: ../meld/dirdiff.py:583
+#: ../meld/dirdiff.py:581
 msgid "Files with invalid encodings found"
 msgstr "Nalezeny soubory s neplatnÃm kÃdovÃnÃm"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:585
+#: ../meld/dirdiff.py:583
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "NÄkterà soubory mÄly neplatnà kÃdovÃnÃ. NÃzvy jsou pÅibliÅnÄ nÃsledujÃcÃ:"
 
-#: ../meld/dirdiff.py:587
+#: ../meld/dirdiff.py:585
 msgid "Files hidden by case insensitive comparison"
 msgstr "Soubory skryty porovnÃnÃm nerozliÅujÃcÃm velikost pÃsmen"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:589
+#: ../meld/dirdiff.py:587
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -487,16 +521,16 @@ 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 v tÃto sloÅce jsou skrytÃ:"
 
-#: ../meld/dirdiff.py:600
+#: ../meld/dirdiff.py:598
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "â%sâ skryto v â%sâ"
 
-#: ../meld/dirdiff.py:625 ../meld/filediff.py:1010 ../meld/filediff.py:1171
+#: ../meld/dirdiff.py:623 ../meld/filediff.py:921 ../meld/filediff.py:1083
 msgid "Hi_de"
 msgstr "_SkrÃt"
 
-#: ../meld/dirdiff.py:675
+#: ../meld/dirdiff.py:673
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -505,7 +539,7 @@ msgstr ""
 "â%sâ existuje.\n"
 "PÅepsat?"
 
-#: ../meld/dirdiff.py:682
+#: ../meld/dirdiff.py:680
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -516,7 +550,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:700 ../meld/vcview.py:536
+#: ../meld/dirdiff.py:698 ../meld/vcview.py:536
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -525,7 +559,7 @@ msgstr ""
 "â%sâ je sloÅkou.\n"
 "Odstranit rekurzivnÄ?"
 
-#: ../meld/dirdiff.py:707 ../meld/vcview.py:541
+#: ../meld/dirdiff.py:705 ../meld/vcview.py:541
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -536,7 +570,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:741
+#: ../meld/dirdiff.py:788
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -544,7 +578,7 @@ msgstr[0] "%i sekunda"
 msgstr[1] "%i sekundy"
 msgstr[2] "%i sekund"
 
-#: ../meld/dirdiff.py:742
+#: ../meld/dirdiff.py:789
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -552,7 +586,7 @@ msgstr[0] "%i minuta"
 msgstr[1] "%i minuty"
 msgstr[2] "%i minut"
 
-#: ../meld/dirdiff.py:743
+#: ../meld/dirdiff.py:790
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -560,7 +594,7 @@ msgstr[0] "%i hodina"
 msgstr[1] "%i hodiny"
 msgstr[2] "%i hodin"
 
-#: ../meld/dirdiff.py:744
+#: ../meld/dirdiff.py:791
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -568,7 +602,7 @@ msgstr[0] "%i den"
 msgstr[1] "%i dny"
 msgstr[2] "%i dnÅ"
 
-#: ../meld/dirdiff.py:745
+#: ../meld/dirdiff.py:792
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -576,7 +610,7 @@ msgstr[0] "%i tÃden"
 msgstr[1] "%i tÃdny"
 msgstr[2] "%i tÃdnÅ"
 
-#: ../meld/dirdiff.py:746
+#: ../meld/dirdiff.py:793
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -584,7 +618,7 @@ msgstr[0] "%i mÄsÃc"
 msgstr[1] "%i mÄsÃce"
 msgstr[2] "%i mÄsÃcÅ"
 
-#: ../meld/dirdiff.py:747
+#: ../meld/dirdiff.py:794
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -592,159 +626,159 @@ msgstr[0] "%i rok"
 msgstr[1] "%i roky"
 msgstr[2] "%i let"
 
-#: ../meld/filediff.py:295
+#: ../meld/filediff.py:204
 msgid "Format as patch..."
 msgstr "FormÃtovat jako zÃplatuâ"
 
-#: ../meld/filediff.py:295
+#: ../meld/filediff.py:204
 msgid "Create a patch using differences between files"
 msgstr "VytvoÅit zÃplatu pouÅitÃm rozdÃlÅ mezi soubory"
 
-#: ../meld/filediff.py:296
+#: ../meld/filediff.py:205
 msgid "Previous conflict"
 msgstr "PÅedchozà konflikt"
 
-#: ../meld/filediff.py:296
+#: ../meld/filediff.py:205
 msgid "Go to the previous conflict"
 msgstr "PÅejÃt na pÅedchozà konflikt"
 
-#: ../meld/filediff.py:297
+#: ../meld/filediff.py:206
 msgid "Next conflict"
 msgstr "NÃsledujÃcà konflikt"
 
-#: ../meld/filediff.py:297
+#: ../meld/filediff.py:206
 msgid "Go to the next conflict"
 msgstr "PÅejÃt na nÃsledujÃcà konflikt"
 
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:207
 msgid "Push to left"
 msgstr "ZatlaÄit doleva"
 
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:207
 msgid "Push current change to the left"
 msgstr "ZatlaÄit aktuÃlnà zmÄnu doleva"
 
-#: ../meld/filediff.py:299
+#: ../meld/filediff.py:208
 msgid "Push to right"
 msgstr "ZatlaÄit doprava"
 
-#: ../meld/filediff.py:299
+#: ../meld/filediff.py:208
 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:301
+#: ../meld/filediff.py:210
 msgid "Pull from left"
 msgstr "VytÃhnout zleva"
 
-#: ../meld/filediff.py:301
+#: ../meld/filediff.py:210
 msgid "Pull change from the left"
 msgstr "VytÃhnout zmÄnu zleva"
 
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:211
 msgid "Pull from right"
 msgstr "VytÃhnout zprava"
 
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:211
 msgid "Pull change from the right"
 msgstr "VytÃhnout zmÄnu zprava"
 
-#: ../meld/filediff.py:303
+#: ../meld/filediff.py:212
 msgid "Copy above left"
 msgstr "KopÃrovat z levà vrchnà ÄÃsti"
 
-#: ../meld/filediff.py:303
+#: ../meld/filediff.py:212
 msgid "Copy change above the left chunk"
 msgstr "KopÃrovat zmÄnu nad levÃm blokem"
 
-#: ../meld/filediff.py:304
+#: ../meld/filediff.py:213
 msgid "Copy below left"
 msgstr "KopÃrovat z levà spodnà ÄÃsti"
 
-#: ../meld/filediff.py:304
+#: ../meld/filediff.py:213
 msgid "Copy change below the left chunk"
 msgstr "KopÃrovat zmÄnu pod levÃm blokem"
 
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:214
 msgid "Copy above right"
 msgstr "KopÃrovat z pravà vrchnà ÄÃsti"
 
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:214
 msgid "Copy change above the right chunk"
 msgstr "KopÃrovat zmÄnu nad pravÃm blokem"
 
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:215
 msgid "Copy below right"
 msgstr "KopÃrovat z pravà spodnà ÄÃsti"
 
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:215
 msgid "Copy change below the right chunk"
 msgstr "KopÃrovat zmÄnu pod pravÃm blokem"
 
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:216
 msgid "Delete"
 msgstr "Smazat"
 
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:216
 msgid "Delete change"
 msgstr "Smazat zmÄnu"
 
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:217
 msgid "Merge all changes from left"
 msgstr "SlouÄit veÅkerà zmÄny zleva"
 
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:217
 msgid "Merge all non-conflicting changes from the left"
 msgstr "SlouÄit veÅkerà zmÄny bez konfliktÅ zleva"
 
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:218
 msgid "Merge all changes from right"
 msgstr "SlouÄit veÅkerà zmÄny zprava"
 
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:218
 msgid "Merge all non-conflicting changes from the right"
 msgstr "SlouÄit veÅkerà zmÄny bez konfliktÅ zprava"
 
-#: ../meld/filediff.py:310
+#: ../meld/filediff.py:219
 msgid "Merge all non-conflicting"
 msgstr "SlouÄit vÅe bez konfliktÅ"
 
-#: ../meld/filediff.py:310
+#: ../meld/filediff.py:219
 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:311
+#: ../meld/filediff.py:220
 msgid "Cycle through documents"
 msgstr "StÅÃdat dokumenty"
 
-#: ../meld/filediff.py:311
+#: ../meld/filediff.py:220
 msgid "Move keyboard focus to the next document in this comparison"
 msgstr "PÅepnout se s klÃvesnicà na dalÅà dokument v tomto porovnÃnÃ"
 
-#: ../meld/filediff.py:315
+#: ../meld/filediff.py:224
 msgid "Lock scrolling"
 msgstr "Uzamknout posouvÃnÃ"
 
-#: ../meld/filediff.py:316
+#: ../meld/filediff.py:225
 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:396
+#: ../meld/filediff.py:305
 msgid "INS"
 msgstr "VKL"
 
-#: ../meld/filediff.py:396
+#: ../meld/filediff.py:305
 msgid "OVR"
 msgstr "PÅE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:398
+#: ../meld/filediff.py:307
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "ÅÃd %i, sl %i"
 
-#: ../meld/filediff.py:722
+#: ../meld/filediff.py:631
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -753,47 +787,42 @@ msgstr ""
 "Filtr â%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:809
-msgid "<unnamed>"
-msgstr "<bez nÃzvu>"
-
-#: ../meld/filediff.py:998
+#: ../meld/filediff.py:909
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Nastaven poÄet panelÅ"
 
-#: ../meld/filediff.py:1004
+#: ../meld/filediff.py:915
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] OtevÃrajà se soubory"
 
-#: ../meld/filediff.py:1028 ../meld/filediff.py:1037 ../meld/filediff.py:1049
-#: ../meld/filediff.py:1055
+#: ../meld/filediff.py:939 ../meld/filediff.py:948 ../meld/filediff.py:960
+#: ../meld/filediff.py:966
 msgid "Could not read file"
 msgstr "Nelze pÅeÄÃst soubor"
 
-#: ../meld/filediff.py:1029
+#: ../meld/filediff.py:940
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Ätou se soubory"
 
-#: ../meld/filediff.py:1038
+#: ../meld/filediff.py:949
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je zÅejmÄ binÃrnÃm souborem."
 
-#: ../meld/filediff.py:1050
+#: ../meld/filediff.py:961
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s nenà v kÃdovÃnÃch: %s"
 
-#: ../meld/filediff.py:1080 ../meld/filemerge.py:67
+#: ../meld/filediff.py:992 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] PoÄÃtajà se rozdÃly"
 
-#: ../meld/filediff.py:1158
+#: ../meld/filediff.py:1070
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -801,15 +830,15 @@ msgstr ""
 "Jsou pouÅÃvÃny textovà filtry a mÅÅe dojÃt k zamaskovÃnà rozdÃlÅ mezi "
 "soubory. Chcete porovnat nefiltrovanà soubory?"
 
-#: ../meld/filediff.py:1164
+#: ../meld/filediff.py:1076
 msgid "Files are identical"
 msgstr "Soubory jsou stejnÃ"
 
-#: ../meld/filediff.py:1174
+#: ../meld/filediff.py:1086
 msgid "Show without filters"
 msgstr "Zobrazit bez filtrÅ"
 
-#: ../meld/filediff.py:1363
+#: ../meld/filediff.py:1275
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -818,7 +847,7 @@ msgstr ""
 "â%sâ existuje!\n"
 "PÅepsat?"
 
-#: ../meld/filediff.py:1376
+#: ../meld/filediff.py:1288
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -829,12 +858,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1385
+#: ../meld/filediff.py:1297
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Zvolte nÃzev vyrovnÃvacà pamÄti %i."
 
-#: ../meld/filediff.py:1400
+#: ../meld/filediff.py:1312
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -845,7 +874,7 @@ msgstr ""
 "\n"
 "Jakà formÃt chcete pouÅÃvat?"
 
-#: ../meld/filediff.py:1416
+#: ../meld/filediff.py:1328
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -854,7 +883,7 @@ msgstr ""
 "â%sâ obsahuje znaky, kterà nelze kÃdovat v â%sâ\n"
 "Chcete uloÅit jako UTF-8?"
 
-#: ../meld/filediff.py:1475
+#: ../meld/filediff.py:1385
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -913,265 +942,277 @@ msgid "Set label to use instead of file name"
 msgstr "Nastavit k pouÅità popisek namÃsto nÃzvu souboru"
 
 #: ../meld/meldapp.py:171
+msgid "Open a new tab in an already running instance"
+msgstr "OtevÅÃt novou kartu v jiÅ bÄÅÃcà instanci"
+
+#: ../meld/meldapp.py:173
 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:173
+#: ../meld/meldapp.py:175
 msgid "Ignored for compatibility"
 msgstr "IgnorovÃno z dÅvodu kompatibility"
 
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:178
 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"
+msgstr "Nastavit cÃlovà soubor, do kterÃho se mà uloÅit vÃsledek sluÄovÃnÃ"
 
-#: ../meld/meldapp.py:179
+#: ../meld/meldapp.py:181
 msgid "Creates a diff tab for up to 3 supplied files or directories."
-msgstr "VytvoÅà kartu s rozdÃlem aÅ pro tÅi zadanà soubory nebo sloÅky."
+msgstr "VytvoÅit kartu s rozdÃlem aÅ pro tÅi zadanà soubory nebo sloÅky."
 
-#: ../meld/meldapp.py:182
+#: ../meld/meldapp.py:184
 #, 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:184 ../meld/meldapp.py:188
+#: ../meld/meldapp.py:186 ../meld/meldapp.py:199
 msgid "can't compare more than three directories"
 msgstr "nelze porovnÃvat vÃce jak tÅi sloÅky"
 
-#: ../meld/melddoc.py:56 ../meld/melddoc.py:57
+#: ../meld/meldapp.py:192
+msgid "D-Bus error; comparisons will open in a new window."
+msgstr "Chyba sbÄrnice D-Bus; porovnÃnà bude otevÅeno v novÃm oknÄ."
+
+#. TRANSLATORS: This is the label of a new, currently-unnamed file.
+#: ../meld/meldbuffer.py:83
+msgid "<unnamed>"
+msgstr "<bez nÃzvu>"
+
+#: ../meld/melddoc.py:57 ../meld/melddoc.py:58
 msgid "untitled"
 msgstr "nepojmenovanÃ"
 
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:131
 msgid "_File"
 msgstr "_Soubor"
 
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:132
 msgid "_New..."
 msgstr "_NovÃâ"
 
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:132
 msgid "Start a new comparison"
 msgstr "Spustit novà porovnÃnÃ"
 
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:133
 msgid "Save the current file"
 msgstr "UloÅit aktuÃlnà soubor"
 
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:135
 msgid "Close the current file"
 msgstr "ZavÅÃt aktuÃlnà soubor"
 
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:136
 msgid "Quit the program"
 msgstr "UkonÄit program"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:138
 msgid "_Edit"
 msgstr "_Upravit"
 
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:139
 msgid "Undo the last action"
 msgstr "VrÃtit zpÄt poslednà Äinnost"
 
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:140
 msgid "Redo the last undone action"
 msgstr "Zopakovat poslednà Äinnost vrÃcenou zpÄt"
 
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:141
 msgid "Cut the selection"
 msgstr "Vyjmout vÃbÄr"
 
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:142
 msgid "Copy the selection"
 msgstr "KopÃrovat vÃbÄr"
 
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:143
 msgid "Paste the clipboard"
 msgstr "VloÅit obsah schrÃnky"
 
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:144
 msgid "Search for text"
 msgstr "Hledat text"
 
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:145
 msgid "Find Ne_xt"
 msgstr "_NajÃt nÃsledujÃcÃ"
 
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:145
 msgid "Search forwards for the same text"
 msgstr "Hledat tentÃÅ text vpÅed"
 
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:146
 msgid "Find _Previous"
 msgstr "NalÃzt _pÅedchozÃ"
 
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:146
 msgid "Search backwards for the same text"
 msgstr "Hledat nazpÄt tentÃÅ text"
 
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:147
 msgid "Find and replace text"
 msgstr "NajÃt a nahradit text"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:148
 msgid "Prefere_nces"
 msgstr "_PÅedvolby"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:148
 msgid "Configure the application"
 msgstr "Nastavit aplikaci"
 
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:150
 msgid "_Changes"
 msgstr "_ZmÄny"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:151
 msgid "Next change"
 msgstr "NÃsledujÃcà zmÄna"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:151
 msgid "Go to the next change"
 msgstr "PÅejÃt na nÃsledujÃcà zmÄnu"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:152
 msgid "Previous change"
 msgstr "PÅedchozà zmÄna"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:152
 msgid "Go to the previous change"
 msgstr "PÅejÃt na pÅedchozà zmÄnu"
 
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:153
 msgid "Open externally"
 msgstr "OtevÅÃt externÄ"
 
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:153
 msgid "Open selected file or directory in the default external application"
 msgstr "OtevÅÃt vybranà soubor nebo sloÅku ve vÃchozà externà aplikaci"
 
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:155
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:156
 msgid "File status"
 msgstr "Stav souboru"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:157
 msgid "Version status"
 msgstr "Stav verze"
 
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:158
 msgid "File filters"
 msgstr "Filtry souborÅ"
 
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:159
 msgid "Stop the current action"
 msgstr "Zastavit aktuÃlnà Äinnost"
 
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:160
 msgid "Refresh the view"
 msgstr "Obnovit zobrazenÃ"
 
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:161
 msgid "Reload"
 msgstr "Znovu naÄÃst"
 
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:161
 msgid "Reload the comparison"
 msgstr "Znovu naÄÃst porovnÃnÃ"
 
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:163
 msgid "_Tabs"
 msgstr "Kar_ty"
 
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:164
 msgid "_Previous Tab"
 msgstr "_PÅedchozà karta"
 
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:164
 msgid "Activate previous tab"
 msgstr "PÅejÃt na pÅedchozà kartu"
 
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:165
 msgid "_Next Tab"
 msgstr "_NÃsledujÃcà karta"
 
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:165
 msgid "Activate next tab"
 msgstr "Aktivovat nÃsledujÃcà kartu"
 
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:166
 msgid "Move Tab _Left"
 msgstr "PÅesunout kartu do_leva"
 
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:166
 msgid "Move current tab to left"
 msgstr "PÅesunout aktuÃlnà kartu doleva"
 
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:167
 msgid "Move Tab _Right"
 msgstr "PÅesunout kartu dop_rava"
 
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:167
 msgid "Move current tab to right"
 msgstr "PÅesunout aktuÃlnà kartu doprava"
 
-#: ../meld/meldwindow.py:163
+#: ../meld/meldwindow.py:169
 msgid "_Help"
 msgstr "_NÃpovÄda"
 
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:170
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:170
 msgid "Open the Meld manual"
 msgstr "OtevÅÃt pÅÃruÄku aplikace Meld"
 
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:171
 msgid "Report _Bug"
 msgstr "OhlÃsit _chybu"
 
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:171
 msgid "Report a bug in Meld"
 msgstr "NahlÃsit chybu v aplikaci Meld"
 
-#: ../meld/meldwindow.py:166
+#: ../meld/meldwindow.py:172
 msgid "About this program"
 msgstr "O tÃto aplikaci"
 
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:175
 msgid "Full Screen"
 msgstr "Celà obrazovka"
 
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:175
 msgid "View the comparison in full screen"
 msgstr "Zobrazit porovnÃnà pÅes celou obrazovku"
 
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:176
 msgid "_Toolbar"
 msgstr "NÃstrojovà _liÅta"
 
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:176
 msgid "Show or hide the toolbar"
 msgstr "Zobrazit nebo skrÃt nÃstrojovou liÅtu"
 
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:177
 msgid "_Statusbar"
 msgstr "_Stavovà liÅta"
 
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:177
 msgid "Show or hide the statusbar"
 msgstr "Zobrazit nebo skrÃt stavovou liÅtu"
 
-#: ../meld/meldwindow.py:541
+#: ../meld/meldwindow.py:563
 msgid "Switch to this tab"
 msgstr "PÅepnout na tuto kartu"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:639
+#: ../meld/meldwindow.py:664
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Nelze porovnÃvat kombinaci souborÅ a sloÅek.\n"
 
@@ -1197,12 +1238,12 @@ msgid "Only available if you have gnome-python-desktop installed"
 msgstr "K dispozici jen pokud je nainstalovÃn gnome-python-desktop"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:234
+#: ../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:236
+#: ../meld/preferences.py:235
 msgid ""
 "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
 "Desktop.ini\n"
@@ -1211,48 +1252,48 @@ msgstr ""
 "Desktop.ini\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:238
+#: ../meld/preferences.py:237
 #, 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:240
-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"
+#: ../meld/preferences.py:239
+msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
+msgstr "BinÃrnà soubory\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:242
-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}"
+#: ../meld/preferences.py:241
+msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
+msgstr "MultimÃdia\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:244
+#: ../meld/preferences.py:243
 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:246
+#: ../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:248
+#: ../meld/preferences.py:247
 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:250
+#: ../meld/preferences.py:249
 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:252
+#: ../meld/preferences.py:251
 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:254
+#: ../meld/preferences.py:253
 msgid "Script comment\t0\t#.*"
 msgstr "KomentÃÅ skriptu\t0\t#.*"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]