[meld] Updated Czech translation
- From: Marek Äernockà <mcernocky src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Updated Czech translation
- Date: Wed, 23 Jan 2013 06:57:57 +0000 (UTC)
commit abb3d950731469e513a217a25d2ff56c99d734e3
Author: Marek Äernockà <marek manet cz>
Date: Wed Jan 23 07:57:49 2013 +0100
Updated Czech translation
po/cs.po | 798 ++++++++++++++++++++++++++++++++++----------------------------
1 files changed, 439 insertions(+), 359 deletions(-)
---
diff --git a/po/cs.po b/po/cs.po
index 0be5ad6..2daa6fc 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,29 +5,29 @@
#
# Miloslav Trmac <mitr volny cz>, 2003, 2004, 2005.
# Petr Kovar <pknbe volny cz>, 2008, 2009, 2010, 2011.
-# Marek Äernockà <marek manet cz>>, 2011, 2012.
+# Marek Äernockà <marek manet cz>, 2011, 2012, 2013.
#
msgid ""
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-11-05 19:37+0000\n"
-"PO-Revision-Date: 2012-11-06 12:04+0200\n"
-"Last-Translator: Marek Äernockà <marek manet cz>>\n"
-"Language-Team: Czech <gnome-cs-list gnome org>\n"
+"POT-Creation-Date: 2013-01-12 17:30+0000\n"
+"PO-Revision-Date: 2013-01-22 22:11+0100\n"
+"Last-Translator: Marek Äernockà <marek manet cz>\n"
+"Language-Team: ÄeÅtina <gnome-cs-list gnome org>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Virtaal 0.6.1\n"
+"X-Generator: Gtranslator 2.91.6\n"
-#: ../bin/meld:103
+#: ../bin/meld:113
msgid "Cannot import: "
msgstr "Nelze importovat: "
-#: ../bin/meld:106
+#: ../bin/meld:116
#, c-format
msgid "Meld requires %s or higher."
msgstr "Meld vyÅaduje %s nebo vyÅÅÃ."
@@ -56,67 +56,83 @@ msgstr "Upravitelnà seznam"
msgid "Active"
msgstr "AktivnÃ"
-#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:164
-msgid "Name"
-msgstr "NÃzev"
-
-#: ../data/ui/EditableList.ui.h:4
-msgid "Pattern"
-msgstr "Vzorek"
+#: ../data/ui/EditableList.ui.h:3
+#| msgid "<unnamed>"
+msgid "Column name"
+msgstr "NÃzev sloupce"
-#: ../data/ui/EditableList.ui.h:5
-msgid "Add new filter"
-msgstr "PÅidat novà filtr"
-
-#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:128
+#: ../data/ui/EditableList.ui.h:4 ../meld/vcview.py:163
msgid "_Add"
msgstr "_PÅidat"
-#: ../data/ui/EditableList.ui.h:7
-msgid "Remove selected filter"
-msgstr "Odstranit vybranà filtr"
-
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:129
+#: ../data/ui/EditableList.ui.h:5 ../meld/vcview.py:164
msgid "_Remove"
msgstr "_Odstranit"
-#: ../data/ui/EditableList.ui.h:9
+#: ../data/ui/EditableList.ui.h:6
msgid "Move item up"
msgstr "PÅesunout poloÅku nahoru"
-#: ../data/ui/EditableList.ui.h:10
+#: ../data/ui/EditableList.ui.h:7
msgid "Move _Up"
msgstr "PÅes_unout nahoru"
-#: ../data/ui/EditableList.ui.h:11
+#: ../data/ui/EditableList.ui.h:8
msgid "Move item down"
msgstr "PÅesunout poloÅku dolÅ"
-#: ../data/ui/EditableList.ui.h:12
+#: ../data/ui/EditableList.ui.h:9
msgid "Move _Down"
msgstr "PÅesunout _dolÅ"
+#. Create icon and filename CellRenderer
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:300
+#: ../meld/vcview.py:200
+msgid "Name"
+msgstr "NÃzev"
+
+#: ../data/ui/EditableList.ui.h:11
+msgid "Pattern"
+msgstr "Vzorek"
+
+#: ../data/ui/EditableList.ui.h:12
+msgid "Add new filter"
+msgstr "PÅidat novà filtr"
+
+#: ../data/ui/EditableList.ui.h:13
+msgid "Remove selected filter"
+msgstr "Odstranit vybranà filtr"
+
#: ../data/ui/filediff.ui.h:1
-msgid "Save modified files?"
-msgstr "UloÅit zmÄnÄnà soubory?"
+msgid "Save changes to documents before closing?"
+msgstr "UloÅit zmÄny, neÅ dokument zavÅete?"
#: ../data/ui/filediff.ui.h:2
-msgid ""
-"Some files have been modified.\n"
-"Which ones would you like to save?"
-msgstr ""
-"NÄkterà soubory byly zmÄnÄny.\n"
-"Kterà z nich chcete uloÅit?"
+msgid "If you don't save, changes will be permanently lost."
+msgstr "Pokud se zmÄny neuloÅÃ, budou trvale ztraceny."
+
+#: ../data/ui/filediff.ui.h:3
+msgid "Close _without saving"
+msgstr "ZavÅÃt _bez uloÅenÃ"
#: ../data/ui/filediff.ui.h:4
-msgid "_Discard Changes"
-msgstr "_Zahodit zmÄny"
+msgid "_Cancel"
+msgstr "_ZruÅit"
#: ../data/ui/filediff.ui.h:5
-msgid "_Save Selected"
-msgstr "_UloÅit vybranÃ"
+msgid "_Save"
+msgstr "_UloÅit"
+
+#: ../data/ui/filediff.ui.h:6
+msgid ""
+"This file can not be written to. You may click here to unlock this file and "
+"make changes anyway, but these changes must be saved to a new file."
+msgstr ""
+"Do tohoto souboru nelze zapisovat. KliknutÃm zde mÅÅete tento soubor "
+"odemknout a zmÄny v nÄm provÃst, ale tyto zmÄny budou muset bÃt uloÅeny v "
+"novÃm souboru."
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:126
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:78
msgid "_Replace"
msgstr "Nahradi_t"
@@ -200,49 +216,6 @@ msgstr ""
"Petr KovÃÅ <pknbe volny cz>\n"
"Marek Äernockà <marek manet cz>"
-#: ../data/ui/meldapp.ui.h:10
-msgid "Choose Files"
-msgstr "Zvolte soubory"
-
-#: ../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:13
-msgid "Mine"
-msgstr "Moje"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:15
-msgid "Original"
-msgstr "PÅvodnÃ"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:17
-msgid "Other"
-msgstr "JinÃ"
-
-#: ../data/ui/meldapp.ui.h:18
-msgid "_File Comparison"
-msgstr "PorovnÃvÃnà _souborÅ"
-
-#: ../data/ui/meldapp.ui.h:19
-msgid "_Directory Comparison"
-msgstr "PorovnÃvÃnà _sloÅek"
-
-#: ../data/ui/meldapp.ui.h:20
-msgid "Select VC Directory"
-msgstr "Vybrat sloÅku sprÃvy verzÃ"
-
-#: ../data/ui/meldapp.ui.h:21
-msgid "Directory"
-msgstr "SloÅka"
-
-#: ../data/ui/meldapp.ui.h:22
-msgid "_Version Control Browser"
-msgstr "_ProhlÃÅeÄ sprÃvy verzÃ"
-
#: ../data/ui/patch-dialog.ui.h:1
msgid "Create Patch"
msgstr "VytvoÅit zÃplatu"
@@ -336,6 +309,24 @@ msgid "Editor"
msgstr "Editor"
#: ../data/ui/preferences.ui.h:17
+#| msgid "Ignore symbolic links"
+msgid "Symbolic links"
+msgstr "Symbolickà odkazy"
+
+#: ../data/ui/preferences.ui.h:18
+msgid "Ignore symbolic links"
+msgstr "Ignorovat symbolickà odkazy"
+
+#: ../data/ui/preferences.ui.h:19
+msgid "Visible columns"
+msgstr "Viditelnà sloupce"
+
+#: ../data/ui/preferences.ui.h:20
+#| msgid "_File Comparison"
+msgid "Folder comparisons"
+msgstr "PorovnÃvÃnà sloÅek"
+
+#: ../data/ui/preferences.ui.h:21
msgid ""
"When performing directory comparisons, you may filter out files and "
"directories by name. Each pattern is a list of shell style wildcards "
@@ -345,15 +336,11 @@ msgstr ""
"KaÅdà vzorek je seznamem zÃstupnÃch znakÅ ve stylu shellu oddÄlovanà "
"mezerami."
-#: ../data/ui/preferences.ui.h:18
-msgid "Ignore symbolic links"
-msgstr "Ignorovat symbolickà odkazy"
-
-#: ../data/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:22
msgid "File Filters"
msgstr "Filtry souborÅ"
-#: ../data/ui/preferences.ui.h:20
+#: ../data/ui/preferences.ui.h:23
msgid ""
"When performing file comparisons, you may ignore certain types of changes. "
"Each pattern here is a python regular expression which replaces matching "
@@ -366,26 +353,96 @@ msgstr ""
"pÅed provedenÃm porovnÃnÃ. Pokud vÃraz obsahuje skupiny, jsou nahrazeny jen "
"skupiny. VÃce podrobnostà viz pÅÃruÄka uÅivatele."
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:24
msgid "Ignore changes which insert or delete blank lines"
msgstr "Ignorovat zmÄny, kterà pÅidÃvajà nebo odstraÅujà prÃzdnà ÅÃdky"
-#: ../data/ui/preferences.ui.h:22
+#: ../data/ui/preferences.ui.h:25
msgid "Text Filters"
msgstr "Filtry textu"
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:26
msgid "Loading"
msgstr "NaÄÃtÃnÃ"
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:27
msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
msgstr "PÅi naÄÃtÃnà zkusit postupnÄ tyto kodeky (napÅ. utf8, iso8859)"
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:28
msgid "Encoding"
msgstr "KÃdovÃnÃ"
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:599
+#| msgid "_File Comparison"
+msgid "New comparison"
+msgstr "Novà porovnÃnÃ"
+
+#: ../data/ui/tab-placeholder.ui.h:2
+#| msgid "_File Comparison"
+msgid "File comparison"
+msgstr "PorovnÃvÃnà souborÅ"
+
+#: ../data/ui/tab-placeholder.ui.h:3
+#| msgid "_Directory Comparison"
+msgid "Directory comparison"
+msgstr "PorovnÃvÃnà sloÅek"
+
+#: ../data/ui/tab-placeholder.ui.h:4
+#| msgid "_Version Control Browser"
+msgid "Version control view"
+msgstr "Zobrazenà sprÃvy verzÃ"
+
+#: ../data/ui/tab-placeholder.ui.h:5
+#| msgid "_File Comparison"
+msgid "_3-way comparison"
+msgstr "_Trojcestnà porovnÃnÃ"
+
+#: ../data/ui/tab-placeholder.ui.h:6
+#| msgid "Select file"
+msgid "Select Third File"
+msgstr "VÃbÄr tÅetÃho souboru"
+
+#: ../data/ui/tab-placeholder.ui.h:7
+#| msgid "Select file"
+msgid "Select Second File"
+msgstr "VÃbÄr druhÃho souboru"
+
+#: ../data/ui/tab-placeholder.ui.h:8
+#| msgid "Select file"
+msgid "Select First File"
+msgstr "VÃbÄr prvnÃho souboru"
+
+#: ../data/ui/tab-placeholder.ui.h:9
+#| msgid "Select directory"
+msgid "Select First Folder"
+msgstr "VÃbÄr prvnà sloÅky"
+
+#: ../data/ui/tab-placeholder.ui.h:10
+#| msgid "Select directory"
+msgid "Select Second Folder"
+msgstr "VÃbÄr druhà sloÅky"
+
+#: ../data/ui/tab-placeholder.ui.h:11
+#| msgid "Select file"
+msgid "Select Third Folder"
+msgstr "VÃbÄr tÅetà sloÅky"
+
+#: ../data/ui/tab-placeholder.ui.h:12
+#| msgid "_Version Control Browser"
+msgid "Select A Version-Controlled Folder"
+msgstr "VÃbÄr sloÅky se sprÃvou verzÃ"
+
+#: ../data/ui/tab-placeholder.ui.h:13
+#| msgid "_File Comparison"
+msgid "_Blank comparison"
+msgstr "_PrÃzdnà porovnÃvÃnÃ"
+
+#: ../data/ui/tab-placeholder.ui.h:14
+#| msgid "_Compare"
+msgid "C_ompare"
+msgstr "P_orovnat"
+
#: ../data/ui/vcview.ui.h:1
msgid "VC Log"
msgstr "ZÃznam sprÃvy verzÃ"
@@ -402,47 +459,47 @@ msgstr "PÅedchozà zÃznamy"
msgid "Log Message"
msgstr "ZprÃva zÃznamu"
-#: ../meld/dirdiff.py:229 ../meld/vcview.py:125
+#: ../meld/dirdiff.py:231 ../meld/vcview.py:160
msgid "_Compare"
msgstr "_Porovnat"
-#: ../meld/dirdiff.py:229 ../meld/vcview.py:125
+#: ../meld/dirdiff.py:231 ../meld/vcview.py:160
msgid "Compare selected"
msgstr "Porovnat vybranÃ"
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:232
msgid "Copy _Left"
msgstr "KopÃrovat na_levo"
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:232
msgid "Copy to left"
msgstr "KopÃrovat doleva"
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:233
msgid "Copy _Right"
msgstr "KopÃ_rovat napravo"
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:233
msgid "Copy to right"
msgstr "KopÃrovat doprava"
-#: ../meld/dirdiff.py:232
+#: ../meld/dirdiff.py:234
msgid "Delete selected"
msgstr "Odstranit vybranÃ"
-#: ../meld/dirdiff.py:233 ../meld/filediff.py:1216
+#: ../meld/dirdiff.py:235 ../meld/filediff.py:1247
msgid "Hide"
msgstr "SkrÃt"
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:235
msgid "Hide selected"
msgstr "SkrÃt vybranÃ"
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:239
msgid "Ignore filename case"
msgstr "Ignorovat velikost pÃsmen v nÃzvu souboru"
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:239
msgid ""
"Consider differently-cased filenames that are otherwise-identical to be the "
"same"
@@ -450,74 +507,89 @@ msgstr ""
"PovaÅovat nÃzvy souborÅ, kterà se odliÅujà velikostà pÃsmen, ale jinak jsou "
"stejnÃ, za shodnÃ"
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:240
msgid "Same"
msgstr "StejnÃ"
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:240
msgid "Show identical"
msgstr "Zobrazovat stejnÃ"
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:241
msgid "New"
msgstr "NovÃ"
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:241
msgid "Show new"
msgstr "Zobrazovat novÃ"
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:242
msgid "Modified"
msgstr "ZmÄnÄnÃ"
-#: ../meld/dirdiff.py:240 ../meld/vcview.py:137
+#: ../meld/dirdiff.py:242 ../meld/vcview.py:172
msgid "Show modified"
msgstr "Zobrazovat zmÄnÄnÃ"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:244
msgid "Filters"
msgstr "Filtry"
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:244
msgid "Set active filters"
msgstr "Nastavte aktivnà filtry"
-#: ../meld/dirdiff.py:406
+#. Create file size CellRenderer
+#: ../meld/dirdiff.py:317
+msgid "Size"
+msgstr "Velikost"
+
+#. Create date-time CellRenderer
+#: ../meld/dirdiff.py:324
+msgid "Modification time"
+msgstr "Äas zmÄny"
+
+#. Create permissions CellRenderer
+#: ../meld/dirdiff.py:331
+msgid "Permissions"
+msgstr "OprÃvnÄnÃ"
+
+#: ../meld/dirdiff.py:452
#, python-format
msgid "Hide %s"
msgstr "SkrÃt %s"
-#: ../meld/dirdiff.py:510 ../meld/dirdiff.py:529 ../meld/vcview.py:326
-#: ../meld/vcview.py:350
+#: ../meld/dirdiff.py:566 ../meld/dirdiff.py:585 ../meld/vcview.py:370
+#: ../meld/vcview.py:394
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] ProchÃzà se %s"
-#: ../meld/dirdiff.py:628
+#: ../meld/dirdiff.py:684
#, python-format
msgid "[%s] Done"
msgstr "[%s] Hotovo"
-#: ../meld/dirdiff.py:632
+#: ../meld/dirdiff.py:689
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:633
+#: ../meld/dirdiff.py:690
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:635
+#: ../meld/dirdiff.py:692
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:637
+#: ../meld/dirdiff.py:694
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:639
+#: ../meld/dirdiff.py:696
msgid ""
"You are running a case insensitive comparison on a case sensitive "
"filesystem. The following files in this folder are hidden:"
@@ -525,17 +597,17 @@ 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:650
+#: ../meld/dirdiff.py:707
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "â%sâ skryto v â%sâ"
-#: ../meld/dirdiff.py:675 ../meld/filediff.py:979 ../meld/filediff.py:1220
-#: ../meld/vcview.py:572 ../meld/vcview.py:614
+#: ../meld/dirdiff.py:732 ../meld/filediff.py:1010 ../meld/filediff.py:1251
+#: ../meld/vcview.py:620 ../meld/vcview.py:662
msgid "Hi_de"
msgstr "_SkrÃt"
-#: ../meld/dirdiff.py:725
+#: ../meld/dirdiff.py:764
#, python-format
msgid ""
"'%s' exists.\n"
@@ -544,7 +616,7 @@ msgstr ""
"â%sâ existuje.\n"
"PÅepsat?"
-#: ../meld/dirdiff.py:732
+#: ../meld/dirdiff.py:771
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -555,7 +627,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:750 ../meld/vcview.py:546
+#: ../meld/dirdiff.py:789 ../meld/vcview.py:594
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -564,7 +636,7 @@ msgstr ""
"â%sâ je sloÅkou.\n"
"Odstranit rekurzivnÄ?"
-#: ../meld/dirdiff.py:757 ../meld/vcview.py:551
+#: ../meld/dirdiff.py:796 ../meld/vcview.py:599
#, python-format
msgid ""
"Error removing %s\n"
@@ -575,7 +647,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:842
+#: ../meld/dirdiff.py:896
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
@@ -583,7 +655,7 @@ msgstr[0] "%i sekunda"
msgstr[1] "%i sekundy"
msgstr[2] "%i sekund"
-#: ../meld/dirdiff.py:843
+#: ../meld/dirdiff.py:897
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
@@ -591,7 +663,7 @@ msgstr[0] "%i minuta"
msgstr[1] "%i minuty"
msgstr[2] "%i minut"
-#: ../meld/dirdiff.py:844
+#: ../meld/dirdiff.py:898
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
@@ -599,7 +671,7 @@ msgstr[0] "%i hodina"
msgstr[1] "%i hodiny"
msgstr[2] "%i hodin"
-#: ../meld/dirdiff.py:845
+#: ../meld/dirdiff.py:899
#, python-format
msgid "%i day"
msgid_plural "%i days"
@@ -607,7 +679,7 @@ msgstr[0] "%i den"
msgstr[1] "%i dny"
msgstr[2] "%i dnÅ"
-#: ../meld/dirdiff.py:846
+#: ../meld/dirdiff.py:900
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
@@ -615,7 +687,7 @@ msgstr[0] "%i tÃden"
msgstr[1] "%i tÃdny"
msgstr[2] "%i tÃdnÅ"
-#: ../meld/dirdiff.py:847
+#: ../meld/dirdiff.py:901
#, python-format
msgid "%i month"
msgid_plural "%i months"
@@ -623,7 +695,7 @@ msgstr[0] "%i mÄsÃc"
msgstr[1] "%i mÄsÃce"
msgstr[2] "%i mÄsÃcÅ"
-#: ../meld/dirdiff.py:848
+#: ../meld/dirdiff.py:902
#, python-format
msgid "%i year"
msgid_plural "%i years"
@@ -631,159 +703,159 @@ msgstr[0] "%i rok"
msgstr[1] "%i roky"
msgstr[2] "%i let"
-#: ../meld/filediff.py:214
+#: ../meld/filediff.py:228
msgid "Format as patch..."
msgstr "FormÃtovat jako zÃplatuâ"
-#: ../meld/filediff.py:214
+#: ../meld/filediff.py:228
msgid "Create a patch using differences between files"
msgstr "VytvoÅit zÃplatu pouÅitÃm rozdÃlÅ mezi soubory"
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:229
msgid "Previous conflict"
msgstr "PÅedchozà konflikt"
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:229
msgid "Go to the previous conflict"
msgstr "PÅejÃt na pÅedchozà konflikt"
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:230
msgid "Next conflict"
msgstr "NÃsledujÃcà konflikt"
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:230
msgid "Go to the next conflict"
msgstr "PÅejÃt na nÃsledujÃcà konflikt"
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:231
msgid "Push to left"
msgstr "ZatlaÄit doleva"
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:231
msgid "Push current change to the left"
msgstr "ZatlaÄit aktuÃlnà zmÄnu doleva"
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:232
msgid "Push to right"
msgstr "ZatlaÄit doprava"
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:232
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:220
+#: ../meld/filediff.py:234
msgid "Pull from left"
msgstr "VytÃhnout zleva"
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:234
msgid "Pull change from the left"
msgstr "VytÃhnout zmÄnu zleva"
-#: ../meld/filediff.py:221
+#: ../meld/filediff.py:235
msgid "Pull from right"
msgstr "VytÃhnout zprava"
-#: ../meld/filediff.py:221
+#: ../meld/filediff.py:235
msgid "Pull change from the right"
msgstr "VytÃhnout zmÄnu zprava"
-#: ../meld/filediff.py:222
+#: ../meld/filediff.py:236
msgid "Copy above left"
msgstr "KopÃrovat z levà vrchnà ÄÃsti"
-#: ../meld/filediff.py:222
+#: ../meld/filediff.py:236
msgid "Copy change above the left chunk"
msgstr "KopÃrovat zmÄnu nad levÃm blokem"
-#: ../meld/filediff.py:223
+#: ../meld/filediff.py:237
msgid "Copy below left"
msgstr "KopÃrovat z levà spodnà ÄÃsti"
-#: ../meld/filediff.py:223
+#: ../meld/filediff.py:237
msgid "Copy change below the left chunk"
msgstr "KopÃrovat zmÄnu pod levÃm blokem"
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:238
msgid "Copy above right"
msgstr "KopÃrovat z pravà vrchnà ÄÃsti"
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:238
msgid "Copy change above the right chunk"
msgstr "KopÃrovat zmÄnu nad pravÃm blokem"
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:239
msgid "Copy below right"
msgstr "KopÃrovat z pravà spodnà ÄÃsti"
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:239
msgid "Copy change below the right chunk"
msgstr "KopÃrovat zmÄnu pod pravÃm blokem"
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:240
msgid "Delete"
msgstr "Smazat"
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:240
msgid "Delete change"
msgstr "Smazat zmÄnu"
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:241
msgid "Merge all changes from left"
msgstr "SlouÄit veÅkerà zmÄny zleva"
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:241
msgid "Merge all non-conflicting changes from the left"
msgstr "SlouÄit veÅkerà zmÄny bez konfliktÅ zleva"
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:242
msgid "Merge all changes from right"
msgstr "SlouÄit veÅkerà zmÄny zprava"
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:242
msgid "Merge all non-conflicting changes from the right"
msgstr "SlouÄit veÅkerà zmÄny bez konfliktÅ zprava"
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:243
msgid "Merge all non-conflicting"
msgstr "SlouÄit vÅe bez konfliktÅ"
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:243
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:230
+#: ../meld/filediff.py:244
msgid "Cycle through documents"
-msgstr "StÅÃdat dokumenty"
+msgstr "PÅepnout mezi dokumenty"
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:244
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:234
+#: ../meld/filediff.py:248
msgid "Lock scrolling"
msgstr "Uzamknout posouvÃnÃ"
-#: ../meld/filediff.py:235
+#: ../meld/filediff.py:249
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:353
+#: ../meld/filediff.py:365
msgid "INS"
msgstr "VKL"
-#: ../meld/filediff.py:353
+#: ../meld/filediff.py:365
msgid "OVR"
msgstr "PÅE"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:355
+#: ../meld/filediff.py:367
#, python-format
msgid "Ln %i, Col %i"
msgstr "ÅÃd %i, sl %i"
-#: ../meld/filediff.py:682
+#: ../meld/filediff.py:703
#, python-format
msgid ""
"Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -792,42 +864,42 @@ msgstr ""
"Filtr â%sâ zmÄnil poÄet ÅÃdkÅ v souboru. PorovnÃnà nebude sprÃvnÃ. DalÅà "
"podrobnosti viz pÅÃruÄka uÅivatele."
-#: ../meld/filediff.py:967
+#: ../meld/filediff.py:998
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] Nastaven poÄet panelÅ"
-#: ../meld/filediff.py:973
+#: ../meld/filediff.py:1004
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] OtevÃrajà se soubory"
-#: ../meld/filediff.py:997 ../meld/filediff.py:1007 ../meld/filediff.py:1020
-#: ../meld/filediff.py:1026
+#: ../meld/filediff.py:1028 ../meld/filediff.py:1038 ../meld/filediff.py:1051
+#: ../meld/filediff.py:1057
msgid "Could not read file"
msgstr "Nelze pÅeÄÃst soubor"
-#: ../meld/filediff.py:998
+#: ../meld/filediff.py:1029
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] Ätou se soubory"
-#: ../meld/filediff.py:1008
+#: ../meld/filediff.py:1039
#, python-format
msgid "%s appears to be a binary file."
msgstr "%s je zÅejmÄ binÃrnÃm souborem."
-#: ../meld/filediff.py:1021
+#: ../meld/filediff.py:1052
#, python-format
msgid "%s is not in encodings: %s"
msgstr "%s nenà v kÃdovÃnÃch: %s"
-#: ../meld/filediff.py:1052
+#: ../meld/filediff.py:1083
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] PoÄÃtajà se rozdÃly"
-#: ../meld/filediff.py:1207
+#: ../meld/filediff.py:1238
msgid ""
"Text filters are being used, and may be masking differences between files. "
"Would you like to compare the unfiltered files?"
@@ -835,15 +907,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:1213
+#: ../meld/filediff.py:1244
msgid "Files are identical"
msgstr "Soubory jsou stejnÃ"
-#: ../meld/filediff.py:1223
+#: ../meld/filediff.py:1254
msgid "Show without filters"
msgstr "Zobrazit bez filtrÅ"
-#: ../meld/filediff.py:1347
+#: ../meld/filediff.py:1378
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -852,7 +924,7 @@ msgstr ""
"â%sâ existuje!\n"
"PÅepsat?"
-#: ../meld/filediff.py:1360
+#: ../meld/filediff.py:1391
#, python-format
msgid ""
"Error writing to %s\n"
@@ -863,12 +935,12 @@ msgstr ""
"\n"
"%s."
-#: ../meld/filediff.py:1369
+#: ../meld/filediff.py:1400
#, python-format
msgid "Choose a name for buffer %i."
msgstr "Zvolte nÃzev vyrovnÃvacà pamÄti %i."
-#: ../meld/filediff.py:1384
+#: ../meld/filediff.py:1416
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -879,7 +951,7 @@ msgstr ""
"\n"
"Jakà formÃt chcete pouÅÃvat?"
-#: ../meld/filediff.py:1400
+#: ../meld/filediff.py:1432
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -888,375 +960,387 @@ msgstr ""
"â%sâ obsahuje znaky, kterà nelze kÃdovat v â%sâ\n"
"Chcete uloÅit jako UTF-8?"
-#: ../meld/filediff.py:1457
-#, python-format
-msgid ""
-"Reloading will discard changes in:\n"
-"%s\n"
-"\n"
-"You cannot undo this operation."
-msgstr ""
-"OpÄtovnà naÄtenà zahodà zmÄny v:\n"
-"%s\n"
-"\n"
-"Tuto operaci nelze vzÃt zpÄt."
+#: ../meld/filediff.py:1497
+msgid "Save changes to documents before reloading?"
+msgstr "UloÅit zmÄny do dokumentÅ pÅed opÄtovnÃm naÄtenÃm?"
-#: ../meld/filemerge.py:47
+#: ../meld/filemerge.py:53
#, python-format
msgid "[%s] Merging files"
msgstr "[%s] SluÄujà se soubory"
-#: ../meld/meldapp.py:152
+#: ../meld/meldapp.py:95
msgid "wrong number of arguments supplied to --diff"
-msgstr "poskytnut nesprÃvnà poÄet argumentÅ --diff"
+msgstr "poskytnut nesprÃvnà poÄet argumentÅ pro --diff"
-#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:99
msgid "Start with an empty window"
msgstr "Spustit s prÃzdnÃm oknem"
-#: ../meld/meldapp.py:157 ../meld/meldapp.py:158 ../meld/meldapp.py:160
+#: ../meld/meldapp.py:100 ../meld/meldapp.py:102 ../meld/meldapp.py:106
msgid "file"
msgstr "soubor"
-#: ../meld/meldapp.py:157 ../meld/meldapp.py:159 ../meld/meldapp.py:160
+#: ../meld/meldapp.py:100 ../meld/meldapp.py:104 ../meld/meldapp.py:106
msgid "dir"
msgstr "adr"
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:101
msgid "Start a version control comparison"
msgstr "Spustit novà porovnÃnà sprÃvy verzÃ"
-#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:103
msgid "Start a 2- or 3-way file comparison"
msgstr "Spustit dvojcestnà nebo trojcestnà porovnÃnà souborÅ"
-#: ../meld/meldapp.py:159
+#: ../meld/meldapp.py:105
msgid "Start a 2- or 3-way directory comparison"
msgstr "Spustit dvojcestnà nebo trojcestnà porovnÃnà sloÅek"
-#: ../meld/meldapp.py:160
+#: ../meld/meldapp.py:107
msgid "Start a comparison between file and dir/file"
msgstr "Spustit porovnÃnà souboru a sloÅky/souboru"
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:114
msgid "Meld is a file and directory comparison tool."
msgstr "Meld je nÃstroj porovnÃvajÃcà soubory a sloÅky."
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:117
msgid "Set label to use instead of file name"
msgstr "Nastavit k pouÅità popisek namÃsto nÃzvu souboru"
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:119
msgid "Open a new tab in an already running instance"
msgstr "OtevÅÃt novou kartu v jiÅ bÄÅÃcà instanci"
-#: ../meld/meldapp.py:173
+#: ../meld/meldapp.py:122
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:175
+#: ../meld/meldapp.py:124
msgid "Ignored for compatibility"
msgstr "IgnorovÃno z dÅvodu kompatibility"
-#: ../meld/meldapp.py:178
+#: ../meld/meldapp.py:127
msgid "Set the target file for saving a merge result"
msgstr "Nastavit cÃlovà soubor, do kterÃho se mà uloÅit vÃsledek sluÄovÃnÃ"
-#: ../meld/meldapp.py:180
+#: ../meld/meldapp.py:129
msgid "Automatically merge files"
msgstr "Automaticky slouÄit soubory"
-#: ../meld/meldapp.py:183
-msgid "Creates a diff tab for up to 3 supplied files or directories."
-msgstr "VytvoÅit kartu s rozdÃlem aÅ pro tÅi zadanà soubory nebo sloÅky."
+#: ../meld/meldapp.py:132
+msgid "Load a saved comparison from a Meld comparison file"
+msgstr "NaÄÃst uloÅenà porovnÃnà ze srovnÃvacÃho souboru Meld"
+
+#: ../meld/meldapp.py:135
+#| msgid "Creates a diff tab for up to 3 supplied files or directories."
+msgid "Create a diff tab for the supplied files or folders"
+msgstr "VytvoÅit kartu s rozdÃlem pro zadanà soubory nebo sloÅky"
-#: ../meld/meldapp.py:186
+#: ../meld/meldapp.py:138
#, python-format
msgid "too many arguments (wanted 0-3, got %d)"
msgstr "pÅÃliÅ mnoho argumentÅ (poÅadovÃno 0 â 3, obdrÅeno %d)"
-#: ../meld/meldapp.py:188
+#: ../meld/meldapp.py:141
msgid "can't auto-merge less than 3 files"
msgstr "nelze automaticky slouÄit mÃnÄ neÅ 3 soubory"
-#: ../meld/meldapp.py:190
+#: ../meld/meldapp.py:143
msgid "can't auto-merge directories"
msgstr "nelze automaticky slouÄit sloÅky"
-#: ../meld/meldapp.py:196
+#: ../meld/meldapp.py:149
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Ä."
+#: ../meld/meldapp.py:167
+#| msgid "Error fetching original comparison file"
+msgid "Error reading saved comparison file"
+msgstr "Chyba pÅi Ätenà uloÅenÃho srovnÃvacÃho souboru"
+
#. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:83
+#: ../meld/meldbuffer.py:89
msgid "<unnamed>"
msgstr "<bez nÃzvu>"
-#: ../meld/melddoc.py:57 ../meld/melddoc.py:58
+#: ../meld/melddoc.py:58 ../meld/melddoc.py:59
msgid "untitled"
msgstr "nepojmenovanÃ"
-#: ../meld/meldwindow.py:110
+#: ../meld/meldwindow.py:62
msgid "_File"
msgstr "_Soubor"
-#: ../meld/meldwindow.py:111
-msgid "_New..."
-msgstr "_NovÃâ"
+#: ../meld/meldwindow.py:63
+#| msgid "_File Comparison"
+msgid "_New comparison"
+msgstr "_Novà porovnÃvÃnÃ"
-#: ../meld/meldwindow.py:111
+#: ../meld/meldwindow.py:63
msgid "Start a new comparison"
msgstr "Spustit novà porovnÃnÃ"
-#: ../meld/meldwindow.py:112
+#: ../meld/meldwindow.py:64
msgid "Save the current file"
msgstr "UloÅit aktuÃlnà soubor"
-#: ../meld/meldwindow.py:114
+#: ../meld/meldwindow.py:66
msgid "Close the current file"
msgstr "ZavÅÃt aktuÃlnà soubor"
-#: ../meld/meldwindow.py:115
+#: ../meld/meldwindow.py:67
msgid "Quit the program"
msgstr "UkonÄit program"
-#: ../meld/meldwindow.py:117
+#: ../meld/meldwindow.py:69
msgid "_Edit"
msgstr "_Upravit"
-#: ../meld/meldwindow.py:118
+#: ../meld/meldwindow.py:70
msgid "Undo the last action"
msgstr "VrÃtit zpÄt poslednà Äinnost"
-#: ../meld/meldwindow.py:119
+#: ../meld/meldwindow.py:71
msgid "Redo the last undone action"
msgstr "Zopakovat poslednà Äinnost vrÃcenou zpÄt"
-#: ../meld/meldwindow.py:120
+#: ../meld/meldwindow.py:72
msgid "Cut the selection"
msgstr "Vyjmout vÃbÄr"
-#: ../meld/meldwindow.py:121
+#: ../meld/meldwindow.py:73
msgid "Copy the selection"
msgstr "KopÃrovat vÃbÄr"
-#: ../meld/meldwindow.py:122
+#: ../meld/meldwindow.py:74
msgid "Paste the clipboard"
msgstr "VloÅit obsah schrÃnky"
-#: ../meld/meldwindow.py:123
+#: ../meld/meldwindow.py:75
msgid "Search for text"
msgstr "Hledat text"
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:76
msgid "Find Ne_xt"
msgstr "_NajÃt nÃsledujÃcÃ"
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:76
msgid "Search forwards for the same text"
msgstr "Hledat tentÃÅ text vpÅed"
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:77
msgid "Find _Previous"
msgstr "NalÃzt _pÅedchozÃ"
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:77
msgid "Search backwards for the same text"
msgstr "Hledat nazpÄt tentÃÅ text"
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:78
msgid "Find and replace text"
msgstr "NajÃt a nahradit text"
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:79
msgid "Prefere_nces"
msgstr "_PÅedvolby"
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:79
msgid "Configure the application"
msgstr "Nastavit aplikaci"
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:81
msgid "_Changes"
msgstr "_ZmÄny"
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:82
msgid "Next change"
msgstr "NÃsledujÃcà zmÄna"
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:82
msgid "Go to the next change"
msgstr "PÅejÃt na nÃsledujÃcà zmÄnu"
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:83
msgid "Previous change"
msgstr "PÅedchozà zmÄna"
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:83
msgid "Go to the previous change"
msgstr "PÅejÃt na pÅedchozà zmÄnu"
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:84
msgid "Open externally"
msgstr "OtevÅÃt externÄ"
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:84
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:134
+#: ../meld/meldwindow.py:86
msgid "_View"
msgstr "_Zobrazit"
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:87
msgid "File status"
msgstr "Stav souboru"
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:88
msgid "Version status"
msgstr "Stav verze"
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:89
msgid "File filters"
msgstr "Filtry souborÅ"
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:90
msgid "Stop the current action"
msgstr "Zastavit aktuÃlnà Äinnost"
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:91
msgid "Refresh the view"
msgstr "Obnovit zobrazenÃ"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:92
msgid "Reload"
msgstr "Znovu naÄÃst"
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:92
msgid "Reload the comparison"
msgstr "Znovu naÄÃst porovnÃnÃ"
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:94
msgid "_Tabs"
msgstr "Kar_ty"
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:95
msgid "_Previous Tab"
msgstr "_PÅedchozà karta"
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:95
msgid "Activate previous tab"
msgstr "PÅejÃt na pÅedchozà kartu"
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:96
msgid "_Next Tab"
msgstr "_NÃsledujÃcà karta"
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:96
msgid "Activate next tab"
msgstr "Aktivovat nÃsledujÃcà kartu"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:97
msgid "Move Tab _Left"
msgstr "PÅesunout kartu do_leva"
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:97
msgid "Move current tab to left"
msgstr "PÅesunout aktuÃlnà kartu doleva"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:98
msgid "Move Tab _Right"
msgstr "PÅesunout kartu dop_rava"
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:98
msgid "Move current tab to right"
msgstr "PÅesunout aktuÃlnà kartu doprava"
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:100
msgid "_Help"
msgstr "_NÃpovÄda"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:101
msgid "_Contents"
msgstr "_Obsah"
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:101
msgid "Open the Meld manual"
msgstr "OtevÅÃt pÅÃruÄku aplikace Meld"
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:102
msgid "Report _Bug"
msgstr "OhlÃsit _chybu"
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:102
msgid "Report a bug in Meld"
msgstr "NahlÃsit chybu v aplikaci Meld"
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:103
msgid "About this program"
msgstr "O tÃto aplikaci"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:106
msgid "Full Screen"
msgstr "Celà obrazovka"
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:106
msgid "View the comparison in full screen"
msgstr "Zobrazit porovnÃnà pÅes celou obrazovku"
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:107
msgid "_Toolbar"
msgstr "NÃstrojovà _liÅta"
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:107
msgid "Show or hide the toolbar"
msgstr "Zobrazit nebo skrÃt nÃstrojovou liÅtu"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:108
msgid "_Statusbar"
msgstr "_Stavovà liÅta"
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:108
msgid "Show or hide the statusbar"
msgstr "Zobrazit nebo skrÃt stavovou liÅtu"
-#: ../meld/meldwindow.py:534
+#: ../meld/meldwindow.py:116
+#| msgid "Open externally"
+msgid "Open Recent"
+msgstr "OtevÅÃt nedÃvnÃ"
+
+#: ../meld/meldwindow.py:117
+#| msgid "Select file"
+msgid "Open recent files"
+msgstr "OtevÅÃt nedÃvnà soubory"
+
+#: ../meld/meldwindow.py:521
msgid "Switch to this tab"
msgstr "PÅepnout na tuto kartu"
#. exit at first non found directory + file
-#: ../meld/meldwindow.py:638
+#: ../meld/meldwindow.py:647
msgid "Cannot compare a mixture of files and directories.\n"
msgstr "Nelze porovnÃvat kombinaci souborÅ a sloÅek.\n"
#. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:177
+#: ../meld/misc.py:180
msgid "[None]"
msgstr "[ÅÃdnÃ]"
-#: ../meld/patchdialog.py:122
+#: ../meld/patchdialog.py:124
msgid "Save Patch As..."
msgstr "UloÅit zÃplatu jakoâ"
-#: ../meld/preferences.py:37
+#: ../meld/preferences.py:38
msgid "label"
msgstr "popisek"
-#: ../meld/preferences.py:37
+#: ../meld/preferences.py:38
msgid "pattern"
msgstr "vzorek"
-#: ../meld/preferences.py:111
+#: ../meld/preferences.py:154
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:228
+#: ../meld/preferences.py:275
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:230
+#: ../meld/preferences.py:277
msgid ""
"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
"Desktop.ini\n"
@@ -1265,202 +1349,198 @@ msgstr ""
"Desktop.ini\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:232
+#: ../meld/preferences.py:279
#, 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:234
+#: ../meld/preferences.py:281
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:236
+#: ../meld/preferences.py:283
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:238
+#: ../meld/preferences.py:285
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:240
+#: ../meld/preferences.py:287
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:242
+#: ../meld/preferences.py:289
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:244
+#: ../meld/preferences.py:291
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:246
+#: ../meld/preferences.py:293
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:248
+#: ../meld/preferences.py:295
msgid "Script comment\t0\t#.*"
msgstr "KomentÃÅ skriptu\t0\t#.*"
-#: ../meld/vcview.py:126
+#: ../meld/vcview.py:161
msgid "Co_mmit"
msgstr "Co_mmit"
-#: ../meld/vcview.py:126
+#: ../meld/vcview.py:161
msgid "Commit"
msgstr "Commit"
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:162
msgid "_Update"
msgstr "_Update"
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:162
msgid "Update"
msgstr "Update"
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:163
msgid "Add to VC"
msgstr "PÅidat do sprÃvy verzÃ"
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:164
msgid "Remove from VC"
msgstr "Odstranit ze sprÃvy verzÃ"
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:165
msgid "_Resolved"
msgstr "_VyÅeÅeno"
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:165
msgid "Mark as resolved for VC"
msgstr "OznaÄit jako vyÅeÅenà ve vztahu ke sprÃvÄ verzÃ"
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:166
msgid "Revert to original"
msgstr "VrÃtit zpÄt na pÅvodnÃ"
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:167
msgid "Delete locally"
msgstr "Odstranit mÃstnÄ"
-#: ../meld/vcview.py:136
+#: ../meld/vcview.py:171
msgid "_Flatten"
msgstr "Z_ploÅtit"
-#: ../meld/vcview.py:136
+#: ../meld/vcview.py:171
msgid "Flatten directories"
msgstr "ZploÅtit sloÅky"
-#: ../meld/vcview.py:137
+#: ../meld/vcview.py:172
msgid "_Modified"
msgstr "_ZmÄnÄnÃ"
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:173
msgid "_Normal"
msgstr "_NormÃlnÃ"
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:173
msgid "Show normal"
msgstr "Zobrazovat bÄÅnÃ"
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:174
msgid "Non _VC"
msgstr "Ni_koliv ve sprÃvÄ verzÃ"
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:174
msgid "Show unversioned files"
msgstr "Zobrazovat soubory bez verzÃ"
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:175
msgid "Ignored"
msgstr "IgnorovanÃ"
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:175
msgid "Show ignored files"
msgstr "Zobrazovat ignorovanà soubory"
-#: ../meld/vcview.py:190 ../meld/vcview.py:322
+#: ../meld/vcview.py:226 ../meld/vcview.py:366
msgid "Location"
msgstr "UmÃstÄnÃ"
-#: ../meld/vcview.py:191
+#: ../meld/vcview.py:227
msgid "Status"
msgstr "Stav"
-#: ../meld/vcview.py:192
+#: ../meld/vcview.py:228
msgid "Rev"
msgstr "Rev"
-#: ../meld/vcview.py:193
+#: ../meld/vcview.py:229
msgid "Tag"
msgstr "Tag"
-#: ../meld/vcview.py:194
+#: ../meld/vcview.py:230
msgid "Options"
msgstr "MoÅnosti"
-#: ../meld/vcview.py:252
+#: ../meld/vcview.py:292
msgid "Choose one Version Control"
msgstr "Vyberte jednu sprÃvu verzÃ"
-#: ../meld/vcview.py:253
+#: ../meld/vcview.py:293
msgid "Only one Version Control in this directory"
msgstr "V tÃto sloÅce 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:266
+#: ../meld/vcview.py:306
#, 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:270
+#: ../meld/vcview.py:310
msgid "Invalid Repository"
msgstr "Neplatnà ÃloÅiÅtÄ"
-#: ../meld/vcview.py:279
+#: ../meld/vcview.py:319
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
#. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:322
+#: ../meld/vcview.py:366
#, python-format
msgid "%s: %s"
msgstr "%s: %s"
-#: ../meld/vcview.py:366
+#: ../meld/vcview.py:409
msgid "(Empty)"
msgstr "(PrÃzdnÃ)"
-#: ../meld/vcview.py:404
+#: ../meld/vcview.py:441
#, python-format
msgid "[%s] Fetching differences"
msgstr "[%s] Stahujà se rozdÃly"
-#: ../meld/vcview.py:418
+#: ../meld/vcview.py:454
#, python-format
msgid "[%s] Applying patch"
msgstr "[%s] Aplikuje se zÃplata"
-#: ../meld/vcview.py:522
-msgid "Select some files first."
-msgstr "NejdÅÃve je nutnà vybrat soubory."
-
-#: ../meld/vcview.py:565
+#: ../meld/vcview.py:613
msgid "Patch tool not found"
msgstr "NÃstroj pro zÃplaty nenalezen"
-#: ../meld/vcview.py:566
+#: ../meld/vcview.py:614
#, python-format
msgid ""
"Meld needs the <i>patch</i> tool to be installed to perform comparisons in "
@@ -1469,11 +1549,11 @@ msgstr ""
"Aby bylo moÅnà provÃdÄt porovnÃnà v repozitÃÅÃch %s, potÅebuje mÃt Meld "
"nainstalovanà nÃstroj <i>patch</i>."
-#: ../meld/vcview.py:606
+#: ../meld/vcview.py:654
msgid "Error fetching original comparison file"
msgstr "Chyba pÅi zÃskÃvÃnà pÅvodnÃho porovnÃvanÃho souboru"
-#: ../meld/vcview.py:607
+#: ../meld/vcview.py:655
msgid ""
"Meld couldn't obtain the original version of your comparison file. If you "
"are using the most recent version of Meld, please report a bug, including as "
@@ -1483,11 +1563,11 @@ msgstr ""
"pouÅÃvÃte nejnovÄjÅÃ verzi aplikace Meld, nahlaste prosÃm chybu a to vÄetnÄ "
"co nejvÃce podrobnostÃ."
-#: ../meld/vcview.py:615
+#: ../meld/vcview.py:663
msgid "Report a bug"
msgstr "OhlÃsit _chybu"
-#: ../meld/ui/findbar.py:142
+#: ../meld/ui/findbar.py:145
#, python-format
msgid ""
"Regular expression error\n"
@@ -1496,31 +1576,31 @@ msgstr ""
"Chyba v regulÃrnÃm vÃrazu\n"
"â%sâ"
-#: ../meld/ui/historyentry.py:293
+#: ../meld/ui/historyentry.py:296
msgid "_Browse..."
msgstr "_ProchÃzetâ"
-#: ../meld/ui/historyentry.py:301
+#: ../meld/ui/historyentry.py:304
msgid "Path"
msgstr "Cesta"
-#: ../meld/ui/historyentry.py:302
+#: ../meld/ui/historyentry.py:305
msgid "Path to file"
msgstr "Cesta k souboru"
-#: ../meld/ui/historyentry.py:303
+#: ../meld/ui/historyentry.py:306
msgid "Pop up a file selector to choose a file"
msgstr "Zobrazit dialog vÃbÄru souboru umoÅÅujÃcà zvolit soubor"
-#: ../meld/ui/historyentry.py:441
+#: ../meld/ui/historyentry.py:444
msgid "Select directory"
msgstr "Vybrat sloÅku"
-#: ../meld/ui/historyentry.py:445
+#: ../meld/ui/historyentry.py:448
msgid "Select file"
msgstr "Vybrat soubor"
-#: ../meld/ui/notebooklabel.py:60
+#: ../meld/ui/notebooklabel.py:61
msgid "Close tab"
msgstr "ZavÅÃt kartu"
@@ -1533,7 +1613,7 @@ msgstr ""
"IgnorovÃno:Bez verze:::Chyba::NovÄ pÅidÃno:ZmÄnÄno:Konflikt:OdstranÄno:ChybÃ:"
"Nevyskytuje se"
-#: ../meld/vc/cvs.py:161
+#: ../meld/vc/cvs.py:165
#, python-format
msgid ""
"Error converting to a regular expression\n"
@@ -1544,7 +1624,7 @@ msgstr ""
"Vzorkem byl â%sâ\n"
"Chyba byla nÃsledujÃcÃ: â%sâ"
-#: ../meld/vc/git.py:152
+#: ../meld/vc/git.py:181
#, python-format
msgid "Mode changed from %s to %s"
msgstr "ReÅim zmÄnÄn z %s na %s"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]