merge with master and fix 4 conflicts by hand

[ardour.git] / libs / gtkmm2ext / po / cs.po

diff --git a/libs/gtkmm2ext/po/cs.po b/libs/gtkmm2ext/po/cs.po
index fa282e4ed5a2f58d57339a4dd220b08d0d155577..201c1f9934136e830195feea8e4df91674f7cc52 100644 (file)
--- a/libs/gtkmm2ext/po/cs.po
+++ b/libs/gtkmm2ext/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-15 15:09-0400\n"
+"POT-Creation-Date: 2014-02-10 12:05+0100\n"
 "PO-Revision-Date: 2013-06-13 22:33+0200\n"
 "Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: actions.cc:386
+#: actions.cc:387
 msgid "Unknown action name: %1"
 msgstr "Neznámý název pro činnost: %1"
 
@@ -29,11 +29,11 @@ msgstr "Obsluhovat ovladač nyní"
 msgid "button cannot watch state of non-existing Controllable\n"
 msgstr "Tlačítko nemůže sledovat stav neexistujícího ovladatelného cíle\n"
 
-#: gtk_ui.cc:107
+#: gtk_ui.cc:108
 msgid "Log"
 msgstr "Zápis"
 
-#: gtk_ui.cc:361
+#: gtk_ui.cc:364
 msgid ""
 "\n"
 "\n"
@@ -43,11 +43,11 @@ msgstr ""
 "\n"
 "Kurzbefehl: "
 
-#: gtk_ui.cc:633
+#: gtk_ui.cc:636
 msgid "Press To Exit"
 msgstr "Stisknout pro ukončení"
 
-#: gtk_ui.cc:669
+#: gtk_ui.cc:672
 msgid "I'm sorry %1, I can't do that"
 msgstr "Bohužel to nelze udělat, %1"
 
@@ -75,11 +75,11 @@ msgstr "Alt"
 msgid "Meta"
 msgstr "Meta"
 
-#: keyboard.cc:139 keyboard.cc:531
+#: keyboard.cc:139 keyboard.cc:535
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: keyboard.cc:542
+#: keyboard.cc:546
 msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr ""
 "Soubor s přiřazením kláves \"%2\"se nepodařilo najít, nebo obsahuje chyby."