diff --git a/lib/glibcompat.c b/lib/glibcompat.c index b73c23425..cd65a5ea5 100644 --- a/lib/glibcompat.c +++ b/lib/glibcompat.c @@ -153,9 +153,7 @@ g_error_new_valist (GQuark domain, gint code, const gchar * format, va_list args char *message; GError *ret_value; - va_start (ap, format); - message = g_strdup_vprintf (format, ap); - va_end (ap); + message = g_strdup_vprintf (format, args); ret_value = g_error_new_literal (domain, code, message); g_free (message); diff --git a/lib/glibcompat.h b/lib/glibcompat.h index ba25f3cdd..58f457e46 100644 --- a/lib/glibcompat.h +++ b/lib/glibcompat.h @@ -1,6 +1,10 @@ #ifndef MC_GLIBCOMPAT_H #define MC_GLIBCOMPAT_H +#if ! GLIB_CHECK_VERSION (2, 22, 0) +#include /* for g_error_new_valist() */ +#endif /* ! GLIB_CHECK_VERSION (2, 22, 0) */ + /*** typedefs(not structures) and defined constants **********************************************/ /*** enums ***************************************************************************************/ diff --git a/lib/tty/key.c b/lib/tty/key.c index bdb4e1e7e..3b92c1b1a 100644 --- a/lib/tty/key.c +++ b/lib/tty/key.c @@ -174,6 +174,7 @@ const key_code_name_t key_name_conv_tab[] = { {(int) ',', "comma", N_("Comma"), ","}, {(int) '\'', "apostrophe", N_("Apostrophe"), "\'"}, {(int) ':', "colon", N_("Colon"), ":"}, + {(int) ';', "semicolon", N_("Semicolon"), ";"}, {(int) '!', "exclamation", N_("Exclamation mark"), "!"}, {(int) '?', "question", N_("Question mark"), "?"}, {(int) '&', "ampersand", N_("Ampersand"), "&"}, diff --git a/lib/util.c b/lib/util.c index 843efc441..b1b701379 100644 --- a/lib/util.c +++ b/lib/util.c @@ -245,28 +245,26 @@ is_printable (int c) /* --------------------------------------------------------------------------------------------- */ /** * Quote the filename for the purpose of inserting it into the command - * line. If quote_percent is 1, replace "%" with "%%" - the percent is + * line. If quote_percent is TRUE, replace "%" with "%%" - the percent is * processed by the mc command line. */ char * -name_quote (const char *s, int quote_percent) +name_quote (const char *s, gboolean quote_percent) { - char *ret, *d; + GString *ret; + + ret = g_string_sized_new (64); - d = ret = g_malloc (strlen (s) * 2 + 2 + 1); if (*s == '-') - { - *d++ = '.'; - *d++ = '/'; - } + g_string_append (ret, "." PATH_SEP_STR); - for (; *s; s++, d++) + for (; *s != '\0'; s++) { switch (*s) { case '%': if (quote_percent) - *d++ = '%'; + g_string_append_c (ret, '%'); break; case '\'': case '\\': @@ -291,24 +289,24 @@ name_quote (const char *s, int quote_percent) case '*': case '(': case ')': - *d++ = '\\'; + g_string_append_c (ret, '\\'); break; case '~': case '#': - if (d == ret) - *d++ = '\\'; + if (ret->len == 0) + g_string_append_c (ret, '\\'); break; } - *d = *s; + g_string_append_c (ret, *s); } - *d = '\0'; - return ret; + + return g_string_free (ret, FALSE); } /* --------------------------------------------------------------------------------------------- */ char * -fake_name_quote (const char *s, int quote_percent) +fake_name_quote (const char *s, gboolean quote_percent) { (void) quote_percent; return g_strdup (s); diff --git a/lib/util.h b/lib/util.h index a8acfed82..3187451fa 100644 --- a/lib/util.h +++ b/lib/util.h @@ -124,10 +124,10 @@ int is_printable (int c); /* Quote the filename for the purpose of inserting it into the command * line. If quote_percent is 1, replace "%" with "%%" - the percent is * processed by the mc command line. */ -char *name_quote (const char *c, int quote_percent); +char *name_quote (const char *c, gboolean quote_percent); /* returns a duplicate of c. */ -char *fake_name_quote (const char *c, int quote_percent); +char *fake_name_quote (const char *c, gboolean quote_percent); /* path_trunc() is the same as str_trunc() but * it deletes possible password from path for security diff --git a/m4.include/ls-mntd-fs.m4 b/m4.include/ls-mntd-fs.m4 index 466f89af7..c29f0aa23 100644 --- a/m4.include/ls-mntd-fs.m4 +++ b/m4.include/ls-mntd-fs.m4 @@ -152,6 +152,19 @@ if test $ac_cv_func_getmntent = yes; then of mounted file systems, and that function takes a single argument. (4.3BSD, SunOS, HP-UX, Dynix, Irix)]) AC_CHECK_FUNCS([hasmntopt]) + + # Check for libmount to support /proc/self/mountinfo on Linux + AC_CACHE_VAL([ac_cv_lib_libmount_mnt_table_parse_stream], + [AC_CHECK_LIB([mount], [mnt_new_table_from_file], + ac_cv_lib_mount_mnt_table_parse_stream=yes, + ac_cv_lib_mount_mnt_table_parse_stream=no)]) + if test $ac_cv_lib_mount_mnt_table_parse_stream = yes; then + AC_DEFINE([MOUNTED_PROC_MOUNTINFO], [1], + [Define if want to use /proc/self/mountinfo on Linux.]) + LIBS="-lmount $LIBS" + elif test -f /proc/self/mountinfo; then + AC_MSG_WARN([/proc/self/mountinfo present but libmount is missing.]) + fi fi fi diff --git a/misc/mc.ext.in b/misc/mc.ext.in index 68c6819d5..d319cd617 100644 --- a/misc/mc.ext.in +++ b/misc/mc.ext.in @@ -691,7 +691,7 @@ type/i/^zip\ archive View=%view{ascii} @EXTHELPERSDIR@/archive.sh view zip # jar(zip) -type/i/^Java\ Jar\ file\ data\ \(zip\) +type/i/^Java\ (Jar\ file|archive)\ data\ \((zip|JAR)\) Open=%cd %p/uzip:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view zip diff --git a/po/az.po b/po/az.po index 25528c54a..672837a51 100644 --- a/po/az.po +++ b/po/az.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/mc/language/" @@ -333,6 +333,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "" @@ -1682,6 +1685,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Başqa 8 bit" @@ -1766,12 +1775,6 @@ msgstr "" msgid "Configure options" msgstr "Seçənəkləri quraşdır" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/be.po b/po/be.po index 9bfc7e231..ac0ce0111 100644 --- a/po/be.po +++ b/po/be.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/mc/language/" @@ -351,6 +351,9 @@ msgstr "Апостраф" msgid "Colon" msgstr "Двухкроп’е" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Клічнік" @@ -1744,6 +1747,12 @@ msgstr "" "Немагчыма зьмяніць уладальніка «%s»\n" "%s" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Іншая 8-бітная" @@ -1828,12 +1837,6 @@ msgstr "Самарушна захоўваць &налады" msgid "Configure options" msgstr "Наставіць налады" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/bg.po b/po/bg.po index c135334c0..f76732de1 100644 --- a/po/bg.po +++ b/po/bg.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/mc/language/" @@ -334,6 +334,9 @@ msgstr "Апостроф" msgid "Colon" msgstr "Двоеточие" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Удивителна" @@ -1683,6 +1686,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Други 8 бита" @@ -1767,12 +1776,6 @@ msgstr "" msgid "Configure options" msgstr "Опции на конфигурацията" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/ca.po b/po/ca.po index 4277193b2..f8000a826 100644 --- a/po/ca.po +++ b/po/ca.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/mc/language/" @@ -339,6 +339,9 @@ msgstr "Apòstrof" msgid "Colon" msgstr "Punt i Coma" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Signe d'exclamació" @@ -1690,6 +1693,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Altres 8 bits" @@ -1774,12 +1783,6 @@ msgstr "" msgid "Configure options" msgstr "Opcions de configuració" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/cs.po b/po/cs.po index af0ea2656..7678f5b7b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Czech (http://www.transifex.com/projects/p/mc/language/cs/)\n" @@ -347,6 +347,9 @@ msgstr "Apostrof" msgid "Colon" msgstr "Dvojtečka" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Vykřičník" @@ -1733,6 +1736,12 @@ msgstr "" "Nelze změnit vlastníka souboru „%s“\n" "%s" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Ostatní 8 bitů" @@ -1817,12 +1826,6 @@ msgstr "&Automatické ukládání parametrů" msgid "Configure options" msgstr "Změna nastavení" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/da.po b/po/da.po index 5e552654a..77497014e 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Danish (http://www.transifex.com/projects/p/mc/language/da/)\n" @@ -339,6 +339,9 @@ msgstr "Apostrof" msgid "Colon" msgstr "Kolon" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Udråbstegn" @@ -1715,6 +1718,12 @@ msgstr "" "Kan ikke chown »%s«\n" "%s" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Andre 8-bit" @@ -1799,12 +1808,6 @@ msgstr "Opsætning for a&utomatisk gemning" msgid "Configure options" msgstr "Konfigurer indstillinger" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/de.po b/po/de.po index 969586151..71120e3b5 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: German (http://www.transifex.com/projects/p/mc/language/de/)\n" @@ -343,6 +343,9 @@ msgstr "Hochkomma" msgid "Colon" msgstr "Doppelpunkt" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Ausrufezeichen" @@ -1722,6 +1725,12 @@ msgstr "" "Kann chown für \"%s\" nicht durchführen\n" "%s" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Andere 8 bit" @@ -1806,12 +1815,6 @@ msgstr "Einstellungen auto&m. speichern" msgid "Configure options" msgstr "Einstellungen" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/de_CH.po b/po/de_CH.po index b2cd168d3..92668d7cf 100644 --- a/po/de_CH.po +++ b/po/de_CH.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/mc/" @@ -332,6 +332,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "" @@ -1674,6 +1677,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "" @@ -1758,12 +1767,6 @@ msgstr "" msgid "Configure options" msgstr "" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/el.po b/po/el.po index 89e9e4978..6d84cf2d3 100644 --- a/po/el.po +++ b/po/el.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Greek (http://www.transifex.com/projects/p/mc/language/el/)\n" @@ -346,6 +346,9 @@ msgstr "Απόστροφος" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Θαυμαστικό" @@ -1714,6 +1717,12 @@ msgstr "" "Αδυναμία chown \"%s\"\n" "%s" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "" @@ -1798,12 +1807,6 @@ msgstr "" msgid "Configure options" msgstr "" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index 8cb70cc96..ff999faea 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/" @@ -332,6 +332,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "" @@ -1674,6 +1677,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "" @@ -1758,12 +1767,6 @@ msgstr "" msgid "Configure options" msgstr "" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/eo.po b/po/eo.po index 1b3275f72..13e7a5f84 100644 --- a/po/eo.po +++ b/po/eo.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/mc/language/" @@ -349,6 +349,9 @@ msgstr "Apostrofo" msgid "Colon" msgstr "Dupunkto" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Krisigno" @@ -1769,6 +1772,12 @@ msgstr "" "Ne eblas ŝanĝi estrecon de \"%s\"\n" "%s" +msgid "< Default >" +msgstr "< Apriora >" + +msgid "Skins" +msgstr "Etosoj" + msgid "Other 8 bit" msgstr "Alia 8-bita" @@ -1853,12 +1862,6 @@ msgstr "Aŭtomate konservi agor&don" msgid "Configure options" msgstr "Agordaĵoj" -msgid "< Default >" -msgstr "< Apriora >" - -msgid "Skins" -msgstr "Etosoj" - msgid "Skin:" msgstr "Etoso:" diff --git a/po/es.po b/po/es.po index 1eaf7f10d..8cf8de035 100644 --- a/po/es.po +++ b/po/es.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/mc/language/" @@ -354,6 +354,9 @@ msgstr "Apóstrofo" msgid "Colon" msgstr "Dos puntos" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Exclamación" @@ -1776,6 +1779,12 @@ msgstr "" "Imposible cambiar el dueño de «%s»\n" "%s" +msgid "< Default >" +msgstr "< Por defecto >" + +msgid "Skins" +msgstr "Skins" + msgid "Other 8 bit" msgstr "Otro (8 bit)" @@ -1860,12 +1869,6 @@ msgstr "auto-guarda con&Figuración" msgid "Configure options" msgstr "Configuración" -msgid "< Default >" -msgstr "< Por defecto >" - -msgid "Skins" -msgstr "Skins" - msgid "Skin:" msgstr "Skin:" diff --git a/po/et.po b/po/et.po index 31fac81f0..bfe6e7f93 100644 --- a/po/et.po +++ b/po/et.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Estonian (http://www.transifex.com/projects/p/mc/language/" @@ -349,6 +349,9 @@ msgstr "Ülakoma '" msgid "Colon" msgstr "Koolon :" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Hüüumärk !" @@ -1766,6 +1769,12 @@ msgstr "" "\"%s\" omaniku vahetus nurjus:\n" "%s" +msgid "< Default >" +msgstr "< Vaikimisi >" + +msgid "Skins" +msgstr "Nahad" + msgid "Other 8 bit" msgstr "Muu 8-bitine" @@ -1850,12 +1859,6 @@ msgstr "Seadete a&utomaatsalvestus" msgid "Configure options" msgstr "Valikute seadistamine" -msgid "< Default >" -msgstr "< Vaikimisi >" - -msgid "Skins" -msgstr "Nahad" - msgid "Skin:" msgstr "Nahk:" diff --git a/po/eu.po b/po/eu.po index f6d4784ca..17b286b3a 100644 --- a/po/eu.po +++ b/po/eu.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Basque (http://www.transifex.com/projects/p/mc/language/eu/)\n" @@ -349,6 +349,9 @@ msgstr "Apostrofe" msgid "Colon" msgstr "Bi puntu" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Harridura marka" @@ -1738,6 +1741,12 @@ msgstr "" "\"%s\"-ren jabea ezin aldatu (\"chown\")\n" "%s" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Beste 8 bit" @@ -1822,12 +1831,6 @@ msgstr "A&uto gorde ezarpena" msgid "Configure options" msgstr "Konfiguratu aukerak" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/fa.po b/po/fa.po index fa02ec94c..e76a3e41e 100644 --- a/po/fa.po +++ b/po/fa.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Persian (http://www.transifex.com/projects/p/mc/language/" @@ -336,6 +336,9 @@ msgstr "" msgid "Colon" msgstr "دونقطه" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "علامت تعجب" @@ -1680,6 +1683,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "" @@ -1764,12 +1773,6 @@ msgstr "" msgid "Configure options" msgstr "تنظیمات پیکربندی" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/fi.po b/po/fi.po index cb6d37987..caf0a2f55 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Finnish (http://www.transifex.com/projects/p/mc/language/" @@ -340,6 +340,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Varoitus-merkki" @@ -1686,6 +1689,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "" @@ -1770,12 +1779,6 @@ msgstr "" msgid "Configure options" msgstr "" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/fi_FI.po b/po/fi_FI.po index 549e38403..f255b9844 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2013-03-13 08:51+0000\n" "Last-Translator: Slava Zanko \n" "Language-Team: LANGUAGE \n" @@ -350,6 +350,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Varoitus-merkki" @@ -1696,6 +1699,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "" @@ -1780,12 +1789,6 @@ msgstr "" msgid "Configure options" msgstr "" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/fr.po b/po/fr.po index 593a93aab..3898d633a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: French (http://www.transifex.com/projects/p/mc/language/fr/)\n" @@ -343,6 +343,9 @@ msgstr "Apostrophe" msgid "Colon" msgstr "Deux points" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Point d'exclamation" @@ -1714,6 +1717,12 @@ msgstr "" "Ne peut changer l'appartenance de \"%s\"\n" "%s" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Autre 8 bits" @@ -1798,12 +1807,6 @@ msgstr "Enregistrement a&utomatique de la configuration" msgid "Configure options" msgstr "Configurer les options" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/gl.po b/po/gl.po index c04d26aa7..074c1be62 100644 --- a/po/gl.po +++ b/po/gl.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Galician (http://www.transifex.com/projects/p/mc/language/" @@ -355,6 +355,9 @@ msgstr "Apostrofo" msgid "Colon" msgstr "Dous puntos" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Signo de exclamación" @@ -1754,6 +1757,12 @@ msgstr "" "Non é posíbel cambiar o propietario de «%s»\n" "%s" +msgid "< Default >" +msgstr "< Predeterminado >" + +msgid "Skins" +msgstr "Temas" + msgid "Other 8 bit" msgstr "Outro (8 bit)" @@ -1838,12 +1847,6 @@ msgstr "Configuración do &Auto-gardado" msgid "Configure options" msgstr "Configuración" -msgid "< Default >" -msgstr "< Predeterminado >" - -msgid "Skins" -msgstr "Temas" - msgid "Skin:" msgstr "Tema:" diff --git a/po/hr.po b/po/hr.po index 1269c7f5f..7f2c9d56b 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Croatian (http://www.transifex.com/projects/p/mc/language/" @@ -333,6 +333,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "" @@ -1675,6 +1678,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "" @@ -1759,12 +1768,6 @@ msgstr "" msgid "Configure options" msgstr "" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/hu.po b/po/hu.po index df44556d4..bb7821614 100644 --- a/po/hu.po +++ b/po/hu.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/mc/language/" @@ -352,6 +352,9 @@ msgstr "Aposztróf" msgid "Colon" msgstr "Kettőspont" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Felkiáltójel" @@ -1755,6 +1758,12 @@ msgstr "" "\"%s\" tulaja nem állítható\n" "%s" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Egyéb 8 bites" @@ -1839,12 +1848,6 @@ msgstr "Auto &Beállításmentés" msgid "Configure options" msgstr "Alapbeállítások" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/ia.po b/po/ia.po index 3d8220b82..f91e81a5f 100644 --- a/po/ia.po +++ b/po/ia.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/mc/language/" @@ -341,6 +341,9 @@ msgstr "Apostrophe" msgid "Colon" msgstr "Duo punctos" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Signo de exclamation" @@ -1702,6 +1705,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "" @@ -1786,12 +1795,6 @@ msgstr "" msgid "Configure options" msgstr "Configurar optiones" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/id.po b/po/id.po index 63c29deba..15f665aa7 100644 --- a/po/id.po +++ b/po/id.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/mc/language/" @@ -340,6 +340,9 @@ msgstr "Apostrof" msgid "Colon" msgstr "Titik dua" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Tanda seru" @@ -1685,6 +1688,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "" @@ -1769,12 +1778,6 @@ msgstr "" msgid "Configure options" msgstr "" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/it.po b/po/it.po index d7d9a79db..6b6f304c4 100644 --- a/po/it.po +++ b/po/it.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-11-15 20:23+0100\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-11-15 20:24+0100\n" "Last-Translator: Marco Ciampa \n" "Language-Team: Italian (http://www.transifex.com/projects/p/mc/language/" @@ -351,6 +351,9 @@ msgstr "Apostrofo" msgid "Colon" msgstr "Duepunti" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Punto esclamativo" @@ -1767,6 +1770,12 @@ msgstr "" "Impossibile eseguire chown su \"%s\"\n" "%s" +msgid "< Default >" +msgstr "< predefinito >" + +msgid "Skins" +msgstr "Skin" + msgid "Other 8 bit" msgstr "Altre a 8 bit" @@ -1851,12 +1860,6 @@ msgstr "Autosalva &configurazione" msgid "Configure options" msgstr "Configura opzioni" -msgid "< Default >" -msgstr "< predefinito >" - -msgid "Skins" -msgstr "Skin" - msgid "Skin:" msgstr "Skin:" diff --git a/po/ja.po b/po/ja.po index 380220e9e..572ecb6d7 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/mc/language/" @@ -343,6 +343,9 @@ msgstr "アポストロフィ" msgid "Colon" msgstr "コロン" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "感嘆符（！）" @@ -1696,6 +1699,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "別の 8bit" @@ -1780,12 +1789,6 @@ msgstr "自動保存の設定(&U)" msgid "Configure options" msgstr "設定オプション" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/ka.po b/po/ka.po index d92d8f6e4..f38e74390 100644 --- a/po/ka.po +++ b/po/ka.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/mc/language/" @@ -333,6 +333,9 @@ msgstr "აპოსტროფი" msgid "Colon" msgstr "ორი წერტილი" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "ძახილის ნიშანი" @@ -1678,6 +1681,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "" @@ -1762,12 +1771,6 @@ msgstr "" msgid "Configure options" msgstr "" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/kk.po b/po/kk.po index affe1af39..517459e3c 100644 --- a/po/kk.po +++ b/po/kk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Kazakh (http://www.transifex.com/projects/p/mc/language/kk/)\n" @@ -331,6 +331,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "" @@ -1673,6 +1676,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "" @@ -1757,12 +1766,6 @@ msgstr "" msgid "Configure options" msgstr "" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/ko.po b/po/ko.po index c45701ff7..63326be15 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Korean (http://www.transifex.com/projects/p/mc/language/ko/)\n" @@ -336,6 +336,9 @@ msgstr "아포스트로피" msgid "Colon" msgstr "콜론" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "느낌표" @@ -1685,6 +1688,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "다른 8 비트" @@ -1769,12 +1778,6 @@ msgstr "" msgid "Configure options" msgstr "환경설정 선택항목" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/lt.po b/po/lt.po index 9fcce5c1f..995f56e11 100644 --- a/po/lt.po +++ b/po/lt.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/mc/language/" @@ -335,6 +335,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "" @@ -1684,6 +1687,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Kita 8 bitų" @@ -1768,12 +1777,6 @@ msgstr "" msgid "Configure options" msgstr "Nustatymai" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/lv.po b/po/lv.po index 77dbb1717..4c690fa50 100644 --- a/po/lv.po +++ b/po/lv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Latvian (http://www.transifex.com/projects/p/mc/language/" @@ -334,6 +334,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "" @@ -1683,6 +1686,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Citi 8 bitu" @@ -1767,12 +1776,6 @@ msgstr "" msgid "Configure options" msgstr "Konfigurēt opcijas" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/mc.pot b/po/mc.pot index 040b86517..9f258e6ef 100644 --- a/po/mc.pot +++ b/po/mc.pot @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: mc 4.8.13-5-g6b6e80f\n" +"Project-Id-Version: mc 4.8.13-45-g3bb0b4a\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,7 +21,7 @@ msgstr "" msgid "Warning: cannot load codepages list" msgstr "" -#: lib/charsets.c:223 src/filemanager/boxes.c:287 +#: lib/charsets.c:223 src/filemanager/boxes.c:378 msgid "7-bit ASCII" msgstr "" @@ -133,7 +133,7 @@ msgstr "" msgid "No&rmal" msgstr "" -#: lib/search/search.c:53 src/filemanager/find.c:517 +#: lib/search/search.c:53 src/filemanager/find.c:516 msgid "Re&gular expression" msgstr "" @@ -428,115 +428,119 @@ msgid "Colon" msgstr "" #: lib/tty/key.c:177 -msgid "Exclamation mark" +msgid "Semicolon" msgstr "" #: lib/tty/key.c:178 -msgid "Question mark" +msgid "Exclamation mark" msgstr "" #: lib/tty/key.c:179 -msgid "Ampersand" +msgid "Question mark" msgstr "" #: lib/tty/key.c:180 -msgid "Dollar sign" +msgid "Ampersand" msgstr "" #: lib/tty/key.c:181 -msgid "Quotation mark" +msgid "Dollar sign" msgstr "" #: lib/tty/key.c:182 -msgid "Percent sign" +msgid "Quotation mark" msgstr "" #: lib/tty/key.c:183 -msgid "Caret" +msgid "Percent sign" msgstr "" #: lib/tty/key.c:184 -msgid "Tilda" +msgid "Caret" msgstr "" #: lib/tty/key.c:185 -msgid "Prime" +msgid "Tilda" msgstr "" #: lib/tty/key.c:186 -msgid "Underline" +msgid "Prime" msgstr "" #: lib/tty/key.c:187 -msgid "Understrike" +msgid "Underline" msgstr "" #: lib/tty/key.c:188 -msgid "Pipe" +msgid "Understrike" msgstr "" #: lib/tty/key.c:189 -msgid "Left parenthesis" +msgid "Pipe" msgstr "" #: lib/tty/key.c:190 -msgid "Right parenthesis" +msgid "Left parenthesis" msgstr "" #: lib/tty/key.c:191 -msgid "Left bracket" +msgid "Right parenthesis" msgstr "" #: lib/tty/key.c:192 -msgid "Right bracket" +msgid "Left bracket" msgstr "" #: lib/tty/key.c:193 -msgid "Left brace" +msgid "Right bracket" msgstr "" #: lib/tty/key.c:194 -msgid "Right brace" +msgid "Left brace" msgstr "" #: lib/tty/key.c:195 -msgid "Enter" +msgid "Right brace" msgstr "" #: lib/tty/key.c:196 -msgid "Tab key" +msgid "Enter" msgstr "" #: lib/tty/key.c:197 -msgid "Space key" +msgid "Tab key" msgstr "" #: lib/tty/key.c:198 -msgid "Slash key" +msgid "Space key" msgstr "" #: lib/tty/key.c:199 +msgid "Slash key" +msgstr "" + +#: lib/tty/key.c:200 msgid "Backslash key" msgstr "" -#: lib/tty/key.c:200 lib/tty/key.c:201 +#: lib/tty/key.c:201 lib/tty/key.c:202 msgid "Number sign #" msgstr "" #. TRANSLATORS: Please translate as in "at sign" (@). -#: lib/tty/key.c:203 +#: lib/tty/key.c:204 msgid "At sign" msgstr "" -#: lib/tty/key.c:206 lib/tty/key.c:207 +#: lib/tty/key.c:207 lib/tty/key.c:208 msgid "Ctrl" msgstr "" -#: lib/tty/key.c:208 lib/tty/key.c:209 lib/tty/key.c:210 +#: lib/tty/key.c:209 lib/tty/key.c:210 lib/tty/key.c:211 msgid "Alt" msgstr "" -#: lib/tty/key.c:211 +#: lib/tty/key.c:212 msgid "Shift" msgstr "" @@ -582,8 +586,8 @@ msgstr "" #: src/editor/editcmd.c:438 src/editor/editcmd.c:600 src/editor/editcmd.c:1733 #: src/editor/editcmd.c:3455 src/editor/editcmd.c:3484 #: src/editor/editcmd_dialogs.c:479 src/execute.c:135 -#: src/filemanager/file.c:1672 src/filemanager/panel.c:4410 src/help.c:362 -#: src/main.c:406 src/subshell.c:378 src/subshell.c:1053 +#: src/filemanager/file.c:1660 src/filemanager/panel.c:4408 src/help.c:362 +#: src/main.c:410 src/subshell.c:378 src/subshell.c:1053 #: src/viewer/actions_cmd.c:417 msgid "Warning" msgstr "" @@ -668,7 +672,7 @@ msgstr "" msgid "Internal error:" msgstr "" -#: lib/vfs/utilvfs.c:363 src/filemanager/boxes.c:1324 +#: lib/vfs/utilvfs.c:363 src/filemanager/boxes.c:1320 msgid "Password:" msgstr "" @@ -692,11 +696,11 @@ msgstr "" #: lib/widget/listbox.c:309 src/diffviewer/ydiff.c:3098 src/editor/edit.c:359 #: src/editor/editcmd.c:246 src/editor/editcmd.c:269 src/editor/editcmd.c:2856 #: src/editor/editcmd.c:2862 src/filemanager/cmd.c:140 -#: src/filemanager/file.c:730 src/filemanager/file.c:2760 +#: src/filemanager/file.c:719 src/filemanager/file.c:2750 #: src/filemanager/filegui.c:438 src/filemanager/hotlist.c:1121 #: src/filemanager/hotlist.c:1138 src/filemanager/midnight.c:1037 -#: src/filemanager/midnight.c:1045 src/filemanager/panel.c:2769 -#: src/filemanager/tree.c:880 src/subshell.c:1055 src/viewer/actions_cmd.c:614 +#: src/filemanager/midnight.c:1045 src/filemanager/panel.c:2765 +#: src/filemanager/tree.c:875 src/subshell.c:1055 src/viewer/actions_cmd.c:614 #: src/viewer/actions_cmd.c:620 src/viewer/search.c:358 msgid "&Yes" msgstr "" @@ -704,19 +708,19 @@ msgstr "" #: lib/widget/listbox.c:309 src/diffviewer/ydiff.c:3098 src/editor/edit.c:359 #: src/editor/editcmd.c:246 src/editor/editcmd.c:2856 #: src/editor/editcmd.c:2862 src/filemanager/cmd.c:140 -#: src/filemanager/file.c:730 src/filemanager/file.c:2760 +#: src/filemanager/file.c:719 src/filemanager/file.c:2750 #: src/filemanager/filegui.c:440 src/filemanager/hotlist.c:1121 #: src/filemanager/hotlist.c:1138 src/filemanager/midnight.c:1037 -#: src/filemanager/midnight.c:1045 src/filemanager/panel.c:2769 -#: src/filemanager/tree.c:880 src/subshell.c:1055 src/viewer/actions_cmd.c:614 +#: src/filemanager/midnight.c:1045 src/filemanager/panel.c:2765 +#: src/filemanager/tree.c:875 src/subshell.c:1055 src/viewer/actions_cmd.c:614 #: src/viewer/actions_cmd.c:620 src/viewer/search.c:359 msgid "&No" msgstr "" #: lib/widget/quick.h:215 src/editor/editcmd.c:2722 #: src/editor/editcmd_dialogs.c:121 src/editor/editwidget.c:149 -#: src/filemanager/boxes.c:1246 src/filemanager/filegui.c:1246 -#: src/filemanager/find.c:525 src/filemanager/layout.c:460 src/subshell.c:381 +#: src/filemanager/boxes.c:1242 src/filemanager/filegui.c:1246 +#: src/filemanager/find.c:524 src/filemanager/layout.c:460 src/subshell.c:381 msgid "&OK" msgstr "" @@ -728,18 +732,18 @@ msgstr "" #: src/editor/editcmd_dialogs.c:481 src/editor/spell_dialogs.c:99 #: src/filemanager/achown.c:96 src/filemanager/chmod.c:125 #: src/filemanager/chown.c:91 src/filemanager/cmd.c:1159 -#: src/filemanager/filegui.c:1250 src/filemanager/find.c:525 +#: src/filemanager/filegui.c:1250 src/filemanager/find.c:524 #: src/filemanager/hotlist.c:191 src/filemanager/hotlist.c:977 #: src/filemanager/hotlist.c:1039 src/filemanager/layout.c:461 #: src/filemanager/panelize.c:143 src/learn.c:254 src/viewer/hex.c:407 msgid "&Cancel" msgstr "" -#: lib/widget/wtools.c:166 +#: lib/widget/wtools.c:164 msgid "Background process:" msgstr "" -#: lib/widget/wtools.c:287 lib/widget/wtools.c:414 src/editor/edit.c:194 +#: lib/widget/wtools.c:285 lib/widget/wtools.c:412 src/editor/edit.c:194 #: src/editor/edit.c:215 src/editor/edit.c:371 src/editor/edit.c:1964 #: src/editor/edit.c:1974 src/editor/editcmd.c:331 src/editor/editcmd.c:341 #: src/editor/editcmd.c:382 src/editor/editcmd.c:2958 src/editor/spell.c:317 @@ -749,14 +753,14 @@ msgstr "" msgid "Error" msgstr "" -#: lib/widget/wtools.c:445 +#: lib/widget/wtools.c:443 #, c-format msgid "%d: %s" msgstr "" -#: lib/widget/wtools.c:684 src/filemanager/file.c:648 -#: src/filemanager/file.c:688 src/filemanager/file.c:730 -#: src/filemanager/file.c:2492 src/filemanager/filegui.c:260 +#: lib/widget/wtools.c:683 src/filemanager/file.c:637 +#: src/filemanager/file.c:677 src/filemanager/file.c:719 +#: src/filemanager/file.c:2482 src/filemanager/filegui.c:260 #: src/filemanager/filegui.c:456 msgid "&Abort" msgstr "" @@ -927,7 +931,7 @@ msgstr "" msgid "GNU Midnight Commander %s\n" msgstr "" -#: src/args.c:596 src/filemanager/boxes.c:672 +#: src/args.c:596 src/filemanager/boxes.c:668 msgid "Main options" msgstr "" @@ -947,8 +951,8 @@ msgstr "" msgid "Two files are required to evoke the diffviewer." msgstr "" -#: src/background.c:213 src/background.c:287 src/filemanager/file.c:645 -#: src/filemanager/file.c:686 +#: src/background.c:213 src/background.c:287 src/filemanager/file.c:634 +#: src/filemanager/file.c:675 msgid "Background process error" msgstr "" @@ -987,8 +991,8 @@ msgid "Enter search string:" msgstr "" #: src/diffviewer/search.c:92 src/editor/editcmd_dialogs.c:112 -#: src/editor/editcmd_dialogs.c:212 src/filemanager/boxes.c:665 -#: src/filemanager/boxes.c:864 src/filemanager/find.c:511 +#: src/editor/editcmd_dialogs.c:212 src/filemanager/boxes.c:661 +#: src/filemanager/boxes.c:860 src/filemanager/find.c:510 #: src/viewer/dialogs.c:97 msgid "Cas&e sensitive" msgstr "" @@ -999,13 +1003,13 @@ msgid "&Backwards" msgstr "" #: src/diffviewer/search.c:94 src/editor/editcmd_dialogs.c:115 -#: src/editor/editcmd_dialogs.c:215 src/filemanager/find.c:522 +#: src/editor/editcmd_dialogs.c:215 src/filemanager/find.c:521 #: src/viewer/dialogs.c:99 msgid "&Whole words" msgstr "" #: src/diffviewer/search.c:96 src/editor/editcmd_dialogs.c:117 -#: src/editor/editcmd_dialogs.c:217 src/filemanager/find.c:509 +#: src/editor/editcmd_dialogs.c:217 src/filemanager/find.c:508 #: src/viewer/dialogs.c:101 msgid "&All charsets" msgstr "" @@ -1106,7 +1110,7 @@ msgid "Enter line:" msgstr "" #: src/diffviewer/ydiff.c:2952 src/editor/editwidget.c:976 -#: src/filemanager/midnight.c:1642 src/filemanager/tree.c:1211 src/help.c:1145 +#: src/filemanager/midnight.c:1642 src/filemanager/tree.c:1206 src/help.c:1145 #: src/viewer/display.c:85 msgid "ButtonBar|Help" msgstr "" @@ -1166,7 +1170,7 @@ msgid "\"%s\" is a directory" msgstr "" #: src/diffviewer/ydiff.c:3576 src/diffviewer/ydiff.c:3593 -#: src/filemanager/file.c:2660 src/viewer/mcviewer.c:341 +#: src/filemanager/file.c:2650 src/viewer/mcviewer.c:341 #, c-format msgid "" "Cannot stat \"%s\"\n" @@ -1181,15 +1185,15 @@ msgstr "" msgid "Two files are needed to compare" msgstr "" -#: src/editor/choosesyntax.c:75 +#: src/editor/choosesyntax.c:76 msgid "Choose syntax highlighting" msgstr "" -#: src/editor/choosesyntax.c:76 +#: src/editor/choosesyntax.c:77 msgid "< Auto >" msgstr "" -#: src/editor/choosesyntax.c:77 +#: src/editor/choosesyntax.c:78 msgid "< Reload Current Syntax >" msgstr "" @@ -1248,7 +1252,7 @@ msgstr "" msgid "Searching %s: %3d%%" msgstr "" -#: src/editor/editcmd.c:141 src/filemanager/find.c:1311 src/viewer/search.c:85 +#: src/editor/editcmd.c:141 src/filemanager/find.c:1310 src/viewer/search.c:85 #, c-format msgid "Searching %s" msgstr "" @@ -1602,14 +1606,14 @@ msgstr "" msgid "&Replace" msgstr "" -#: src/editor/editcmd_dialogs.c:283 src/filemanager/file.c:730 +#: src/editor/editcmd_dialogs.c:283 src/filemanager/file.c:719 #: src/filemanager/filegui.c:448 msgid "A&ll" msgstr "" #: src/editor/editcmd_dialogs.c:284 src/editor/spell_dialogs.c:97 -#: src/filemanager/file.c:648 src/filemanager/file.c:688 -#: src/filemanager/file.c:2493 src/filemanager/filegui.c:257 +#: src/filemanager/file.c:637 src/filemanager/file.c:677 +#: src/filemanager/file.c:2483 src/filemanager/filegui.c:257 msgid "&Skip" msgstr "" @@ -1703,7 +1707,7 @@ msgstr "" msgid "Mo&ve" msgstr "" -#: src/editor/editmenu.c:112 src/filemanager/file.c:1955 +#: src/editor/editmenu.c:112 src/filemanager/file.c:1946 #: src/filemanager/midnight.c:256 msgid "&Delete" msgstr "" @@ -1960,7 +1964,7 @@ msgstr "" msgid "Tab spacing:" msgstr "" -#: src/editor/editoptions.c:163 src/filemanager/boxes.c:468 +#: src/editor/editoptions.c:163 src/filemanager/boxes.c:559 #: src/filemanager/layout.c:453 msgid "Other options" msgstr "" @@ -2044,7 +2048,7 @@ msgid "ButtonBar|Replac" msgstr "" #: src/editor/editwidget.c:980 src/filemanager/midnight.c:1646 -#: src/filemanager/tree.c:1216 +#: src/filemanager/tree.c:1211 msgid "ButtonBar|Copy" msgstr "" @@ -2180,18 +2184,18 @@ msgstr "" msgid "Select language" msgstr "" -#: src/editor/syntax.c:1502 src/editor/syntax.c:1508 +#: src/editor/syntax.c:1500 src/editor/syntax.c:1506 msgid "Load syntax file" msgstr "" -#: src/editor/syntax.c:1503 src/filemanager/usermenu.c:946 src/help.c:1086 +#: src/editor/syntax.c:1501 src/filemanager/usermenu.c:946 src/help.c:1086 #, c-format msgid "" "Cannot open file %s\n" "%s" msgstr "" -#: src/editor/syntax.c:1509 +#: src/editor/syntax.c:1507 #, c-format msgid "Error in file %s on line %d" msgstr "" @@ -2272,224 +2276,224 @@ msgid "" "%s" msgstr "" -#: src/filemanager/boxes.c:282 src/filemanager/boxes.c:984 +#: src/filemanager/boxes.c:178 +msgid "< Default >" +msgstr "" + +#: src/filemanager/boxes.c:200 +msgid "Skins" +msgstr "" + +#: src/filemanager/boxes.c:373 src/filemanager/boxes.c:980 #: src/selcodepage.c:101 msgid "Other 8 bit" msgstr "" -#: src/filemanager/boxes.c:365 +#: src/filemanager/boxes.c:456 msgid "Running" msgstr "" -#: src/filemanager/boxes.c:366 src/filemanager/find.c:1527 +#: src/filemanager/boxes.c:457 src/filemanager/find.c:1526 msgid "Stopped" msgstr "" -#: src/filemanager/boxes.c:433 +#: src/filemanager/boxes.c:524 msgid "&Never" msgstr "" -#: src/filemanager/boxes.c:434 +#: src/filemanager/boxes.c:525 msgid "On dum&b terminals" msgstr "" -#: src/filemanager/boxes.c:435 +#: src/filemanager/boxes.c:526 msgid "Alwa&ys" msgstr "" -#: src/filemanager/boxes.c:449 +#: src/filemanager/boxes.c:540 msgid "File operations" msgstr "" -#: src/filemanager/boxes.c:450 +#: src/filemanager/boxes.c:541 msgid "&Verbose operation" msgstr "" -#: src/filemanager/boxes.c:451 +#: src/filemanager/boxes.c:542 msgid "Compute tota&ls" msgstr "" -#: src/filemanager/boxes.c:452 +#: src/filemanager/boxes.c:543 msgid "Classic pro&gressbar" msgstr "" -#: src/filemanager/boxes.c:453 +#: src/filemanager/boxes.c:544 msgid "Mkdi&r autoname" msgstr "" -#: src/filemanager/boxes.c:454 +#: src/filemanager/boxes.c:545 msgid "&Preallocate space" msgstr "" -#: src/filemanager/boxes.c:457 +#: src/filemanager/boxes.c:548 msgid "Esc key mode" msgstr "" -#: src/filemanager/boxes.c:458 +#: src/filemanager/boxes.c:549 msgid "S&ingle press" msgstr "" -#: src/filemanager/boxes.c:459 +#: src/filemanager/boxes.c:550 msgid "Timeout:" msgstr "" -#: src/filemanager/boxes.c:464 +#: src/filemanager/boxes.c:555 msgid "Pause after run" msgstr "" -#: src/filemanager/boxes.c:469 +#: src/filemanager/boxes.c:560 msgid "Use internal edi&t" msgstr "" -#: src/filemanager/boxes.c:470 +#: src/filemanager/boxes.c:561 msgid "Use internal vie&w" msgstr "" -#: src/filemanager/boxes.c:471 +#: src/filemanager/boxes.c:562 msgid "A&sk new file name" msgstr "" -#: src/filemanager/boxes.c:473 +#: src/filemanager/boxes.c:564 msgid "Auto m&enus" msgstr "" -#: src/filemanager/boxes.c:474 +#: src/filemanager/boxes.c:565 msgid "&Drop down menus" msgstr "" -#: src/filemanager/boxes.c:475 +#: src/filemanager/boxes.c:566 msgid "S&hell patterns" msgstr "" -#: src/filemanager/boxes.c:476 +#: src/filemanager/boxes.c:567 msgid "Co&mplete: show all" msgstr "" -#: src/filemanager/boxes.c:478 +#: src/filemanager/boxes.c:569 msgid "Rotating d&ash" msgstr "" -#: src/filemanager/boxes.c:479 +#: src/filemanager/boxes.c:570 msgid "Cd follows lin&ks" msgstr "" -#: src/filemanager/boxes.c:480 +#: src/filemanager/boxes.c:571 msgid "Sa&fe delete" msgstr "" -#: src/filemanager/boxes.c:481 +#: src/filemanager/boxes.c:572 msgid "A&uto save setup" msgstr "" -#: src/filemanager/boxes.c:494 +#: src/filemanager/boxes.c:585 msgid "Configure options" msgstr "" -#: src/filemanager/boxes.c:547 -msgid "< Default >" -msgstr "" - -#: src/filemanager/boxes.c:569 -msgid "Skins" -msgstr "" - -#: src/filemanager/boxes.c:626 +#: src/filemanager/boxes.c:622 msgid "Skin:" msgstr "" -#: src/filemanager/boxes.c:638 +#: src/filemanager/boxes.c:634 msgid "Appearance" msgstr "" -#: src/filemanager/boxes.c:664 +#: src/filemanager/boxes.c:660 msgid "Case &insensitive" msgstr "" -#: src/filemanager/boxes.c:666 +#: src/filemanager/boxes.c:662 msgid "Use panel sort mo&de" msgstr "" -#: src/filemanager/boxes.c:673 +#: src/filemanager/boxes.c:669 msgid "Show mi&ni-status" msgstr "" -#: src/filemanager/boxes.c:674 +#: src/filemanager/boxes.c:670 msgid "Use SI si&ze units" msgstr "" -#: src/filemanager/boxes.c:675 +#: src/filemanager/boxes.c:671 msgid "Mi&x all files" msgstr "" -#: src/filemanager/boxes.c:676 +#: src/filemanager/boxes.c:672 msgid "Show &backup files" msgstr "" -#: src/filemanager/boxes.c:677 +#: src/filemanager/boxes.c:673 msgid "Show &hidden files" msgstr "" -#: src/filemanager/boxes.c:678 +#: src/filemanager/boxes.c:674 msgid "&Fast dir reload" msgstr "" -#: src/filemanager/boxes.c:679 +#: src/filemanager/boxes.c:675 msgid "Ma&rk moves down" msgstr "" -#: src/filemanager/boxes.c:680 +#: src/filemanager/boxes.c:676 msgid "Re&verse files only" msgstr "" -#: src/filemanager/boxes.c:682 +#: src/filemanager/boxes.c:678 msgid "Simple s&wap" msgstr "" -#: src/filemanager/boxes.c:683 +#: src/filemanager/boxes.c:679 msgid "A&uto save panels setup" msgstr "" -#: src/filemanager/boxes.c:689 +#: src/filemanager/boxes.c:685 msgid "Navigation" msgstr "" -#: src/filemanager/boxes.c:690 +#: src/filemanager/boxes.c:686 msgid "L&ynx-like motion" msgstr "" -#: src/filemanager/boxes.c:692 +#: src/filemanager/boxes.c:688 msgid "Pa&ge scrolling" msgstr "" -#: src/filemanager/boxes.c:693 +#: src/filemanager/boxes.c:689 msgid "&Mouse page scrolling" msgstr "" -#: src/filemanager/boxes.c:696 +#: src/filemanager/boxes.c:692 msgid "File highlight" msgstr "" -#: src/filemanager/boxes.c:697 +#: src/filemanager/boxes.c:693 msgid "File &types" msgstr "" -#: src/filemanager/boxes.c:698 +#: src/filemanager/boxes.c:694 msgid "&Permissions" msgstr "" -#: src/filemanager/boxes.c:700 +#: src/filemanager/boxes.c:696 msgid "Quick search" msgstr "" -#: src/filemanager/boxes.c:712 +#: src/filemanager/boxes.c:708 msgid "Panel options" msgstr "" -#: src/filemanager/boxes.c:725 src/filemanager/info.c:83 +#: src/filemanager/boxes.c:721 src/filemanager/info.c:83 msgid "Information" msgstr "" -#: src/filemanager/boxes.c:726 +#: src/filemanager/boxes.c:722 msgid "" "Using the fast reload option may not reflect the exact\n" "directory contents. In this case you'll need to do a\n" @@ -2497,185 +2501,185 @@ msgid "" "the details." msgstr "" -#: src/filemanager/boxes.c:774 +#: src/filemanager/boxes.c:770 msgid "&Full file list" msgstr "" -#: src/filemanager/boxes.c:775 +#: src/filemanager/boxes.c:771 msgid "&Brief file list" msgstr "" -#: src/filemanager/boxes.c:776 +#: src/filemanager/boxes.c:772 msgid "&Long file list" msgstr "" -#: src/filemanager/boxes.c:777 +#: src/filemanager/boxes.c:773 msgid "&User defined:" msgstr "" -#: src/filemanager/boxes.c:786 +#: src/filemanager/boxes.c:782 msgid "User &mini status" msgstr "" -#: src/filemanager/boxes.c:796 +#: src/filemanager/boxes.c:792 msgid "Listing mode" msgstr "" -#: src/filemanager/boxes.c:863 +#: src/filemanager/boxes.c:859 msgid "Executable &first" msgstr "" -#: src/filemanager/boxes.c:865 +#: src/filemanager/boxes.c:861 msgid "&Reverse" msgstr "" -#: src/filemanager/boxes.c:874 +#: src/filemanager/boxes.c:870 msgid "Sort order" msgstr "" #. TRANSLATORS: no need to translate 'Confirmation', it's just a context prefix -#: src/filemanager/boxes.c:898 +#: src/filemanager/boxes.c:894 msgid "Confirmation|&Delete" msgstr "" -#: src/filemanager/boxes.c:899 +#: src/filemanager/boxes.c:895 msgid "Confirmation|O&verwrite" msgstr "" -#: src/filemanager/boxes.c:900 +#: src/filemanager/boxes.c:896 msgid "Confirmation|&Execute" msgstr "" -#: src/filemanager/boxes.c:901 +#: src/filemanager/boxes.c:897 msgid "Confirmation|E&xit" msgstr "" -#: src/filemanager/boxes.c:902 +#: src/filemanager/boxes.c:898 msgid "Confirmation|Di&rectory hotlist delete" msgstr "" -#: src/filemanager/boxes.c:904 +#: src/filemanager/boxes.c:900 msgid "Confirmation|&History cleanup" msgstr "" -#: src/filemanager/boxes.c:913 src/filemanager/cmd.c:139 +#: src/filemanager/boxes.c:909 src/filemanager/cmd.c:139 msgid "Confirmation" msgstr "" -#: src/filemanager/boxes.c:930 +#: src/filemanager/boxes.c:926 msgid "&UTF-8 output" msgstr "" -#: src/filemanager/boxes.c:931 +#: src/filemanager/boxes.c:927 msgid "&Full 8 bits output" msgstr "" -#: src/filemanager/boxes.c:932 +#: src/filemanager/boxes.c:928 msgid "&ISO 8859-1" msgstr "" -#: src/filemanager/boxes.c:933 +#: src/filemanager/boxes.c:929 msgid "7 &bits" msgstr "" -#: src/filemanager/boxes.c:940 src/filemanager/boxes.c:998 +#: src/filemanager/boxes.c:936 src/filemanager/boxes.c:994 msgid "F&ull 8 bits input" msgstr "" -#: src/filemanager/boxes.c:948 src/filemanager/boxes.c:1006 +#: src/filemanager/boxes.c:944 src/filemanager/boxes.c:1002 msgid "Display bits" msgstr "" -#: src/filemanager/boxes.c:993 +#: src/filemanager/boxes.c:989 msgid "Input / display codepage:" msgstr "" -#: src/filemanager/boxes.c:1055 src/filemanager/tree.c:1171 +#: src/filemanager/boxes.c:1051 src/filemanager/tree.c:1166 msgid "Directory tree" msgstr "" -#: src/filemanager/boxes.c:1103 +#: src/filemanager/boxes.c:1099 msgid "Timeout for freeing VFSs (sec):" msgstr "" -#: src/filemanager/boxes.c:1108 +#: src/filemanager/boxes.c:1104 msgid "FTP anonymous password:" msgstr "" -#: src/filemanager/boxes.c:1111 +#: src/filemanager/boxes.c:1107 msgid "FTP directory cache timeout (sec):" msgstr "" -#: src/filemanager/boxes.c:1114 +#: src/filemanager/boxes.c:1110 msgid "&Always use ftp proxy:" msgstr "" -#: src/filemanager/boxes.c:1118 +#: src/filemanager/boxes.c:1114 msgid "&Use ~/.netrc" msgstr "" -#: src/filemanager/boxes.c:1119 +#: src/filemanager/boxes.c:1115 msgid "Use &passive mode" msgstr "" -#: src/filemanager/boxes.c:1120 +#: src/filemanager/boxes.c:1116 msgid "Use passive mode over pro&xy" msgstr "" -#: src/filemanager/boxes.c:1130 +#: src/filemanager/boxes.c:1126 msgid "Virtual File System Setting" msgstr "" -#: src/filemanager/boxes.c:1179 +#: src/filemanager/boxes.c:1175 msgid "cd" msgstr "" -#: src/filemanager/boxes.c:1186 +#: src/filemanager/boxes.c:1182 msgid "Quick cd" msgstr "" -#: src/filemanager/boxes.c:1201 +#: src/filemanager/boxes.c:1197 msgid "Existing filename (filename symlink will point to):" msgstr "" -#: src/filemanager/boxes.c:1205 +#: src/filemanager/boxes.c:1201 msgid "Symbolic link filename:" msgstr "" -#: src/filemanager/boxes.c:1215 +#: src/filemanager/boxes.c:1211 msgid "Symbolic link" msgstr "" -#: src/filemanager/boxes.c:1243 +#: src/filemanager/boxes.c:1239 msgid "&Stop" msgstr "" -#: src/filemanager/boxes.c:1244 +#: src/filemanager/boxes.c:1240 msgid "&Resume" msgstr "" -#: src/filemanager/boxes.c:1245 +#: src/filemanager/boxes.c:1241 msgid "&Kill" msgstr "" -#: src/filemanager/boxes.c:1274 +#: src/filemanager/boxes.c:1270 msgid "Background jobs" msgstr "" -#: src/filemanager/boxes.c:1310 +#: src/filemanager/boxes.c:1306 #, c-format msgid "Password for \\\\%s\\%s" msgstr "" -#: src/filemanager/boxes.c:1320 +#: src/filemanager/boxes.c:1316 msgid "Domain:" msgstr "" -#: src/filemanager/boxes.c:1322 +#: src/filemanager/boxes.c:1318 msgid "Username:" msgstr "" -#: src/filemanager/boxes.c:1339 +#: src/filemanager/boxes.c:1335 msgid "SMB authentication" msgstr "" @@ -2817,7 +2821,7 @@ msgid "Files tagged, want to cd?" msgstr "" #: src/filemanager/cmd.c:147 src/filemanager/cmd.c:1142 -#: src/filemanager/panel.c:2744 src/filemanager/panel.c:3332 +#: src/filemanager/panel.c:2740 src/filemanager/panel.c:3330 msgid "Cannot change directory" msgstr "" @@ -2848,7 +2852,7 @@ msgstr "" msgid "symlink: %s" msgstr "" -#: src/filemanager/cmd.c:460 src/filemanager/panel.c:4704 +#: src/filemanager/cmd.c:460 src/filemanager/panel.c:4702 #, c-format msgid "Cannot chdir to \"%s\"" msgstr "" @@ -2985,7 +2989,7 @@ msgid "" msgstr "" #: src/filemanager/cmd.c:1518 src/filemanager/cmd.c:1553 -#: src/filemanager/file.c:1344 +#: src/filemanager/file.c:1333 msgid "Directory scanning" msgstr "" @@ -3007,8 +3011,8 @@ msgstr "" msgid "Cannot execute commands on non-local filesystems" msgstr "" -#: src/filemanager/command.c:454 src/filemanager/panel.c:3610 -#: src/filemanager/tree.c:591 +#: src/filemanager/command.c:454 src/filemanager/panel.c:3608 +#: src/filemanager/tree.c:586 #, c-format msgid "" "Cannot chdir to \"%s\"\n" @@ -3055,17 +3059,17 @@ msgid "" "to copy it from %smc.ext or use that file as an example of how to write it." msgstr "" -#: src/filemanager/file.c:95 src/filemanager/file.c:1953 -#: src/filemanager/tree.c:772 +#: src/filemanager/file.c:95 src/filemanager/file.c:1945 +#: src/filemanager/tree.c:767 msgid "DialogTitle|Copy" msgstr "" -#: src/filemanager/file.c:96 src/filemanager/tree.c:811 +#: src/filemanager/file.c:96 src/filemanager/tree.c:806 msgid "DialogTitle|Move" msgstr "" #: src/filemanager/file.c:97 src/filemanager/hotlist.c:1120 -#: src/filemanager/hotlist.c:1137 src/filemanager/tree.c:880 +#: src/filemanager/hotlist.c:1137 src/filemanager/tree.c:875 msgid "DialogTitle|Delete" msgstr "" @@ -3141,22 +3145,22 @@ msgid "" "%s" msgstr "" -#: src/filemanager/file.c:688 +#: src/filemanager/file.c:677 msgid "Ski&p all" msgstr "" -#: src/filemanager/file.c:688 src/viewer/hex.c:407 +#: src/filemanager/file.c:677 src/viewer/hex.c:407 msgid "&Retry" msgstr "" -#: src/filemanager/file.c:721 +#: src/filemanager/file.c:710 #, c-format msgid "" "Directory \"%s\" not empty.\n" "Delete it recursively?" msgstr "" -#: src/filemanager/file.c:722 +#: src/filemanager/file.c:711 #, c-format msgid "" "Background process:\n" @@ -3164,18 +3168,18 @@ msgid "" "Delete it recursively?" msgstr "" -#: src/filemanager/file.c:730 src/filemanager/filegui.c:452 +#: src/filemanager/file.c:719 src/filemanager/filegui.c:452 msgid "Non&e" msgstr "" -#: src/filemanager/file.c:956 +#: src/filemanager/file.c:945 #, c-format msgid "" "Cannot stat file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:969 src/filemanager/file.c:1572 +#: src/filemanager/file.c:958 src/filemanager/file.c:1560 #, c-format msgid "" "\"%s\"\n" @@ -3184,198 +3188,198 @@ msgid "" "are the same file" msgstr "" -#: src/filemanager/file.c:975 +#: src/filemanager/file.c:964 #, c-format msgid "Cannot overwrite directory \"%s\"" msgstr "" -#: src/filemanager/file.c:1020 +#: src/filemanager/file.c:1009 #, c-format msgid "" "Cannot move file \"%s\" to \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1052 +#: src/filemanager/file.c:1041 #, c-format msgid "" "Cannot remove file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1098 +#: src/filemanager/file.c:1087 #, c-format msgid "" "Cannot delete file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1171 src/filemanager/file.c:1231 -#: src/filemanager/file.c:2473 +#: src/filemanager/file.c:1160 src/filemanager/file.c:1220 +#: src/filemanager/file.c:2463 #, c-format msgid "" "Cannot remove directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1539 src/filemanager/file.c:2361 +#: src/filemanager/file.c:1527 src/filemanager/file.c:2351 #, c-format msgid "" "Cannot overwrite directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1558 +#: src/filemanager/file.c:1546 #, c-format msgid "" "Cannot stat source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1609 +#: src/filemanager/file.c:1597 #, c-format msgid "" "Cannot create special file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1621 src/filemanager/file.c:1966 +#: src/filemanager/file.c:1609 src/filemanager/file.c:1956 #, c-format msgid "" "Cannot chown target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1636 src/filemanager/file.c:1986 +#: src/filemanager/file.c:1624 src/filemanager/file.c:1976 #, c-format msgid "" "Cannot chmod target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1657 +#: src/filemanager/file.c:1645 #, c-format msgid "" "Cannot open source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1672 +#: src/filemanager/file.c:1660 msgid "Reget failed, about to overwrite file" msgstr "" -#: src/filemanager/file.c:1684 +#: src/filemanager/file.c:1672 #, c-format msgid "" "Cannot fstat source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1722 +#: src/filemanager/file.c:1710 #, c-format msgid "" "Cannot create target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1744 +#: src/filemanager/file.c:1732 #, c-format msgid "" "Cannot fstat target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1764 +#: src/filemanager/file.c:1752 #, c-format msgid "" "Cannot preallocate space for target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1808 +#: src/filemanager/file.c:1807 #, c-format msgid "" "Cannot read source file\"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1849 +#: src/filemanager/file.c:1850 #, c-format msgid "" "Cannot write target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1888 +#: src/filemanager/file.c:1885 msgid "(stalled)" msgstr "" -#: src/filemanager/file.c:1924 +#: src/filemanager/file.c:1921 #, c-format msgid "" "Cannot close source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1936 +#: src/filemanager/file.c:1933 #, c-format msgid "" "Cannot close target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1954 +#: src/filemanager/file.c:1945 msgid "Incomplete file was retrieved. Keep it?" msgstr "" -#: src/filemanager/file.c:1955 +#: src/filemanager/file.c:1946 msgid "&Keep" msgstr "" -#: src/filemanager/file.c:2051 +#: src/filemanager/file.c:2041 #, c-format msgid "" "Cannot stat source directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2085 +#: src/filemanager/file.c:2075 #, c-format msgid "" "Source \"%s\" is not a directory\n" "%s" msgstr "" -#: src/filemanager/file.c:2097 +#: src/filemanager/file.c:2087 #, c-format msgid "" "Cannot copy cyclic symbolic link\n" "\"%s\"" msgstr "" -#: src/filemanager/file.c:2135 src/filemanager/file.c:2939 -#: src/filemanager/tree.c:826 +#: src/filemanager/file.c:2125 src/filemanager/file.c:2929 +#: src/filemanager/tree.c:821 #, c-format msgid "" "Destination \"%s\" must be a directory\n" "%s" msgstr "" -#: src/filemanager/file.c:2167 +#: src/filemanager/file.c:2157 #, c-format msgid "" "Cannot create target directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2191 +#: src/filemanager/file.c:2181 #, c-format msgid "" "Cannot chown target directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2325 +#: src/filemanager/file.c:2315 #, c-format msgid "" "\"%s\"\n" @@ -3384,30 +3388,30 @@ msgid "" "are the same directory" msgstr "" -#: src/filemanager/file.c:2363 +#: src/filemanager/file.c:2353 #, c-format msgid "" "Cannot overwrite file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2384 +#: src/filemanager/file.c:2374 #, c-format msgid "" "Cannot move directory \"%s\" to \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2534 +#: src/filemanager/file.c:2524 #, c-format msgid "Directories: %zd, total size: %s" msgstr "" -#: src/filemanager/file.c:2652 +#: src/filemanager/file.c:2642 msgid "Cannot operate on \"..\"!" msgstr "" -#: src/filemanager/file.c:2782 +#: src/filemanager/file.c:2772 msgid "Sorry, I could not put the job in background" msgstr "" @@ -3542,8 +3546,8 @@ msgstr "" msgid "Deleting" msgstr "" -#: src/filemanager/filegui.c:1233 src/filemanager/find.c:507 -#: src/filemanager/panel.c:2479 +#: src/filemanager/filegui.c:1233 src/filemanager/find.c:506 +#: src/filemanager/panel.c:2475 msgid "&Using shell patterns" msgstr "" @@ -3596,80 +3600,80 @@ msgstr "" msgid "&Edit - F4" msgstr "" -#: src/filemanager/find.c:371 +#: src/filemanager/find.c:370 #, c-format msgid "Found: %ld" msgstr "" -#: src/filemanager/find.c:455 src/filemanager/find.c:465 +#: src/filemanager/find.c:454 src/filemanager/find.c:464 msgid "Malformed regular expression" msgstr "" -#: src/filemanager/find.c:505 +#: src/filemanager/find.c:504 msgid "File name:" msgstr "" -#: src/filemanager/find.c:506 +#: src/filemanager/find.c:505 msgid "&Find recursively" msgstr "" -#: src/filemanager/find.c:512 +#: src/filemanager/find.c:511 msgid "S&kip hidden" msgstr "" -#: src/filemanager/find.c:515 +#: src/filemanager/find.c:514 msgid "Content:" msgstr "" -#: src/filemanager/find.c:516 +#: src/filemanager/find.c:515 msgid "Sea&rch for content" msgstr "" -#: src/filemanager/find.c:518 +#: src/filemanager/find.c:517 msgid "Case sens&itive" msgstr "" -#: src/filemanager/find.c:520 +#: src/filemanager/find.c:519 msgid "A&ll charsets" msgstr "" -#: src/filemanager/find.c:523 +#: src/filemanager/find.c:522 msgid "Fir&st hit" msgstr "" -#: src/filemanager/find.c:525 src/filemanager/midnight.c:203 +#: src/filemanager/find.c:524 src/filemanager/midnight.c:203 msgid "&Tree" msgstr "" -#: src/filemanager/find.c:603 src/filemanager/find.c:1593 +#: src/filemanager/find.c:602 src/filemanager/find.c:1592 msgid "Find File" msgstr "" -#: src/filemanager/find.c:610 +#: src/filemanager/find.c:609 msgid "Start at:" msgstr "" -#: src/filemanager/find.c:619 +#: src/filemanager/find.c:618 msgid "Ena&ble ignore directories:" msgstr "" -#: src/filemanager/find.c:1014 src/filemanager/find.c:1098 +#: src/filemanager/find.c:1013 src/filemanager/find.c:1097 #, c-format msgid "Grepping in %s" msgstr "" -#: src/filemanager/find.c:1276 +#: src/filemanager/find.c:1275 msgid "Finished" msgstr "" -#: src/filemanager/find.c:1281 +#: src/filemanager/find.c:1280 #, c-format msgid "Finished (ignored %zd directory)" msgid_plural "Finished (ignored %zd directories)" msgstr[0] "" msgstr[1] "" -#: src/filemanager/find.c:1527 src/filemanager/find.c:1607 +#: src/filemanager/find.c:1526 src/filemanager/find.c:1606 msgid "Searching" msgstr "" @@ -4186,7 +4190,7 @@ msgstr[0] "" msgstr[1] "" #: src/filemanager/midnight.c:1037 src/filemanager/midnight.c:1043 -#: src/filemanager/panel.c:2768 +#: src/filemanager/panel.c:2764 msgid "The Midnight Commander" msgstr "" @@ -4218,15 +4222,15 @@ msgstr "" msgid "ButtonBar|View" msgstr "" -#: src/filemanager/midnight.c:1647 src/filemanager/tree.c:1217 +#: src/filemanager/midnight.c:1647 src/filemanager/tree.c:1212 msgid "ButtonBar|RenMov" msgstr "" -#: src/filemanager/midnight.c:1648 src/filemanager/tree.c:1220 +#: src/filemanager/midnight.c:1648 src/filemanager/tree.c:1215 msgid "ButtonBar|Mkdir" msgstr "" -#: src/filemanager/mountlist.c:882 +#: src/filemanager/mountlist.c:934 msgid "Memory exhausted!" msgstr "" @@ -4352,7 +4356,7 @@ msgstr "" msgid "[dev]" msgstr "" -#: src/filemanager/panel.c:505 src/filemanager/panel.c:1020 +#: src/filemanager/panel.c:505 src/filemanager/panel.c:1016 msgid "UP--DIR" msgstr "" @@ -4364,53 +4368,53 @@ msgstr "" msgid "SUB-DIR" msgstr "" -#: src/filemanager/panel.c:1012 +#: src/filemanager/panel.c:1008 msgid "" msgstr "" -#: src/filemanager/panel.c:1076 +#: src/filemanager/panel.c:1072 #, c-format msgid "%s byte" msgid_plural "%s bytes" msgstr[0] "" msgstr[1] "" -#: src/filemanager/panel.c:1080 +#: src/filemanager/panel.c:1076 #, c-format msgid "%s in %d file" msgid_plural "%s in %d files" msgstr[0] "" msgstr[1] "" -#: src/filemanager/panel.c:1279 +#: src/filemanager/panel.c:1275 msgid "Panelize" msgstr "" -#: src/filemanager/panel.c:1816 +#: src/filemanager/panel.c:1812 msgid "Unknown tag on display format:" msgstr "" -#: src/filemanager/panel.c:2478 +#: src/filemanager/panel.c:2474 msgid "&Files only" msgstr "" -#: src/filemanager/panel.c:2481 +#: src/filemanager/panel.c:2477 msgid "&Case sensitive" msgstr "" -#: src/filemanager/panel.c:2536 +#: src/filemanager/panel.c:2532 msgid "Select" msgstr "" -#: src/filemanager/panel.c:2544 +#: src/filemanager/panel.c:2540 msgid "Unselect" msgstr "" -#: src/filemanager/panel.c:2769 +#: src/filemanager/panel.c:2765 msgid "Do you really want to execute?" msgstr "" -#: src/filemanager/panel.c:4411 +#: src/filemanager/panel.c:4409 msgid "User supplied format looks invalid, reverting to default." msgstr "" @@ -4474,45 +4478,45 @@ msgid "" "%s\n" msgstr "" -#: src/filemanager/tree.c:770 +#: src/filemanager/tree.c:765 #, c-format msgid "Copy \"%s\" directory to:" msgstr "" -#: src/filemanager/tree.c:808 +#: src/filemanager/tree.c:803 #, c-format msgid "Move \"%s\" directory to:" msgstr "" -#: src/filemanager/tree.c:819 +#: src/filemanager/tree.c:814 #, c-format msgid "" "Cannot stat the destination\n" "%s" msgstr "" -#: src/filemanager/tree.c:878 +#: src/filemanager/tree.c:873 #, c-format msgid "Delete %s?" msgstr "" -#: src/filemanager/tree.c:1030 src/filemanager/tree.c:1214 +#: src/filemanager/tree.c:1025 src/filemanager/tree.c:1209 msgid "ButtonBar|Static" msgstr "" -#: src/filemanager/tree.c:1031 src/filemanager/tree.c:1215 +#: src/filemanager/tree.c:1026 src/filemanager/tree.c:1210 msgid "ButtonBar|Dynamc" msgstr "" -#: src/filemanager/tree.c:1212 +#: src/filemanager/tree.c:1207 msgid "ButtonBar|Rescan" msgstr "" -#: src/filemanager/tree.c:1213 +#: src/filemanager/tree.c:1208 msgid "ButtonBar|Forget" msgstr "" -#: src/filemanager/tree.c:1224 +#: src/filemanager/tree.c:1219 msgid "ButtonBar|Rmdir" msgstr "" @@ -4667,18 +4671,18 @@ msgid "" "key, or click with the mouse to define it. Move around with Tab." msgstr "" -#: src/main.c:254 +#: src/main.c:257 #, c-format msgid "" "Failed to run:\n" "%s\n" msgstr "" -#: src/main.c:267 +#: src/main.c:271 msgid "Home directory path is not absolute" msgstr "" -#: src/main.c:495 +#: src/main.c:499 #, c-format msgid "" "\n" @@ -5427,7 +5431,7 @@ msgid "" "%s" msgstr "" -#: src/viewer/lib.c:398 src/viewer/lib.c:400 +#: src/viewer/lib.c:397 src/viewer/lib.c:399 msgid "View: " msgstr "" diff --git a/po/mn.po b/po/mn.po index 537ea7c22..e40d9bdfe 100644 --- a/po/mn.po +++ b/po/mn.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Mongolian (http://www.transifex.com/projects/p/mc/language/" @@ -333,6 +333,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "" @@ -1682,6 +1685,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Бусад 8-бит" @@ -1766,12 +1775,6 @@ msgstr "" msgid "Configure options" msgstr "Тохиргуулгын параметрүүд" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/nb.po b/po/nb.po index 8ff81be9b..96994da03 100644 --- a/po/nb.po +++ b/po/nb.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/mc/" @@ -333,6 +333,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "" @@ -1682,6 +1685,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Andre 8-bit" @@ -1766,12 +1775,6 @@ msgstr "" msgid "Configure options" msgstr "Alternativer for konfigurasjon" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/nl.po b/po/nl.po index 2358c95a1..3e8d12f32 100644 --- a/po/nl.po +++ b/po/nl.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/mc/language/nl/)\n" @@ -351,6 +351,9 @@ msgstr "Apostrof" msgid "Colon" msgstr "Dubbele punt" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Uitroepteken" @@ -1747,6 +1750,12 @@ msgstr "" "chown voor \"%s\" mislukt \n" "%s" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Andere 8 bits" @@ -1831,12 +1840,6 @@ msgstr "A&utomatisch instellingen opslaan" msgid "Configure options" msgstr "Instellingen" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/pl.po b/po/pl.po index d368c2558..d4ebe4fb3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish (http://www.transifex.com/projects/p/mc/language/pl/)\n" @@ -351,6 +351,9 @@ msgstr "Apostrof" msgid "Colon" msgstr "Dwukropek" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Wykrzyknik" @@ -1772,6 +1775,12 @@ msgstr "" "Nie można wykonać chown na \"%s\"\n" "%s" +msgid "< Default >" +msgstr "< Domyślne >" + +msgid "Skins" +msgstr "Skórki" + msgid "Other 8 bit" msgstr "Inne 8 bitowe" @@ -1856,12 +1865,6 @@ msgstr "Auto&matyczny zapis ustawień" msgid "Configure options" msgstr "Konfiguracja opcji" -msgid "< Default >" -msgstr "< Domyślne >" - -msgid "Skins" -msgstr "Skórki" - msgid "Skin:" msgstr "Skórka:" diff --git a/po/pt.po b/po/pt.po index 3347aaf43..a1c0d822a 100644 --- a/po/pt.po +++ b/po/pt.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 12:38+0000\n" "Last-Translator: Gilberto Jorge \n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/mc/language/" @@ -352,6 +352,9 @@ msgstr "Apóstrofe" msgid "Colon" msgstr "Dois pontos" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Ponto de exclamação" @@ -1774,6 +1777,12 @@ msgstr "" "Não é possível efetuar chown \"%s\"\n" "%s" +msgid "< Default >" +msgstr "< Default >" + +msgid "Skins" +msgstr "Skins" + msgid "Other 8 bit" msgstr "Outros 8 bit" @@ -1858,12 +1867,6 @@ msgstr "Guardar setup a&uto" msgid "Configure options" msgstr "Opções de configuração" -msgid "< Default >" -msgstr "< Default >" - -msgid "Skins" -msgstr "Skins" - msgid "Skin:" msgstr "Skin:" diff --git a/po/pt_BR.po b/po/pt_BR.po index e015ae50d..2f0477ba4 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mc/" @@ -343,6 +343,9 @@ msgstr "Apóstrofo" msgid "Colon" msgstr "Dois pontos" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Ponto de exclamação" @@ -1718,6 +1721,12 @@ msgstr "" "Não foi possível executar chown \"%s\"\n" "%s" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Outro 8 bit" @@ -1802,12 +1811,6 @@ msgstr "" msgid "Configure options" msgstr "Configurar Opções" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/ro.po b/po/ro.po index ccc2ffefe..f81809848 100644 --- a/po/ro.po +++ b/po/ro.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/mc/language/" @@ -352,6 +352,9 @@ msgstr "Apostrof" msgid "Colon" msgstr "Punct și virgulă" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Semn de exclamare" @@ -1755,6 +1758,12 @@ msgstr "" "Nu se poate aplica chown \"%s\"\n" "%s" +msgid "< Default >" +msgstr "< Implicit >" + +msgid "Skins" +msgstr "Tematici" + msgid "Other 8 bit" msgstr "Alt 8 biți" @@ -1839,12 +1848,6 @@ msgstr "Auto-salvare a configurației" msgid "Configure options" msgstr "Opțiuni de configurare" -msgid "< Default >" -msgstr "< Implicit >" - -msgid "Skins" -msgstr "Tematici" - msgid "Skin:" msgstr "Tematică:" diff --git a/po/ru.po b/po/ru.po index 68bb2462c..d2f7f1ff5 100644 --- a/po/ru.po +++ b/po/ru.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" -"PO-Revision-Date: 2014-09-09 14:43+0300\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" +"PO-Revision-Date: 2014-12-10 13:12+0300\n" "Last-Translator: Andrew Borodin \n" "Language-Team: Russian (http://www.transifex.com/projects/p/mc/language/" "ru/)\n" @@ -359,6 +359,9 @@ msgstr "Апостроф" msgid "Colon" msgstr "Двоеточие" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Exclamation mark" @@ -1775,6 +1778,12 @@ msgstr "" "Невозможно изменить владельца \"%s\"\n" "%s" +msgid "< Default >" +msgstr "< По умолчанию >" + +msgid "Skins" +msgstr "Скины" + msgid "Other 8 bit" msgstr "Другая 8-битная" @@ -1859,12 +1868,6 @@ msgstr "&Автосохранение настроек" msgid "Configure options" msgstr "Параметры конфигурации" -msgid "< Default >" -msgstr "< По умолчанию >" - -msgid "Skins" -msgstr "Скины" - msgid "Skin:" msgstr "Скин:" @@ -3519,7 +3522,7 @@ msgid "&Case sensitive" msgstr "Учет ре&гистра" msgid "Select" -msgstr "отметить группу" +msgstr "Отметить группу" msgid "Unselect" msgstr "Снять отметку" diff --git a/po/sk.po b/po/sk.po index 2ebbfe671..eafbc86a0 100644 --- a/po/sk.po +++ b/po/sk.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/mc/language/sk/)\n" @@ -343,6 +343,9 @@ msgstr "Apostrof" msgid "Colon" msgstr "Dvojbodka" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Výkričník" @@ -1692,6 +1695,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Iné 8-bitové" @@ -1776,12 +1785,6 @@ msgstr "" msgid "Configure options" msgstr "Nastavovateľne voľby" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/sl.po b/po/sl.po index 292043c79..0804765fd 100644 --- a/po/sl.po +++ b/po/sl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/mc/language/" @@ -343,6 +343,9 @@ msgstr "Narekovaj" msgid "Colon" msgstr "Podpičje" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Klicaj" @@ -1692,6 +1695,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Drugo 8 bitno" @@ -1776,12 +1785,6 @@ msgstr "" msgid "Configure options" msgstr "Nastavi" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/sr.po b/po/sr.po index 768f051df..8ebb3b9ff 100644 --- a/po/sr.po +++ b/po/sr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Serbian (http://www.transifex.com/projects/p/mc/language/" @@ -334,6 +334,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "" @@ -1683,6 +1686,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Другa, осмобитнa" @@ -1767,12 +1776,6 @@ msgstr "" msgid "Configure options" msgstr "Подеси изборе" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/sv.po b/po/sv.po index fc5df3091..e5ba7c4d7 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/mc/language/" @@ -334,6 +334,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "" @@ -1683,6 +1686,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Annan 8-bitars" @@ -1767,12 +1776,6 @@ msgstr "" msgid "Configure options" msgstr "Inställningar" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/sv_SE.po b/po/sv_SE.po index e7121ed9d..3a74626da 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2011-12-07 11:21+0000\n" "Last-Translator: slavazanko \n" "Language-Team: Swedish (Sweden) (http://www.transifex.net/projects/p/mc/team/" @@ -331,6 +331,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "" @@ -1673,6 +1676,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "" @@ -1757,12 +1766,6 @@ msgstr "" msgid "Configure options" msgstr "" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/szl.po b/po/szl.po index 8cc436270..24ebbc56f 100644 --- a/po/szl.po +++ b/po/szl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Silesian (http://www.transifex.com/projects/p/mc/language/" @@ -333,6 +333,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "" @@ -1675,6 +1678,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "" @@ -1759,12 +1768,6 @@ msgstr "" msgid "Configure options" msgstr "" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/ta.po b/po/ta.po index 6708327e9..2c82f7067 100644 --- a/po/ta.po +++ b/po/ta.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Tamil (http://www.transifex.com/projects/p/mc/language/ta/)\n" @@ -332,6 +332,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "" @@ -1674,6 +1677,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "" @@ -1758,12 +1767,6 @@ msgstr "" msgid "Configure options" msgstr "" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/tr.po b/po/tr.po index 0eaf80f54..07ec76e30 100644 --- a/po/tr.po +++ b/po/tr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/mc/language/" @@ -334,6 +334,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "Ünlem İşareti" @@ -1683,6 +1686,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Diğer 8 bit" @@ -1767,12 +1776,6 @@ msgstr "" msgid "Configure options" msgstr "Yapılandırma seçenekleri" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/uk.po b/po/uk.po index 355bba5d8..bef95c148 100644 --- a/po/uk.po +++ b/po/uk.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/mc/language/" @@ -353,6 +353,9 @@ msgstr "'" msgid "Colon" msgstr ":" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "!" @@ -954,7 +957,8 @@ msgstr "«%s» не є звичайним файлом" msgid "" "File \"%s\" is too large.\n" "Open it anyway?" -msgstr "Файл «%s» занадто великий.\n" +msgstr "" +"Файл «%s» занадто великий.\n" "Відкрити його будь що?" #, c-format @@ -1749,6 +1753,12 @@ msgstr "" "Не вдалося змінити власника «%s» \n" "%s" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Інше 8-розрядне" @@ -1833,12 +1843,6 @@ msgstr "&Автозбереження параметрів" msgid "Configure options" msgstr "Параметри конфігурації" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" @@ -4159,8 +4163,7 @@ msgstr "sftp: Створення списку завершено." #, c-format msgid "reconnect to %s failed" -msgstr "" -"сталася помилка повторного з’єднання з %s" +msgstr "сталася помилка повторного з’єднання з %s" msgid "Authentication failed" msgstr "Сталася помилка авторизації " diff --git a/po/vi.po b/po/vi.po index c6d37587b..d1ea26cde 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/mc/language/" @@ -333,6 +333,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "" @@ -1682,6 +1685,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "8 bit khác" @@ -1766,12 +1775,6 @@ msgstr "" msgid "Configure options" msgstr "Tùy chọn cấu hình" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/wa.po b/po/wa.po index 2bcd0f672..976b87351 100644 --- a/po/wa.po +++ b/po/wa.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Walloon (http://www.transifex.com/projects/p/mc/language/" @@ -333,6 +333,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "" @@ -1678,6 +1681,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "Ôte 8 bit" @@ -1762,12 +1771,6 @@ msgstr "" msgid "Configure options" msgstr "Apontyî les tchûzes" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 1473b1473..21572e363 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mc/" @@ -354,6 +354,9 @@ msgstr "撇号" msgid "Colon" msgstr "冒号" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "感叹号" @@ -1752,6 +1755,12 @@ msgstr "" "无法 chown“%s”\n" "%s" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "其它 8 位" @@ -1836,12 +1845,6 @@ msgstr "自动保存设置(&U)" msgid "Configure options" msgstr "配置选项" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index e9a64ce9b..643ff2b9d 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2014-09-27 20:13+0400\n" +"POT-Creation-Date: 2014-12-10 13:09+0300\n" "PO-Revision-Date: 2014-09-04 10:10+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mc/" @@ -333,6 +333,9 @@ msgstr "" msgid "Colon" msgstr "" +msgid "Semicolon" +msgstr "" + msgid "Exclamation mark" msgstr "" @@ -1682,6 +1685,12 @@ msgid "" "%s" msgstr "" +msgid "< Default >" +msgstr "" + +msgid "Skins" +msgstr "" + msgid "Other 8 bit" msgstr "其它八位元" @@ -1766,12 +1775,6 @@ msgstr "" msgid "Configure options" msgstr "設定選項" -msgid "< Default >" -msgstr "" - -msgid "Skins" -msgstr "" - msgid "Skin:" msgstr "" diff --git a/src/editor/choosesyntax.c b/src/editor/choosesyntax.c index 6d389b176..b1d90f3f0 100644 --- a/src/editor/choosesyntax.c +++ b/src/editor/choosesyntax.c @@ -35,7 +35,7 @@ #include #include -#include +#include /* strcmp() */ #include "lib/global.h" #include "lib/widget.h" /* Listbox */ @@ -67,19 +67,23 @@ pstrcmp (const void *p1, const void *p2) /* --------------------------------------------------------------------------------------------- */ static int -exec_edit_syntax_dialog (const char **names, const char *current_syntax) +exec_edit_syntax_dialog (const GPtrArray * names, const char *current_syntax) { size_t i; + Listbox *syntaxlist; - Listbox *syntaxlist = create_listbox_window (LIST_LINES, MAX_ENTRY_LEN, - _("Choose syntax highlighting"), NULL); + syntaxlist = create_listbox_window (LIST_LINES, MAX_ENTRY_LEN, + _("Choose syntax highlighting"), NULL); LISTBOX_APPEND_TEXT (syntaxlist, 'A', _("< Auto >"), NULL); LISTBOX_APPEND_TEXT (syntaxlist, 'R', _("< Reload Current Syntax >"), NULL); - for (i = 0; names[i] != NULL; i++) + for (i = 0; i < names->len; i++) { - LISTBOX_APPEND_TEXT (syntaxlist, 0, names[i], NULL); - if ((current_syntax != NULL) && (strcmp (names[i], current_syntax) == 0)) + const char *name; + + name = g_ptr_array_index (names, i); + LISTBOX_APPEND_TEXT (syntaxlist, 0, name, NULL); + if (current_syntax != NULL && strcmp (name, current_syntax) == 0) listbox_select_entry (syntaxlist->list, i + N_DFLT_ENTRIES); } @@ -93,27 +97,27 @@ exec_edit_syntax_dialog (const char **names, const char *current_syntax) void edit_syntax_dialog (WEdit * edit) { - char *current_syntax; - int old_auto_syntax, syntax; - char **names; - gboolean force_reload = FALSE; - size_t count; + GPtrArray *names; + int syntax; - current_syntax = g_strdup (edit->syntax_type); - old_auto_syntax = option_auto_syntax; - - names = g_new0 (char *, 1); + names = g_ptr_array_new (); /* We fill the list of syntax files every time the editor is invoked. Instead we could save the list to a file and update it once the syntax file gets updated (either by testing or by explicit user command). */ - edit_load_syntax (NULL, &names, NULL); - count = g_strv_length (names); - qsort (names, count, sizeof (char *), pstrcmp); + edit_load_syntax (NULL, names, NULL); + g_ptr_array_sort (names, pstrcmp); - syntax = exec_edit_syntax_dialog ((const char **) names, current_syntax); + syntax = exec_edit_syntax_dialog (names, edit->syntax_type); if (syntax >= 0) { + gboolean force_reload = FALSE; + char *current_syntax; + int old_auto_syntax; + + current_syntax = g_strdup (edit->syntax_type); + old_auto_syntax = option_auto_syntax; + switch (syntax) { case 0: /* auto syntax */ @@ -125,19 +129,20 @@ edit_syntax_dialog (WEdit * edit) default: option_auto_syntax = 0; g_free (edit->syntax_type); - edit->syntax_type = g_strdup (names[syntax - N_DFLT_ENTRIES]); + edit->syntax_type = g_strdup (g_ptr_array_index (names, syntax - N_DFLT_ENTRIES)); } /* Load or unload syntax rules if the option has changed */ - if ((option_auto_syntax && !old_auto_syntax) || old_auto_syntax || - (current_syntax && edit->syntax_type && - (strcmp (current_syntax, edit->syntax_type) != 0)) || force_reload) + if (force_reload || (option_auto_syntax && !old_auto_syntax) || old_auto_syntax || + (current_syntax != NULL && edit->syntax_type != NULL && + strcmp (current_syntax, edit->syntax_type) != 0)) edit_load_syntax (edit, NULL, edit->syntax_type); g_free (current_syntax); } - g_strfreev (names); + g_ptr_array_foreach (names, (GFunc) g_free, NULL); + g_ptr_array_free (names, TRUE); } /* --------------------------------------------------------------------------------------------- */ diff --git a/src/editor/edit-impl.h b/src/editor/edit-impl.h index 9c7ea7f25..14dea5900 100644 --- a/src/editor/edit-impl.h +++ b/src/editor/edit-impl.h @@ -264,7 +264,7 @@ void edit_paste_from_history (WEdit * edit); void edit_set_filename (WEdit * edit, const vfs_path_t * name_vpath); -void edit_load_syntax (WEdit * edit, char ***pnames, const char *type); +void edit_load_syntax (WEdit * edit, GPtrArray * pnames, const char *type); void edit_free_syntax_rules (WEdit * edit); int edit_get_syntax_color (WEdit * edit, off_t byte_index); diff --git a/src/editor/edit.c b/src/editor/edit.c index 758fce8b2..3aca4c1c4 100644 --- a/src/editor/edit.c +++ b/src/editor/edit.c @@ -256,7 +256,7 @@ edit_get_filter (const vfs_path_t * filename_vpath) if (i < 0) return NULL; - quoted_name = name_quote (vfs_path_as_str (filename_vpath), 0); + quoted_name = name_quote (vfs_path_as_str (filename_vpath), FALSE); p = g_strdup_printf (all_filters[i].read, quoted_name); g_free (quoted_name); return p; @@ -1810,7 +1810,7 @@ edit_get_write_filter (const vfs_path_t * write_name_vpath, const vfs_path_t * f return NULL; path_element = vfs_path_get_by_index (write_name_vpath, -1); - writename = name_quote (path_element->path, 0); + writename = name_quote (path_element->path, FALSE); p = g_strdup_printf (all_filters[i].write, writename); g_free (writename); return p; diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c index 46bafc362..de34c5888 100644 --- a/src/editor/editcmd.c +++ b/src/editor/editcmd.c @@ -1109,9 +1109,9 @@ pipe_mail (const edit_buffer_t * buf, char *to, char *subject, char *cc) FILE *p = 0; char *s; - to = name_quote (to, 0); - subject = name_quote (subject, 0); - cc = name_quote (cc, 0); + to = name_quote (to, FALSE); + subject = name_quote (subject, FALSE); + cc = name_quote (cc, FALSE); s = g_strconcat ("mail -s ", subject, *cc ? " -c " : "", cc, " ", to, (char *) NULL); g_free (to); g_free (subject); diff --git a/src/editor/editwidget.h b/src/editor/editwidget.h index 90c73f6ee..43936e106 100644 --- a/src/editor/editwidget.h +++ b/src/editor/editwidget.h @@ -153,7 +153,7 @@ struct WEdit /* syntax higlighting */ GSList *syntax_marker; - struct context_rule **rules; + GPtrArray *rules; off_t last_get_rule; edit_syntax_rule_t rule; char *syntax_type; /* description of syntax highlighting type being used */ diff --git a/src/editor/syntax.c b/src/editor/syntax.c index fe071e260..6e434c46f 100644 --- a/src/editor/syntax.c +++ b/src/editor/syntax.c @@ -8,7 +8,7 @@ Paul Sheer, 1998 Egmont Koblinger , 2010 Slava Zanko , 2013 - Andrew Borodin , 2013 + Andrew Borodin , 2013, 2014 This file is part of the Midnight Commander. @@ -95,19 +95,21 @@ int option_auto_syntax = 1; #define check_a {if(!*a){result=line;break;}} #define check_not_a {if(*a){result=line;break;}} +#define SYNTAX_KEYWORD(x) ((syntax_keyword_t *) (x)) +#define CONTEXT_RULE(x) ((context_rule_t *) (x)) + /*** file scope type declarations ****************************************************************/ -struct key_word +typedef struct { char *keyword; - unsigned char first; char *whole_word_chars_left; char *whole_word_chars_right; long line_start; int color; -}; +} syntax_keyword_t; -struct context_rule +typedef struct { char *left; unsigned char first_left; @@ -121,8 +123,8 @@ struct context_rule char *keyword_first_chars; gboolean spelling; /* first word is word[1] */ - struct key_word **keyword; -}; + GPtrArray *keyword; +} context_rule_t; typedef struct { @@ -134,9 +136,45 @@ typedef struct static char *error_file_name = NULL; +/* --------------------------------------------------------------------------------------------- */ /*** file scope functions ************************************************************************/ /* --------------------------------------------------------------------------------------------- */ +static void +syntax_keyword_free (gpointer keyword) +{ + syntax_keyword_t *k = SYNTAX_KEYWORD (keyword); + + g_free (k->keyword); + g_free (k->whole_word_chars_left); + g_free (k->whole_word_chars_right); + g_free (k); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +context_rule_free (gpointer rule) +{ + context_rule_t *r = CONTEXT_RULE (rule); + + g_free (r->left); + g_free (r->right); + g_free (r->whole_word_chars_left); + g_free (r->whole_word_chars_right); + g_free (r->keyword_first_chars); + + if (r->keyword != NULL) + { + g_ptr_array_foreach (r->keyword, (GFunc) syntax_keyword_free, NULL); + g_ptr_array_free (r->keyword, TRUE); + } + + g_free (r); +} + +/* --------------------------------------------------------------------------------------------- */ + static gint mc_defines_destroy (gpointer key, gpointer value, gpointer data) { @@ -336,7 +374,7 @@ xx_strchr (const WEdit * edit, const unsigned char *s, int char_byte) static void apply_rules_going_right (WEdit * edit, off_t i) { - struct context_rule *r; + context_rule_t *r; int c; gboolean contextchanged = FALSE; gboolean found_left = FALSE, found_right = FALSE; @@ -368,7 +406,7 @@ apply_rules_going_right (WEdit * edit, off_t i) { off_t e; - r = edit->rules[_rule.context]; + r = CONTEXT_RULE (g_ptr_array_index (edit->rules, _rule.context)); if (r->first_right == c && (edit->rule.border & RULE_ON_RIGHT_BORDER) == 0 && (e = compare_word_to_right (edit, i, r->right, r->whole_word_chars_left, @@ -401,18 +439,18 @@ apply_rules_going_right (WEdit * edit, off_t i) { const char *p; - r = edit->rules[_rule.context]; + r = CONTEXT_RULE (g_ptr_array_index (edit->rules, _rule.context)); p = r->keyword_first_chars; if (p != NULL) while (*(p = xx_strchr (edit, (unsigned char *) p + 1, c)) != '\0') { - struct key_word *k; + syntax_keyword_t *k; int count; off_t e; count = p - r->keyword_first_chars; - k = r->keyword[count]; + k = SYNTAX_KEYWORD (g_ptr_array_index (r->keyword, count)); e = compare_word_to_right (edit, i, k->keyword, k->whole_word_chars_left, k->whole_word_chars_right, k->line_start); if (e > 0) @@ -441,7 +479,7 @@ apply_rules_going_right (WEdit * edit, off_t i) } else if ((edit->rule.border & RULE_ON_LEFT_BORDER) != 0) { - r = edit->rules[_rule._context]; + r = CONTEXT_RULE (g_ptr_array_index (edit->rules, _rule._context)); _rule.border = 0; if (r->between_delimiters) { @@ -469,12 +507,11 @@ apply_rules_going_right (WEdit * edit, off_t i) if (!found_right) { - int count; - struct context_rule **rules = edit->rules; + size_t count; - for (count = 1; rules[count] != NULL; count++) + for (count = 1; count < edit->rules->len; count++) { - r = rules[count]; + r = CONTEXT_RULE (g_ptr_array_index (edit->rules, count)); if (r->first_left == c) { off_t e; @@ -504,17 +541,17 @@ apply_rules_going_right (WEdit * edit, off_t i) { const char *p; - r = edit->rules[_rule.context]; + r = CONTEXT_RULE (g_ptr_array_index (edit->rules, _rule.context)); p = r->keyword_first_chars; while (*(p = xx_strchr (edit, (unsigned char *) p + 1, c)) != '\0') { - struct key_word *k; + syntax_keyword_t *k; int count; off_t e; count = p - r->keyword_first_chars; - k = r->keyword[count]; + k = SYNTAX_KEYWORD (g_ptr_array_index (r->keyword, count)); e = compare_word_to_right (edit, i, k->keyword, k->whole_word_chars_left, k->whole_word_chars_right, k->line_start); if (e > 0) @@ -591,10 +628,16 @@ edit_get_rule (WEdit * edit, off_t byte_index) /* --------------------------------------------------------------------------------------------- */ -static inline int +static int translate_rule_to_color (const WEdit * edit, const edit_syntax_rule_t * rule) { - return edit->rules[rule->context]->keyword[rule->keyword]->color; + syntax_keyword_t *k; + context_rule_t *r; + + r = CONTEXT_RULE (g_ptr_array_index (edit->rules, rule->context)); + k = SYNTAX_KEYWORD (g_ptr_array_index (r->keyword, rule->keyword)); + + return k->color; } /* --------------------------------------------------------------------------------------------- */ @@ -884,12 +927,9 @@ edit_read_syntax_rules (WEdit * edit, FILE * f, char **args, int args_size) char whole_left[512]; char *l = 0; int save_line = 0, line = 0; - struct context_rule **r, *c = NULL; - int num_words = -1, num_contexts = -1; + context_rule_t *c = NULL; + gboolean no_words = TRUE; int result = 0; - int alloc_contexts = MAX_CONTEXTS, - alloc_words_per_context = MAX_WORDS_PER_CONTEXT, - max_alloc_words_per_context = MAX_WORDS_PER_CONTEXT; args[0] = NULL; edit->is_case_insensitive = FALSE; @@ -897,7 +937,7 @@ edit_read_syntax_rules (WEdit * edit, FILE * f, char **args, int args_size) strcpy (whole_left, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_01234567890"); strcpy (whole_right, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_01234567890"); - r = edit->rules = g_malloc0 (alloc_contexts * sizeof (struct context_rule *)); + edit->rules = g_ptr_array_new (); if (!edit->defines) edit->defines = g_tree_new ((GCompareFunc) strcmp); @@ -982,24 +1022,26 @@ edit_read_syntax_rules (WEdit * edit, FILE * f, char **args, int args_size) } else if (strcmp (args[0], "context") == 0) { + syntax_keyword_t *k; + check_a; - if (num_contexts == -1) + if (edit->rules->len == 0) { + /* first context is the default */ if (strcmp (*a, "default") != 0) - { /* first context is the default */ break_a; - } + a++; - c = r[0] = g_malloc0 (sizeof (struct context_rule)); + c = g_new0 (context_rule_t, 1); + g_ptr_array_add (edit->rules, c); c->left = g_strdup (" "); c->right = g_strdup (" "); - num_contexts = 0; } else { - /* Terminate previous context. */ - r[num_contexts - 1]->keyword[num_words] = NULL; - c = r[num_contexts] = g_malloc0 (sizeof (struct context_rule)); + /* Start new context. */ + c = g_new0 (context_rule_t, 1); + g_ptr_array_add (edit->rules, c); if (strcmp (*a, "exclusive") == 0) { a++; @@ -1041,35 +1083,26 @@ edit_read_syntax_rules (WEdit * edit, FILE * f, char **args, int args_size) c->first_left = *c->left; c->first_right = *c->right; } - c->keyword = g_malloc (alloc_words_per_context * sizeof (struct key_word *)); - num_words = 1; - c->keyword[0] = g_malloc0 (sizeof (struct key_word)); + c->keyword = g_ptr_array_new (); + k = g_new0 (syntax_keyword_t, 1); + g_ptr_array_add (c->keyword, k); + no_words = FALSE; subst_defines (edit->defines, a, &args[1024]); fg = *a; - if (*a != '\0') + if (*a != NULL) a++; bg = *a; - if (*a != '\0') + if (*a != NULL) a++; attrs = *a; - if (*a != '\0') + if (*a != NULL) a++; g_strlcpy (last_fg, fg != NULL ? fg : "", sizeof (last_fg)); g_strlcpy (last_bg, bg != NULL ? bg : "", sizeof (last_bg)); g_strlcpy (last_attrs, attrs != NULL ? attrs : "", sizeof (last_attrs)); - c->keyword[0]->color = this_try_alloc_color_pair (fg, bg, attrs); - c->keyword[0]->keyword = g_strdup (" "); + k->color = this_try_alloc_color_pair (fg, bg, attrs); + k->keyword = g_strdup (" "); check_not_a; - - alloc_words_per_context = MAX_WORDS_PER_CONTEXT; - if (++num_contexts >= alloc_contexts) - { - struct context_rule **tmp; - - alloc_contexts += 128; - tmp = g_realloc (r, alloc_contexts * sizeof (struct context_rule *)); - r = tmp; - } } else if (strcmp (args[0], "spellcheck") == 0) { @@ -1082,12 +1115,15 @@ edit_read_syntax_rules (WEdit * edit, FILE * f, char **args, int args_size) } else if (strcmp (args[0], "keyword") == 0) { - struct key_word *k; + context_rule_t *last_rule; + syntax_keyword_t *k; - if (num_words == -1) + if (no_words) break_a; check_a; - k = r[num_contexts - 1]->keyword[num_words] = g_malloc0 (sizeof (struct key_word)); + last_rule = CONTEXT_RULE (g_ptr_array_index (edit->rules, edit->rules->len - 1)); + k = g_new0 (syntax_keyword_t, 1); + g_ptr_array_add (last_rule->keyword, k); if (strcmp (*a, "whole") == 0) { a++; @@ -1116,16 +1152,15 @@ edit_read_syntax_rules (WEdit * edit, FILE * f, char **args, int args_size) break_a; } k->keyword = g_strdup (*a++); - k->first = *k->keyword; subst_defines (edit->defines, a, &args[1024]); fg = *a; - if (*a != '\0') + if (*a != NULL) a++; bg = *a; - if (*a != '\0') + if (*a != NULL) a++; attrs = *a; - if (*a != '\0') + if (*a != NULL) a++; if (fg == NULL) fg = last_fg; @@ -1135,19 +1170,6 @@ edit_read_syntax_rules (WEdit * edit, FILE * f, char **args, int args_size) attrs = last_attrs; k->color = this_try_alloc_color_pair (fg, bg, attrs); check_not_a; - - if (++num_words >= alloc_words_per_context) - { - struct key_word **tmp; - - alloc_words_per_context += 1024; - - if (alloc_words_per_context > max_alloc_words_per_context) - max_alloc_words_per_context = alloc_words_per_context; - - tmp = g_realloc (c->keyword, alloc_words_per_context * sizeof (struct key_word *)); - c->keyword = tmp; - } } else if (*(args[0]) == '#') { @@ -1186,41 +1208,43 @@ edit_read_syntax_rules (WEdit * edit, FILE * f, char **args, int args_size) free_args (args); MC_PTR_FREE (l); - /* Terminate context array. */ - if (num_contexts > 0) + if (edit->rules->len == 0) { - r[num_contexts - 1]->keyword[num_words] = NULL; - r[num_contexts] = NULL; + g_ptr_array_free (edit->rules, TRUE); + edit->rules = NULL; } - if (edit->rules[0] == NULL) - MC_PTR_FREE (edit->rules); - if (result == 0) { - int i; - char *first_chars; + size_t i; + GString *first_chars; - if (num_contexts == -1) + if (edit->rules == NULL) return line; - first_chars = g_malloc0 (max_alloc_words_per_context + 2); + first_chars = g_string_sized_new (32); - for (i = 0; edit->rules[i] != NULL; i++) + /* collect first character of keywords */ + for (i = 0; i < edit->rules->len; i++) { - char *p; - int j; + size_t j; - c = edit->rules[i]; - p = first_chars; - *p++ = (char) 1; - for (j = 1; c->keyword[j] != NULL; j++) - *p++ = c->keyword[j]->first; - *p = '\0'; - c->keyword_first_chars = g_strdup (first_chars); + g_string_set_size (first_chars, 0); + c = CONTEXT_RULE (g_ptr_array_index (edit->rules, i)); + + g_string_append_c (first_chars, (char) 1); + for (j = 1; j < c->keyword->len; j++) + { + syntax_keyword_t *k; + + k = SYNTAX_KEYWORD (g_ptr_array_index (c->keyword, j)); + g_string_append_c (first_chars, k->keyword[0]); + } + + c->keyword_first_chars = g_strndup (first_chars->str, first_chars->len); } - g_free (first_chars); + g_string_free (first_chars, TRUE); } return result; @@ -1230,18 +1254,15 @@ edit_read_syntax_rules (WEdit * edit, FILE * f, char **args, int args_size) /* returns -1 on file error, line number on error in file syntax */ static int -edit_read_syntax_file (WEdit * edit, char ***pnames, const char *syntax_file, +edit_read_syntax_file (WEdit * edit, GPtrArray * pnames, const char *syntax_file, const char *editor_file, const char *first_line, const char *type) { -#define NENTRIES 30 FILE *f, *g = NULL; char *args[1024], *l = NULL; long line = 0; int result = 0; - int count = 0; char *lib_file; gboolean found = FALSE; - char **tmpnames = NULL; f = fopen (syntax_file, "r"); if (f == NULL) @@ -1290,20 +1311,11 @@ edit_read_syntax_file (WEdit * edit, char ***pnames, const char *syntax_file, result = line; break; } - if (pnames && *pnames) + + if (pnames != NULL) { /* 1: just collecting a list of names of rule sets */ - /* Reallocate the list if required */ - if (count % NENTRIES == 0) - { - tmpnames = - (char **) g_try_realloc (*pnames, (count + NENTRIES + 1) * sizeof (char *)); - if (tmpnames == NULL) - break; - *pnames = tmpnames; - } - (*pnames)[count++] = g_strdup (args[2]); - (*pnames)[count] = NULL; + g_ptr_array_add (pnames, g_strdup (args[2])); } else if (type) { @@ -1342,12 +1354,17 @@ edit_read_syntax_file (WEdit * edit, char ***pnames, const char *syntax_file, g_free (edit->syntax_type); edit->syntax_type = g_strdup (syntax_type); /* if there are no rules then turn off syntax highlighting for speed */ - if (!g && !edit->rules[1]) - if (!edit->rules[0]->keyword[1] && !edit->rules[0]->spelling) + if (g == NULL && edit->rules->len == 1) + { + context_rule_t *r0; + + r0 = CONTEXT_RULE (g_ptr_array_index (edit->rules, 0)); + if (r0->keyword->len == 1 && !r0->spelling) { edit_free_syntax_rules (edit); break; } + } } if (g == NULL) @@ -1416,42 +1433,23 @@ edit_get_syntax_color (WEdit * edit, off_t byte_index) void edit_free_syntax_rules (WEdit * edit) { - size_t i, j; - - if (!edit) + if (edit == NULL) return; - if (edit->defines) + + if (edit->defines != NULL) destroy_defines (&edit->defines); - if (!edit->rules) + + if (edit->rules == NULL) return; edit_get_rule (edit, -1); MC_PTR_FREE (edit->syntax_type); - for (i = 0; edit->rules[i]; i++) - { - if (edit->rules[i]->keyword) - { - for (j = 0; edit->rules[i]->keyword[j]; j++) - { - MC_PTR_FREE (edit->rules[i]->keyword[j]->keyword); - MC_PTR_FREE (edit->rules[i]->keyword[j]->whole_word_chars_left); - MC_PTR_FREE (edit->rules[i]->keyword[j]->whole_word_chars_right); - MC_PTR_FREE (edit->rules[i]->keyword[j]); - } - } - MC_PTR_FREE (edit->rules[i]->left); - MC_PTR_FREE (edit->rules[i]->right); - MC_PTR_FREE (edit->rules[i]->whole_word_chars_left); - MC_PTR_FREE (edit->rules[i]->whole_word_chars_right); - MC_PTR_FREE (edit->rules[i]->keyword); - MC_PTR_FREE (edit->rules[i]->keyword_first_chars); - MC_PTR_FREE (edit->rules[i]); - } - + g_ptr_array_foreach (edit->rules, (GFunc) context_rule_free, NULL); + g_ptr_array_free (edit->rules, TRUE); + edit->rules = NULL; g_slist_free_full (edit->syntax_marker, g_free); edit->syntax_marker = NULL; - MC_PTR_FREE (edit->rules); tty_color_free_all_tmp (); } @@ -1463,7 +1461,7 @@ edit_free_syntax_rules (WEdit * edit) * type must be edit->syntax_type or NULL */ void -edit_load_syntax (WEdit * edit, char ***pnames, const char *type) +edit_load_syntax (WEdit * edit, GPtrArray * pnames, const char *type) { int r; char *f = NULL; @@ -1483,7 +1481,7 @@ edit_load_syntax (WEdit * edit, char ***pnames, const char *type) if (!tty_use_colors ()) return; - if (!option_syntax_highlighting && (!pnames || !*pnames)) + if (!option_syntax_highlighting && (pnames == NULL || pnames->len == 0)) return; if (edit != NULL && edit->filename_vpath == NULL) diff --git a/src/filemanager/boxes.c b/src/filemanager/boxes.c index 28bf2212a..679a8b647 100644 --- a/src/filemanager/boxes.c +++ b/src/filemanager/boxes.c @@ -103,8 +103,6 @@ static int listing_user_hotkey = 'u'; static unsigned long panel_listing_types_id, panel_user_format_id; static unsigned long mini_user_status_id, mini_user_format_id; -static unsigned long skin_name_id; - #ifdef HAVE_CHARSET static int new_display_codepage; #endif /* HAVE_CHARSET */ @@ -151,6 +149,99 @@ configure_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, voi /* --------------------------------------------------------------------------------------------- */ +static void +skin_apply (const gchar * skin_override) +{ + GError *mcerror = NULL; + + mc_skin_deinit (); + mc_skin_init (skin_override, &mcerror); + mc_fhl_free (&mc_filehighlight); + mc_filehighlight = mc_fhl_new (TRUE); + dlg_set_default_colors (); + input_set_default_colors (); + if (mc_global.mc_run_mode == MC_RUN_FULL) + command_set_default_colors (); + panel_deinit (); + panel_init (); + repaint_screen (); + + mc_error_message (&mcerror); +} + +/* --------------------------------------------------------------------------------------------- */ + +static const gchar * +skin_name_to_label (const gchar * name) +{ + if (strcmp (name, "default") == 0) + return _("< Default >"); + return name; +} + +/* --------------------------------------------------------------------------------------------- */ + +static int +sel_skin_button (WButton * button, int action) +{ + int result; + WListbox *skin_list; + WDialog *skin_dlg; + const gchar *skin_name; + int lxx, lyy; + unsigned int i; + unsigned int pos = 1; + + (void) action; + + lxx = COLS / 2; + lyy = (LINES - 13) / 2; + skin_dlg = + dlg_create (TRUE, lyy, lxx, 13, 24, dialog_colors, NULL, NULL, "[Appearance]", _("Skins"), + DLG_COMPACT); + + skin_list = listbox_new (1, 1, 11, 22, FALSE, NULL); + skin_name = "default"; + listbox_add_item (skin_list, LISTBOX_APPEND_AT_END, 0, skin_name_to_label (skin_name), + (void *) skin_name); + + if (strcmp (skin_name, current_skin_name) == 0) + listbox_select_entry (skin_list, 0); + + for (i = 0; i < skin_names->len; i++) + { + skin_name = g_ptr_array_index (skin_names, i); + if (strcmp (skin_name, "default") != 0) + { + listbox_add_item (skin_list, LISTBOX_APPEND_AT_END, 0, skin_name_to_label (skin_name), + (void *) skin_name); + if (strcmp (skin_name, current_skin_name) == 0) + listbox_select_entry (skin_list, pos); + pos++; + } + } + + add_widget (skin_dlg, skin_list); + + result = dlg_run (skin_dlg); + if (result == B_ENTER) + { + gchar *skin_label; + + listbox_get_current (skin_list, &skin_label, (void **) &skin_name); + g_free (current_skin_name); + current_skin_name = g_strdup (skin_name); + skin_apply (skin_name); + + button_set_text (button, str_fit_to_term (skin_label, 20, J_LEFT_FIT)); + } + dlg_destroy (skin_dlg); + + return 0; +} + +/* --------------------------------------------------------------------------------------------- */ + static cb_ret_t panel_listing_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data) { @@ -518,101 +609,6 @@ configure_box (void) /* --------------------------------------------------------------------------------------------- */ -static void -skin_apply (const gchar * skin_override) -{ - GError *mcerror = NULL; - - mc_skin_deinit (); - mc_skin_init (skin_override, &mcerror); - mc_fhl_free (&mc_filehighlight); - mc_filehighlight = mc_fhl_new (TRUE); - dlg_set_default_colors (); - input_set_default_colors (); - if (mc_global.mc_run_mode == MC_RUN_FULL) - command_set_default_colors (); - panel_deinit (); - panel_init (); - repaint_screen (); - - mc_error_message (&mcerror); -} - -/* --------------------------------------------------------------------------------------------- */ - -static const gchar * -skin_name_to_label (const gchar * name) -{ - if (strcmp (name, "default") == 0) - return _("< Default >"); - return name; -} - -/* --------------------------------------------------------------------------------------------- */ - -static int -sel_skin_button (WButton * button, int action) -{ - int result; - WListbox *skin_list; - WDialog *skin_dlg; - const gchar *skin_name; - int lxx, lyy; - unsigned int i; - unsigned int pos = 1; - - (void) action; - - lxx = COLS / 2; - lyy = (LINES - 13) / 2; - skin_dlg = - dlg_create (TRUE, lyy, lxx, 13, 24, dialog_colors, NULL, NULL, "[Appearance]", _("Skins"), - DLG_COMPACT); - - skin_list = listbox_new (1, 1, 11, 22, FALSE, NULL); - skin_name = "default"; - listbox_add_item (skin_list, LISTBOX_APPEND_AT_END, 0, skin_name_to_label (skin_name), - (void *) skin_name); - - if (strcmp (skin_name, current_skin_name) == 0) - listbox_select_entry (skin_list, 0); - - for (i = 0; i < skin_names->len; i++) - { - skin_name = g_ptr_array_index (skin_names, i); - if (strcmp (skin_name, "default") != 0) - { - listbox_add_item (skin_list, LISTBOX_APPEND_AT_END, 0, skin_name_to_label (skin_name), - (void *) skin_name); - if (strcmp (skin_name, current_skin_name) == 0) - listbox_select_entry (skin_list, pos); - pos++; - } - } - - add_widget (skin_dlg, skin_list); - - result = dlg_run (skin_dlg); - if (result == B_ENTER) - { - Widget *w; - gchar *skin_label; - - listbox_get_current (skin_list, &skin_label, (void **) &skin_name); - g_free (current_skin_name); - current_skin_name = g_strdup (skin_name); - skin_apply (skin_name); - - w = dlg_find_by_id (WIDGET (button)->owner, skin_name_id); - button_set_text (BUTTON (w), str_fit_to_term (skin_label, 20, J_LEFT_FIT)); - } - dlg_destroy (skin_dlg); - - return 0; -} - -/* --------------------------------------------------------------------------------------------- */ - void appearance_box (void) { @@ -626,7 +622,7 @@ appearance_box (void) QUICK_LABEL (N_("Skin:"), NULL), QUICK_NEXT_COLUMN, QUICK_BUTTON (str_fit_to_term (skin_name_to_label (current_skin_name), 20, J_LEFT_FIT), - B_USER, sel_skin_button, &skin_name_id), + B_USER, sel_skin_button, NULL), QUICK_STOP_COLUMNS, QUICK_BUTTONS_OK_CANCEL, QUICK_END diff --git a/src/filemanager/command.c b/src/filemanager/command.c index 690fb615a..7ee5edc37 100644 --- a/src/filemanager/command.c +++ b/src/filemanager/command.c @@ -508,7 +508,7 @@ command_insert (WInput * in, const char *text, gboolean insert_extra_space) { char *quoted_text; - quoted_text = name_quote (text, 1); + quoted_text = name_quote (text, TRUE); input_insert (in, quoted_text, insert_extra_space); g_free (quoted_text); } diff --git a/src/filemanager/ext.c b/src/filemanager/ext.c index fd933abbc..cca51d1c3 100644 --- a/src/filemanager/ext.c +++ b/src/filemanager/ext.c @@ -78,7 +78,7 @@ /*** file scope type declarations ****************************************************************/ -typedef char *(*quote_func_t) (const char *name, int quote_percent); +typedef char *(*quote_func_t) (const char *name, gboolean quote_percent); /*** file scope variables ************************************************************************/ @@ -138,7 +138,7 @@ static char * exec_get_file_name (const vfs_path_t * filename_vpath) { if (!do_local_copy) - return quote_func (vfs_path_get_last_path_str (filename_vpath), 0); + return quote_func (vfs_path_get_last_path_str (filename_vpath), FALSE); if (localfilecopy_vpath == NULL) { @@ -151,7 +151,7 @@ exec_get_file_name (const vfs_path_t * filename_vpath) localmtime = mystat.st_mtime; } - return quote_func (vfs_path_get_last_path_str (localfilecopy_vpath), 0); + return quote_func (vfs_path_get_last_path_str (localfilecopy_vpath), FALSE); } /* --------------------------------------------------------------------------------------------- */ @@ -574,7 +574,7 @@ get_file_type_local (const vfs_path_t * filename_vpath, char *buf, int buflen) char *tmp; int ret; - tmp = name_quote (vfs_path_get_last_path_str (filename_vpath), 0); + tmp = name_quote (vfs_path_get_last_path_str (filename_vpath), FALSE); ret = get_popen_information (FILE_CMD, tmp, buf, buflen); g_free (tmp); @@ -594,8 +594,8 @@ get_file_encoding_local (const vfs_path_t * filename_vpath, char *buf, int bufle char *tmp, *lang, *args; int ret; - tmp = name_quote (vfs_path_get_last_path_str (filename_vpath), 0); - lang = name_quote (autodetect_codeset, 0); + tmp = name_quote (vfs_path_get_last_path_str (filename_vpath), FALSE); + lang = name_quote (autodetect_codeset, FALSE); args = g_strconcat (" -L", lang, " -i ", tmp, (char *) NULL); ret = get_popen_information ("enca", args, buf, buflen); diff --git a/src/filemanager/find.c b/src/filemanager/find.c index 6f718088b..c5853a06f 100644 --- a/src/filemanager/find.c +++ b/src/filemanager/find.c @@ -249,8 +249,7 @@ parse_ignore_dirs (const char *ignore_dirs) if (find_ignore_dirs[r][0] == '\0') { /* empty entry -- skip it */ - g_free (find_ignore_dirs[r]); - find_ignore_dirs[r] = NULL; + MC_PTR_FREE (find_ignore_dirs[r]); continue; } diff --git a/src/filemanager/mountlist.c b/src/filemanager/mountlist.c index 41b3522f9..6dfcbe9df 100644 --- a/src/filemanager/mountlist.c +++ b/src/filemanager/mountlist.c @@ -157,6 +157,12 @@ #include #endif +#ifdef MOUNTED_PROC_MOUNTINFO +/* Use /proc/self/mountinfo instead of /proc/self/mounts (/etc/mtab) + * on Linux, if available */ +#include +#endif + #ifndef HAVE_HASMNTOPT #define hasmntopt(mnt, opt) ((char *) 0) #endif @@ -227,10 +233,9 @@ we grant an exception to any with "bind" in its list of mount options. I.e., those are *not* dummy entries. */ #ifdef MOUNTED_GETMNTENT1 -#define ME_DUMMY(Fs_name, Fs_type, Fs_ent) \ +#define ME_DUMMY(Fs_name, Fs_type, Bind) \ (ME_DUMMY_0 (Fs_name, Fs_type) \ - || (strcmp (Fs_type, "none") == 0 \ - && !hasmntopt (Fs_ent, "bind"))) + || (strcmp (Fs_type, "none") == 0 && !Bind)) #else #define ME_DUMMY(Fs_name, Fs_type) \ (ME_DUMMY_0 (Fs_name, Fs_type) || strcmp (Fs_type, "none") == 0) @@ -653,32 +658,79 @@ read_file_system_list (int need_fs_type) #ifdef MOUNTED_GETMNTENT1 /* GNU/Linux, 4.3BSD, SunOS, HP-UX, Dynix, Irix. */ { - struct mntent *mnt; - const char *table = MOUNTED; - FILE *fp; +#ifdef MOUNTED_PROC_MOUNTINFO + struct libmnt_table *fstable = NULL; - fp = setmntent (table, "r"); - if (fp == NULL) - return NULL; + fstable = mnt_new_table_from_file ("/proc/self/mountinfo"); - while ((mnt = getmntent (fp))) + if (fstable != NULL) { - me = g_malloc (sizeof (*me)); - me->me_devname = g_strdup (mnt->mnt_fsname); - me->me_mountdir = g_strdup (mnt->mnt_dir); - me->me_type = g_strdup (mnt->mnt_type); - me->me_type_malloced = 1; - me->me_dummy = ME_DUMMY (me->me_devname, me->me_type, mnt); - me->me_remote = ME_REMOTE (me->me_devname, me->me_type); - me->me_dev = dev_from_mount_options (mnt->mnt_opts); + struct libmnt_fs *fs; + struct libmnt_iter *iter; + + iter = mnt_new_iter (MNT_ITER_FORWARD); + + while (iter && mnt_table_next_fs (fstable, iter, &fs) == 0) + { + me = g_malloc (sizeof *me); + + me->me_devname = g_strdup (mnt_fs_get_source (fs)); + me->me_mountdir = g_strdup (mnt_fs_get_target (fs)); + me->me_type = g_strdup (mnt_fs_get_fstype (fs)); + me->me_type_malloced = 1; + me->me_dev = mnt_fs_get_devno (fs); + /* Note we don't use mnt_fs_is_pseudofs() or mnt_fs_is_netfs() here + as libmount's classification is non-compatible currently. + Also we pass "false" for the "Bind" option as that's only + significant when the Fs_type is "none" which will not be + the case when parsing "/proc/self/mountinfo", and only + applies for static /etc/mtab files. */ + me->me_dummy = ME_DUMMY (me->me_devname, me->me_type, FALSE); + me->me_remote = ME_REMOTE (me->me_devname, me->me_type); + + /* Add to the linked list. */ + *mtail = me; + mtail = &me->me_next; + } + + mnt_free_iter (iter); + mnt_free_table (fstable); - /* Add to the linked list. */ - *mtail = me; - mtail = &me->me_next; } + else /* fallback to /proc/self/mounts (/etc/mtab) if anything failed */ +#endif /* MOUNTED_PROC_MOUNTINFO */ + { + FILE *fp; + struct mntent *mnt; + const char *table = MOUNTED; - if (endmntent (fp) == 0) - goto free_then_fail; + fp = setmntent (table, "r"); + if (fp == NULL) + return NULL; + + while ((mnt = getmntent (fp)) != NULL) + { + gboolean bind; + + bind = hasmntopt (mnt, "bind") != NULL; + + me = g_malloc (sizeof (*me)); + me->me_devname = g_strdup (mnt->mnt_fsname); + me->me_mountdir = g_strdup (mnt->mnt_dir); + me->me_type = g_strdup (mnt->mnt_type); + me->me_type_malloced = 1; + me->me_dummy = ME_DUMMY (me->me_devname, me->me_type, bind); + me->me_remote = ME_REMOTE (me->me_devname, me->me_type); + me->me_dev = dev_from_mount_options (mnt->mnt_opts); + + /* Add to the linked list. */ + *mtail = me; + mtail = &me->me_next; + } + + if (endmntent (fp) == 0) + goto free_then_fail; + } } #endif /* MOUNTED_GETMNTENT1. */ @@ -999,7 +1051,7 @@ read_file_system_list (int need_fs_type) char *table = MNTTAB; FILE *fp; int ret; - int lockfd; + int lockfd = -1; #if defined F_RDLCK && defined F_SETLKW /* MNTTAB_LOCK is a macro name of our own invention; it's not present in diff --git a/src/filemanager/panel.c b/src/filemanager/panel.c index 3879bb1d5..87f7b59ae 100644 --- a/src/filemanager/panel.c +++ b/src/filemanager/panel.c @@ -771,17 +771,14 @@ file_compute_color (int attr, file_entry_t * fe) /** Formats the file number file_index of panel in the buffer dest */ static filename_scroll_flag_t -format_file (char *dest, int limit, WPanel * panel, int file_index, int width, int attr, - gboolean isstatus, int *field_length) +format_file (WPanel * panel, int file_index, int width, int attr, gboolean isstatus, + int *field_length) { int color, length = 0, empty_line; format_e *format, *home; file_entry_t *fe; filename_scroll_flag_t res = FILENAME_NOSCROLL; - (void) dest; - (void) limit; - empty_line = (file_index >= panel->dir.len); home = isstatus ? panel->status_format : panel->format; fe = &panel->dir.list[file_index]; @@ -893,7 +890,6 @@ repaint_file (WPanel * panel, int file_index, gboolean mv, int attr, gboolean is int second_column = 0; int width; int offset = 0; - char buffer[BUF_MEDIUM]; filename_scroll_flag_t ret_frm; int ypos = 0; gboolean panel_is_split = !isstatus && panel->split; @@ -930,7 +926,7 @@ repaint_file (WPanel * panel, int file_index, gboolean mv, int attr, gboolean is widget_move (w, ypos, offset + 1); } - ret_frm = format_file (buffer, sizeof (buffer), panel, file_index, width, attr, isstatus, &fln); + ret_frm = format_file (panel, file_index, width, attr, isstatus, &fln); if (panel_is_split) { @@ -2784,8 +2780,10 @@ do_enter_on_file_entry (file_entry_t * fe) } { - char *tmp = name_quote (fe->fname, 0); - char *cmd = g_strconcat (".", PATH_SEP_STR, tmp, (char *) NULL); + char *tmp, *cmd; + + tmp = name_quote (fe->fname, FALSE); + cmd = g_strconcat (".", PATH_SEP_STR, tmp, (char *) NULL); g_free (tmp); shell_execute (cmd, 0); g_free (cmd); diff --git a/src/filemanager/tree.c b/src/filemanager/tree.c index 9e1c0e1f8..5a8b0e320 100644 --- a/src/filemanager/tree.c +++ b/src/filemanager/tree.c @@ -14,7 +14,7 @@ Norbert Warmuth, 1997 Miguel de Icaza, 1996, 1999 Slava Zanko , 2013 - Andrew Borodin , 2013 + Andrew Borodin , 2013, 2014 This file is part of the Midnight Commander. @@ -306,7 +306,6 @@ show_tree (WTree * tree) i = 0; while (current->prev && i < tree->topdiff) { - current = current->prev; if (current->sublevel < tree->selected_ptr->sublevel) @@ -324,15 +323,11 @@ show_tree (WTree * tree) if (vfs_path_equal_len (current->name, tree->selected_ptr->name, j)) i++; } - else + else if (current->sublevel == tree->selected_ptr->sublevel + 1) { - if (current->sublevel == tree->selected_ptr->sublevel + 1 - && vfs_path_len (tree->selected_ptr->name) > 1) - { - if (vfs_path_equal_len (current->name, tree->selected_ptr->name, - vfs_path_len (tree->selected_ptr->name))) - i++; - } + j = vfs_path_len (tree->selected_ptr->name); + if (j > 1 && vfs_path_equal_len (current->name, tree->selected_ptr->name, j)) + i++; } } tree->topdiff = i; diff --git a/src/filemanager/usermenu.c b/src/filemanager/usermenu.c index 38f71977f..0ad50309f 100644 --- a/src/filemanager/usermenu.c +++ b/src/filemanager/usermenu.c @@ -491,7 +491,7 @@ execute_menu_command (WEdit * edit_widget, const char *commands, gboolean show_p { char *tmp; - tmp = name_quote (parameter, 0); + tmp = name_quote (parameter, FALSE); fputs (tmp, cmd_file); g_free (tmp); } @@ -737,7 +737,7 @@ char * expand_format (struct WEdit *edit_widget, char c, gboolean do_quote) { WPanel *panel = NULL; - char *(*quote_func) (const char *, int); + char *(*quote_func) (const char *, gboolean); char *fname = NULL; char *result; char c_lc; @@ -785,10 +785,10 @@ expand_format (struct WEdit *edit_widget, char c, gboolean do_quote) { case 'f': case 'p': - result = (*quote_func) (fname, 0); + result = quote_func (fname, FALSE); goto ret; case 'x': - result = (*quote_func) (extension (fname), 0); + result = quote_func (extension (fname), FALSE); goto ret; case 'd': { @@ -800,7 +800,7 @@ expand_format (struct WEdit *edit_widget, char c, gboolean do_quote) else cwd = vfs_get_current_dir (); - qstr = (*quote_func) (cwd, 0); + qstr = quote_func (cwd, FALSE); g_free (cwd); @@ -838,14 +838,14 @@ expand_format (struct WEdit *edit_widget, char c, gboolean do_quote) char *file; file = mc_config_get_full_path (EDIT_BLOCK_FILE); - result = (*quote_func) (file, 0); + result = quote_func (file, FALSE); g_free (file); goto ret; } #endif if (c_lc == 'b') { - result = strip_ext ((*quote_func) (fname, 0)); + result = strip_ext (quote_func (fname, FALSE)); goto ret; } break; @@ -854,7 +854,7 @@ expand_format (struct WEdit *edit_widget, char c, gboolean do_quote) #ifdef USE_INTERNAL_EDIT if (edit_widget) { - result = strip_ext ((*quote_func) (fname, 0)); + result = strip_ext (quote_func (fname, FALSE)); goto ret; } #endif @@ -862,14 +862,14 @@ expand_format (struct WEdit *edit_widget, char c, gboolean do_quote) case 'm': /* menu file name */ if (menu) { - result = (*quote_func) (menu, 0); + result = quote_func (menu, FALSE); goto ret; } break; case 's': if (!panel || !panel->marked) { - result = (*quote_func) (fname, 0); + result = quote_func (fname, FALSE); goto ret; } @@ -894,7 +894,7 @@ expand_format (struct WEdit *edit_widget, char c, gboolean do_quote) { char *tmp; - tmp = (*quote_func) (panel->dir.list[i].fname, 0); + tmp = quote_func (panel->dir.list[i].fname, FALSE); g_string_append (block, tmp); g_string_append_c (block, ' '); g_free (tmp); diff --git a/src/vfs/extfs/extfs.c b/src/vfs/extfs/extfs.c index 259c4daa2..c9f6ec5be 100644 --- a/src/vfs/extfs/extfs.c +++ b/src/vfs/extfs/extfs.c @@ -420,7 +420,7 @@ extfs_open_archive (int fstype, const char *name, struct archive **pparc) goto ret; } - tmp = name_quote (vfs_path_get_last_path_str (name_vpath), 0); + tmp = name_quote (vfs_path_get_last_path_str (name_vpath), FALSE); } cmd = g_strconcat (info->path, info->prefix, " list ", @@ -834,13 +834,13 @@ extfs_cmd (const char *str_extfs_cmd, struct archive *archive, int retval; file = extfs_get_path_from_entry (entry); - quoted_file = name_quote (file, 0); + quoted_file = name_quote (file, FALSE); g_free (file); archive_name = extfs_get_archive_name (archive); - quoted_archive_name = name_quote (archive_name, 0); + quoted_archive_name = name_quote (archive_name, FALSE); g_free (archive_name); - quoted_localname = name_quote (localname, 0); + quoted_localname = name_quote (localname, FALSE); info = &g_array_index (extfs_plugins, extfs_plugin_info_t, archive->fstype); cmd = g_strconcat (info->path, info->prefix, str_extfs_cmd, quoted_archive_name, " ", quoted_file, " ", quoted_localname, (char *) NULL); @@ -868,11 +868,11 @@ extfs_run (const vfs_path_t * vpath) p = extfs_get_path (vpath, &archive, FALSE); if (p == NULL) return; - q = name_quote (p, 0); + q = name_quote (p, FALSE); g_free (p); archive_name = extfs_get_archive_name (archive); - quoted_archive_name = name_quote (archive_name, 0); + quoted_archive_name = name_quote (archive_name, FALSE); g_free (archive_name); info = &g_array_index (extfs_plugins, extfs_plugin_info_t, archive->fstype); cmd = diff --git a/src/vfs/sfs/sfs.c b/src/vfs/sfs/sfs.c index 14717f77c..d5d06bb4e 100644 --- a/src/vfs/sfs/sfs.c +++ b/src/vfs/sfs/sfs.c @@ -157,11 +157,11 @@ sfs_vfmake (const vfs_path_t * vpath, vfs_path_t * cache_vpath) vfs_path_free (pname); return -1; } - pqname = name_quote (vfs_path_get_last_path_str (s), 0); + pqname = name_quote (vfs_path_get_last_path_str (s), FALSE); vfs_path_free (s); } else - pqname = name_quote (vfs_path_as_str (pname), 0); + pqname = name_quote (vfs_path_as_str (pname), FALSE); vfs_path_free (pname); diff --git a/src/viewer/datasource.c b/src/viewer/datasource.c index 93cb62aed..3941a1278 100644 --- a/src/viewer/datasource.c +++ b/src/viewer/datasource.c @@ -151,19 +151,6 @@ mcview_get_ptr_file (mcview_t * view, off_t byte_index) /* --------------------------------------------------------------------------------------------- */ -char * -mcview_get_ptr_string (mcview_t * view, off_t byte_index) -{ -#ifdef HAVE_ASSERT_H - assert (view->datasource == DS_STRING); -#endif - if (byte_index < (off_t) view->ds_string_len) - return (char *) (view->ds_string_data + byte_index); - return NULL; -} - -/* --------------------------------------------------------------------------------------------- */ - int mcview_get_utf (mcview_t * view, off_t byte_index, int *char_width, gboolean * result) { @@ -237,21 +224,34 @@ mcview_get_utf (mcview_t * view, off_t byte_index, int *char_width, gboolean * r /* --------------------------------------------------------------------------------------------- */ -gboolean -mcview_get_byte_string (mcview_t * view, off_t byte_index, int *retval) +char * +mcview_get_ptr_string (mcview_t * view, off_t byte_index) { #ifdef HAVE_ASSERT_H assert (view->datasource == DS_STRING); #endif - if (byte_index < (off_t) view->ds_string_len) - { - if (retval) - *retval = view->ds_string_data[byte_index]; - return TRUE; - } - if (retval) + if (byte_index >= 0 && byte_index < (off_t) view->ds_string_len) + return (char *) (view->ds_string_data + byte_index); + return NULL; +} + +/* --------------------------------------------------------------------------------------------- */ + +gboolean +mcview_get_byte_string (mcview_t * view, off_t byte_index, int *retval) +{ + char *p; + + if (retval != NULL) *retval = -1; - return FALSE; + + p = mcview_get_ptr_string (view, byte_index); + if (p == NULL) + return FALSE; + + if (retval != NULL) + *retval = *p; + return TRUE; } /* --------------------------------------------------------------------------------------------- */ diff --git a/src/viewer/display.c b/src/viewer/display.c index 00c6ec0c5..9255f11b6 100644 --- a/src/viewer/display.c +++ b/src/viewer/display.c @@ -288,11 +288,12 @@ mcview_compute_areas (mcview_t * view) /* Compute the heights of the areas */ rest = view_area.height; - height = mcview_dimen_min (rest, 1); + height = min (rest, 1); view->status_area.height = height; rest -= height; - height = mcview_dimen_min (rest, (ruler == RULER_NONE || view->hex_mode) ? 0 : 2); + height = (ruler == RULER_NONE || view->hex_mode) ? 0 : 2; + height = min (rest, height); view->ruler_area.height = height; rest -= height; diff --git a/src/viewer/growbuf.c b/src/viewer/growbuf.c index 7a3c81b2d..8b06c6baf 100644 --- a/src/viewer/growbuf.c +++ b/src/viewer/growbuf.c @@ -242,39 +242,26 @@ mcview_growbuf_read_until (mcview_t * view, off_t ofs) gboolean mcview_get_byte_growing_buffer (mcview_t * view, off_t byte_index, int *retval) { - off_t pageno; - off_t pageindex; - - if (retval != NULL) - *retval = -1; - - pageno = byte_index / VIEW_PAGE_SIZE; - pageindex = byte_index % VIEW_PAGE_SIZE; + char *p; #ifdef HAVE_ASSERT_H assert (view->growbuf_in_use); #endif - if (pageno < 0) + if (retval != NULL) + *retval = -1; + + if (byte_index < 0) return FALSE; - mcview_growbuf_read_until (view, byte_index + 1); - if (view->growbuf_blockptr->len == 0) + p = mcview_get_ptr_growing_buffer (view, byte_index); + if (p == NULL) return FALSE; - if (pageno < (off_t) view->growbuf_blockptr->len - 1) - { - if (retval != NULL) - *retval = *((byte *) (g_ptr_array_index (view->growbuf_blockptr, pageno) + pageindex)); - return TRUE; - } - if (pageno == (off_t) view->growbuf_blockptr->len - 1 - && pageindex < (off_t) view->growbuf_lastindex) - { - if (retval != NULL) - *retval = *((byte *) (g_ptr_array_index (view->growbuf_blockptr, pageno) + pageindex)); - return TRUE; - } - return FALSE; + + if (retval != NULL) + *retval = *p; + + return TRUE; } /* --------------------------------------------------------------------------------------------- */ @@ -282,16 +269,18 @@ mcview_get_byte_growing_buffer (mcview_t * view, off_t byte_index, int *retval) char * mcview_get_ptr_growing_buffer (mcview_t * view, off_t byte_index) { - off_t pageno = byte_index / VIEW_PAGE_SIZE; - off_t pageindex = byte_index % VIEW_PAGE_SIZE; + off_t pageno, pageindex; #ifdef HAVE_ASSERT_H assert (view->growbuf_in_use); #endif - if (pageno < 0) + if (byte_index < 0) return NULL; + pageno = byte_index / VIEW_PAGE_SIZE; + pageindex = byte_index % VIEW_PAGE_SIZE; + mcview_growbuf_read_until (view, byte_index + 1); if (view->growbuf_blockptr->len == 0) return NULL; diff --git a/src/viewer/inlines.h b/src/viewer/inlines.h index 4e34caec8..fbe3afd0c 100644 --- a/src/viewer/inlines.h +++ b/src/viewer/inlines.h @@ -17,6 +17,7 @@ /*** inline functions ****************************************************************************/ +/* difference or zero */ static inline off_t mcview_offset_doz (off_t a, off_t b) { @@ -45,14 +46,6 @@ mcview_dimen_doz (screen_dimen a, screen_dimen b) /* --------------------------------------------------------------------------------------------- */ -static inline screen_dimen -mcview_dimen_min (screen_dimen a, screen_dimen b) -{ - return (a < b) ? a : b; -} - -/* --------------------------------------------------------------------------------------------- */ - /* {{{ Simple Primitive Functions for mcview_t }}} */ static inline gboolean mcview_is_in_panel (mcview_t * view) @@ -120,7 +113,7 @@ mcview_get_byte (mcview_t * view, off_t offset, int *retval) #ifdef HAVE_ASSERT_H assert (!"Unknown datasource type"); #endif - return -1; + return FALSE; } /* --------------------------------------------------------------------------------------------- */ diff --git a/src/viewer/internal.h b/src/viewer/internal.h index 64ebb2fc7..244468bc0 100644 --- a/src/viewer/internal.h +++ b/src/viewer/internal.h @@ -135,7 +135,9 @@ struct mcview_struct gboolean hexedit_lownibble; /* Are we editing the last significant nibble? */ gboolean locked; /* We hold lock on current file */ +#ifdef HAVE_CHARSET gboolean utf8; /* It's multibyte file codeset */ +#endif coord_cache_t *coord_cache; /* Cache for mapping offsets to cursor positions */ diff --git a/src/viewer/lib.c b/src/viewer/lib.c index fea008dfd..740623aa2 100644 --- a/src/viewer/lib.c +++ b/src/viewer/lib.c @@ -242,8 +242,7 @@ mcview_done (mcview_t * view) mc_search_free (view->search); view->search = NULL; - g_free (view->last_search_string); - view->last_search_string = NULL; + MC_PTR_FREE (view->last_search_string); mcview_nroff_seq_free (&view->search_nroff_seq); mcview_hexedit_free_change_list (view); diff --git a/src/viewer/move.c b/src/viewer/move.c index 7cd852b7d..8d601a595 100644 --- a/src/viewer/move.c +++ b/src/viewer/move.c @@ -180,10 +180,8 @@ mcview_move_down (mcview_t * view, off_t lines) { off_t i, limit; - if (last_byte >= (off_t) view->bytes_per_line) - limit = last_byte - view->bytes_per_line; - else - limit = 0; + limit = mcview_offset_doz (last_byte, (off_t) view->bytes_per_line); + for (i = 0; i < lines && view->hex_cursor < limit; i++) { view->hex_cursor += view->bytes_per_line; @@ -258,12 +256,8 @@ mcview_move_left (mcview_t * view, off_t columns) view->hexedit_lownibble = !view->hexedit_lownibble; } else - { - if (view->dpy_text_column >= columns) - view->dpy_text_column -= columns; - else - view->dpy_text_column = 0; - } + view->dpy_text_column = mcview_offset_doz (view->dpy_text_column, columns); + mcview_movement_fixups (view, FALSE); } @@ -276,6 +270,7 @@ mcview_move_right (mcview_t * view, off_t columns) { off_t last_byte; off_t old_cursor = view->hex_cursor; + last_byte = mcview_offset_doz (mcview_get_filesize (view), 1); #ifdef HAVE_ASSERT_H assert (columns == 1); @@ -376,16 +371,15 @@ mcview_moveto_eol (mcview_t * view) else { off_t eol; + bol = mcview_bol (view, view->dpy_start, 0); eol = mcview_eol (view, view->dpy_start, mcview_get_filesize (view)); - if (!view->utf8) - { - if (eol > bol) - view->dpy_text_column = eol - bol; - } - else + +#ifdef HAVE_CHARSET + if (view->utf8) { char *str = NULL; + switch (view->datasource) { case DS_STDIO_PIPE: @@ -406,11 +400,13 @@ mcview_moveto_eol (mcview_t * view) else view->dpy_text_column = eol - bol; } - - if (view->dpy_text_column < (off_t) view->data_area.width) - view->dpy_text_column = 0; else - view->dpy_text_column = view->dpy_text_column - (off_t) view->data_area.width; +#endif /* HAVE_CHARSET */ + if (eol > bol) + view->dpy_text_column = eol - bol; + + view->dpy_text_column = + mcview_offset_doz (view->dpy_text_column, (off_t) view->data_area.width); } mcview_movement_fixups (view, FALSE); } diff --git a/tests/src/editor/editcmd__edit_complete_word_cmd.c b/tests/src/editor/editcmd__edit_complete_word_cmd.c index ab4a90413..940cd5d15 100644 --- a/tests/src/editor/editcmd__edit_complete_word_cmd.c +++ b/tests/src/editor/editcmd__edit_complete_word_cmd.c @@ -48,7 +48,7 @@ static WEdit *test_edit; /* --------------------------------------------------------------------------------------------- */ /* @Mock */ void -edit_load_syntax (WEdit * _edit, char ***_pnames, const char *_type) +edit_load_syntax (WEdit * _edit, GPtrArray * _pnames, const char *_type) { (void) _edit; (void) _pnames;