Merge branch '2944_cleanup'

* 2944_cleanup: (35 commits)
  Update all po/*.po files.
  Rename keymap files to be with .keymap suffix.
  (mc_config_new_or_override_file): minor optimization.
  Refactoring: use GString instead of "struct selection".
  (edit_translate_key): move from editkeys.c into editwidget.c
  Sync with gnulib 62bb7a8bf95807d6339e1e17fc0d21c319b280a2.
  Code refactoring in tests.
  Adjust look'n'feel of editor options dialog window.
  Clarify EN and RU man pages: list command line options alphabetically.
  (overwrite_query_dialog): adjust dialog size.
  Clarify widget redraw in runtime.
  (size_trunc_len): support automatic maximum unit for specified size.
  Fix formatting in manual pages.
  Fix wrapper location in description of -P/printwd option.
  (edit_insert_over): move from src/editor/editcmd.c into src/editor/edit.c.
  (edit_insert_column_of_text_from_file): refactoring:
  (edit_get_byte): refactoring: use edit_get_byte_ptr().
  Code refactoring in tests.
  Grammar fix in English man-page.
  (init_panelize): support --disable-nls.
  ...
This commit is contained in:
Andrew Borodin 2013-03-12 13:32:03 +04:00
commit a7b619a90d
145 changed files with 4124 additions and 2968 deletions

View File

@ -1,4 +1,4 @@
This file describes how keybind names used in mc.keymap.* files
This file describes how keybind names used in mc.*.keymap files
are changed in 4.8.* releases.
+---------------------------------+-------------------------+-----------------------------------------+

View File

@ -2,7 +2,8 @@ SED_PARAMETERS = \
-e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \
-e "s/%DISTR_VERSION%/@DISTR_VERSION@/g" \
-e "s{%prefix%{@prefix@{g" \
-e "s{%sysconfdir%{@sysconfdir@{g"
-e "s{%sysconfdir%{@sysconfdir@{g" \
-e "s{%libexecdir%{@libexecdir@{g"
MAN_DATE_CMD = \
LC_ALL=$(DATE_LANG) @PERL@ -MPOSIX -e '\

View File

@ -98,9 +98,9 @@ directorio de trabajo en el archivo indicado. Esta opción no debe ser
usada directamente, sino desde un guión de shell adecuado, para dejar
como directorio activo el directorio que estaba en uso dentro de
Midnight Commander. Consúltese en los archivos
.B %prefix%/share/mc/bin/mc.sh
.B %libexecdir%/mc/mc.sh
(usuarios de bash y zsh) y
.B %prefix%/share/mc/bin/mc.csh
.B %libexecdir%/mc/mc.csh
(usuarios de tcsh) la manera de definir
.B mc
como un alias para el correspondiente guión de shell.
@ -108,7 +108,7 @@ como un alias para el correspondiente guión de shell.
.I \-s, \-\-slow
Activa el modo para terminales lentos. En este modo el programa no
dibuja bordes con líneas de caracteres y desactiva el modo detallado.
Si no se rellana la sección [Lines] el marco pseudo-gráfico estará
Si no se rellana la sección [Lines] el marco pseudo\-gráfico estará
formado por espacios; en caso contrario el marco se contruye con
caracteres de texto según los parámetros siguientes:
.TP
@ -3747,7 +3747,7 @@ de 900 segundos.
.TP
.I clipboard_store
Ruta de acceso y opciones a una utilidad de portapapeles externa como 'xclip'
para cargar texto de un archivo como selección en X-Windows.
para cargar texto de un archivo como selección en X Window.
Por ejemplo:
.PP
.nf
@ -3756,7 +3756,7 @@ clipboard_store=xclip \-i
.TP
.I clipboard_paste
Ruta de acceso y opciones a una utilidad de portapapeles externa como 'xclip'
para volcar la selección de X-Windows a la salida estándar.
para volcar la selección de X Window a la salida estándar.
Por ejemplo:
.PP
.nf

View File

@ -59,9 +59,9 @@ helyett a Midnight Commander által utoljára meglátogatott könyvtárra való
átváltást (köszönet a funkcióért és a funkcióhoz szükséges kódért Torben
Fjerdingstad\-nek és Sergey\-nek közreműködésükért). Kérlek, ne csinálj
szó szerinti másolatot a funkció beállításairól. A fájlok forrása a
.I %prefix%/share/mc/bin/mc.sh
.I %libexecdir%/mc/mc.sh
(bash és zsh felhasználóknak), illetőleg a
.I %prefix%/share/mc/bin/mc.csh
.I %libexecdir%/mc/mc.csh
(tcsh felhasználóknak) fájl. Ilyenkor, amikor a funkció beállításokat
változtatod, a profil értékeket nem szükséges megváltoztatnod, csak
arról gondoskodj, hogy az MC\-t ne fordítsd eltérő beállításokkal.

View File

@ -80,9 +80,9 @@ Questa funzione non è fatta per un uso diretto, ma dovrebbe essere
utilizzata da una speciale funzione shell che imposti automaticamente
l'ultima directory corrente della shell come l'ultima directory in cui
stava il Midnight Commander. Prelevate i file
.B %prefix%/share/mc/bin/mc.sh
.B %libexecdir%/mc/mc.sh
(utenti bash e zsh) o rispettivamente
.B %prefix%/share/mc/bin/mc.csh
.B %libexecdir%/mc/mc.csh
(utenti tcsh) per definire
.B mc
come un alias allo script di shell appropriato.

View File

@ -36,17 +36,15 @@ Colors
.\"Colors"
section.
.TP
.I \-S arg, \-\-skin=arg
Specify a name of skin in the command line. Technology of skins is
documented in the
.\"LINK2"
Skins
.\"Skins"
section.
.I \-\-configure\-options
Display configure options.
.TP
.I \-d, \-\-nomouse
Disable mouse support.
.TP
.I \-D N, \-\-debuglevel=N
Save the debug level for SMB VFS. N is in 0\-10 range.
.TP
.I \-e [file], \-\-edit[=file]
Start the internal editor. If the file is specified, open it on
startup. See also
@ -59,8 +57,9 @@ Display the compiled\-in search paths for Midnight Commander files.
Display extended info about compiled\-in paths for
Midnight Commander.
.TP
.I \-\-configure\-options
Display configure options.
.I \-g, \-\-oldmouse
Force a "normal tracking" mouse mode. Used when running on
xterm\-capable terminals (tmux/screen).
.TP
.I \-k, \-\-resetsoft
Reset softkeys to their default from the termcap/terminfo
@ -69,23 +68,20 @@ database. Only useful on HP terminals when the function keys don't work.
.I \-K file, \-\-keymap=file
Specify a name of keymap file in the command line.
.TP
.I \-\-nokeymap
Don't load key bindings from any file, use default hardcoded keys.
.TP
.I \-l file, \-\-ftplog=file
Save the ftpfs dialog with the server in file.
.TP
.I \-D N, \-\-debuglevel=N
Save the debug level for SMB VFS. N is in 0\-10 range.
.I \-\-nokeymap
Don't load key bindings from any file, use default hardcoded keys.
.TP
.I \-P file, \-\-printwd=file
Print the last working directory to the specified file. This option is
not meant to be used directly. Instead, it's used from a special shell
script that automatically changes the current directory of the shell to
the last directory the Midnight Commander was in. Source the file
.B %prefix%/share/mc/bin/mc.sh
.B %libexecdir%/mc/mc.sh
(bash and zsh users) or
.B %prefix%/share/mc/bin/mc.csh
.B %libexecdir%/mc.csh
(tcsh users) respectively to define
.B mc
as an alias to the appropriate shell script.
@ -136,6 +132,14 @@ thin horizontal line
.B thinvert
thin vertical line
.TP
.I \-S arg, \-\-skin=arg
Specify a name of skin in the command line. Technology of skins is
documented in the
.\"LINK2"
Skins
.\"Skins"
section.
.TP
.I \-t, \-\-termcap
Used only if the code was compiled with Slang and terminfo: it makes
the Midnight Commander use the value of the
@ -165,10 +169,6 @@ screen modes, and able to send mouse escape sequences).
.TP
.I \-X, \-\-no\-x11
Do not use X11 to get the state of modifiers Alt, Ctrl, Shift
.TP
.I \-g, \-\-oldmouse
Force a "normal tracking" mouse mode. Used when running on
xterm\-capable terminals (tmux/screen).
.PP
If specified, the first path name is the directory to show in the
selected panel; the second path name is the directory to be shown in
@ -1142,12 +1142,12 @@ You can change either one.
Sometimes you may want to change the absolute path of the original into
a relative path. An absolute path starts from the root directory:
.PP
.I /home/frodo/mc/mc -> /home/frodo/new/mc
.I /home/frodo/mc/mc \-> /home/frodo/new/mc
.PP
A relative link describes the original file's location starting from the
location of the link itself:
.PP
.I /home/frodo/mc/mc -> ../new/mc
.I /home/frodo/mc/mc \-> ../new/mc
.PP
You can force Midnight Commander to suggest a relative path by pressing
"C\-x v" instead of "C\-x s".
@ -2013,7 +2013,7 @@ and the suffixes are shown in upper case (K, M ...)
.PP
.I Mix all files.
If this option is enabled, all files and directories are shown mixed
together. If the option is desabled (default), directories (and links to
together. If the option is disabled (default), directories (and links to
directories) are shown at the beginning of the listing, and other files below.
.PP
.I Show backup files.
@ -3567,7 +3567,7 @@ is used for selected hyperlink.
.PP
Popup menu uses following colors:
.I pmenunormal
is used for non-selected menu items and as a main color of popup menu window,
is used for non\-selected menu items and as a main color of popup menu window,
.I pmenusel
is used for selected menu item,
.I pmenutitle

View File

@ -589,7 +589,7 @@ Search autocomplete candidates in entire of file or just from
begin of file to cursor position (0)
.TP
.I spell_language
Spelling language (en, en-variant_0, ru, etc) installed with aspell
Spelling language (en, en\-variant_0, ru, etc) installed with aspell
package (a full list can be get using 'aspell' utility).
Use
.B spell_language = NONE

View File

@ -40,15 +40,19 @@ UNIX\-подобных операционных системах.
Цвета\&.
.\"Colors"
.TP
.I \-S arg, \-\-skin
Используется для того, чтобы задать другой скин в командной
строке. Технология скинов описана в разделе
.\"LINK2"
Внешний вид\&.
.\"Skins"
.I \-\-configure\-options
Выводит опции конфигурирования, с которыми был собран Midnight Commander.
.TP
.I \-d, \-\-nomouse
Отключает поддержку мыши.
.TP
.I \-D N, \-\-debuglevel=N
Используется только если код был скомпилирован с поддержкой
.\"LINK2"
виртуальной файловой системы smbfs
.\"SMB File System"
для установки уровня отладочных сообщений smbfs в N (0\-10).
.TP
.I \-e [файл]
Запустить встроенный редактор. Если параметр "файл" задан, этот файл
будет открыт при запуске. Смотрите также
@ -62,8 +66,9 @@ UNIX\-подобных операционных системах.
Выводит на экран расширенную информацию о путях, используемых при работе
программы Midnight Commander.
.TP
.I \-\-configure\-options
Выводит опции конфигурирования, с которыми был собран Midnight Commander.
.I \-g, \-\-oldmouse
Принудительно устанавливает режим мыши "normal tracking". В xterm\-совместимых
терминалах (например, tmux/screen).
.TP
.I \-k, \-\-resetsoft
Восстанавливает значения команд, назначенных функциональным клавишам в
@ -75,21 +80,13 @@ termcap/terminfo. Этот ключ используется только на
Задаёт файл клавиатурных команд для переопределения привязки клавиатурных
комбинаций к действиям.
.TP
.I \-\-nokeymap
Не загружать клавиатурные комбинации из файла, использовать определённые
в исходном коде.
.TP
.I \-l файл, \-\-ftplog=файл
Сохранить диалог с ftp\-сервером, а также отладочную информацию smbfs в
файл file.
.TP
.I \-D N, --debuglevel=N
Используется только если код был скомпилирован с поддержкой
.\"LINK2"
виртуальной файловой системы smbfs
.\"SMB File System"
для установки уровня отладочных сообщений smbfs в N (0\-10).
.TP
.I \-\-nokeymap
Не загружать клавиатурные комбинации из файла, использовать определённые
в исходном коде.
.TP
.I \-P файл, \-\-printwd=файл
По окончании работы Midnight Commander запишет последний текущий каталог
@ -99,17 +96,24 @@ termcap/terminfo. Этот ключ используется только на
Commander.
.IP
Для того чтобы эта функция была определена, используйте файл
.B %prefix%/share/mc/bin/mc.sh
.B %libexecdir%/mc/mc.sh
для оболочек bash и zsh, а для оболочки tcsh соответственно файл
.B %prefix%/share/mc/bin/mc.csh
.B %libexecdir%/mc/mc.csh
.TP
.I \-s, \-\-slow
Включает медленный режим терминала, в котором программа выводит меньше
псевдографических символов (в том числе в меню и экранах помощи) и
отключается вывод дополнительных (избыточных) сообщений.
.TP
.I \-S arg, \-\-skin
Используется для того, чтобы задать другой скин в командной
строке. Технология скинов описана в разделе
.\"LINK2"
Внешний вид\&.
.\"Skins"
.TP
.I \-t, \-\-termcap
Используется только в том случае, когда код был скомпилирован с S-Lang и
Используется только в том случае, когда код был скомпилирован с S\-Lang и
terminfo: в этом случае Midnight Commander использует значение
переменной
.B TERMCAP
@ -134,7 +138,7 @@ terminfo: в этом случае Midnight Commander использует зн
.I \-V, \-\-version
Отображает версию программы.
.TP
.I \-x, --xterm
.I \-x, \-\-xterm
Запускает программу в режиме xterm. Используется только на терминалах,
работающих в режиме xterm (два режима работы экрана и возможность
формировать экранирующие последовательности с помощью мыши) (two screen
@ -142,10 +146,6 @@ modes, and able to send mouse escape sequences).
.TP
.I \-X, \-\-no\-x11
Не использовать X11 для получения состояния модификаторов Alt, Ctrl, Shift.
.TP
.I \-g, \-\-oldmouse
Принудительно устанавливает режим мыши "normal tracking". В xterm-совместимых
терминалах (например, tmux/screen).
.PP
Первое путевое имя (path name) в командной строке (если указано) задает
каталог, который будет отображаться в активной панели; второй путь \-
@ -349,8 +349,8 @@ S\-<символ> означает, что нужно держать в нажа
.br
.PP
Параметры в трёх первых случаях могут содержать абсолютный путь к файлу
клавиатурных команд либо просто название схемы привязки (с расширением
\&.keymap либо без него). В данном случае поиск файла клавиатурных команд
клавиатурных команд либо просто название схемы привязки (с расширением .keymap
либо без него). В данном случае поиск файла клавиатурных команд
будет происходить по следующим каталогам (до первого нахождения):
.IP
.br
@ -1155,12 +1155,12 @@ Midnight Commander указывает символические ссылки,
Но иногда требуется, чтобы ссылка указывала на файл не по абсолютному пути,
а по относительному. Абсолютный путь начинается с корневого каталога:
.PP
.I /home/frodo/mc/mc -> /home/frodo/new/mc
.I /home/frodo/mc/mc \-> /home/frodo/new/mc
.PP
Относительный путь указывает на расположение файла относительно места, где
будет располагаться создаваемая ссылка:
.PP
.I /home/frodo/mc/mc -> ../new/mc
.I /home/frodo/mc/mc \-> ../new/mc
.PP
Для того, чтобы создать относительную символическую ссылку, используйте
клавиатурное сочетание "C\-x v" вместо "C\-x s".
@ -2901,11 +2901,11 @@ subshell, в файле
Когда эта опция включена, можно использовать символы замены
(wildcards) '*' и '?' в маске источника. Они обрабатываются аналогично тому,
как это делается в shell. В маске приемника разрешается использовать только '*'
и \&'\\<цифра>'. Первый символ '*' в маске приемника соответствует первой
и '\\<цифра>'. Первый символ '*' в маске приемника соответствует первой
группе символов замены в маске источника, второй символ '*' соответствует
второй группе и т.д. Аналогично, символ замены \&'\\1' соответствует первой
группе символов замены в маске источника, символ \&'\\2' \- второй группе
и т. д. до \&'\\9'. Символ \&'\\0' соответствует целому имени файла\-источника.
второй группе и т. д. Аналогично, символ замены '\\1' соответствует первой
группе символов замены в маске источника, символ '\\2' \- второй группе
и т. д. до '\\9'. Символ '\\0' соответствует целому имени файла\-источника.
.PP
Два примера:
.PP
@ -2921,9 +2921,8 @@ subshell, в файле
.I "Образцы в стиле shell"
выключена, MC не осуществляет автоматической группировки. Для указания
групп символов в маске источника, которые будут соответствовать символам
замены в маске приемника, вы должны в этом случае использовать скобки
\&'\\(...\\)'. Этот способ более гибкий, но требует больше усилий при
вводе.
замены в маске приемника, вы должны в этом случае использовать скобки '\\(...\\)'.
Этот способ более гибкий, но требует больше усилий при вводе.
.PP
Два примера:
.PP
@ -2947,8 +2946,7 @@ subshell, в файле
вплоть до следующего вхождения '\\E' или '\\U', появления символа '\\L'
или конца имени файла.
.PP
Применение '\\u' и '\\l' обеспечивает более широкие возможности, чем
\&'\\U' и '\\L'.
Применение '\\u' и '\\l' обеспечивает более широкие возможности, чем '\\U' и '\\L'.
.PP
Например, если маска источника есть '*' (опция
.I "Образцы в стиле shell"
@ -2994,7 +2992,7 @@ subshell, в файле
отключена, то регистр символов учитываться не будет.
.\"NODE "Diff Viewer"
.SH "Встроенная программа сравнения файлов"
mcdiff -- это встроенное средство для сравнения файлов, позволяющее сравнить два файла.
mcdiff \- это встроенное средство для сравнения файлов, позволяющее сравнить два файла.
Также оно позволяет редактировать их (после завершения редактирования произойдет
обновление различий). Можно просматривать файлы, находящиеся под контролем различных
систем управления версиями, такими как GIT, Subversion и другие.
@ -3247,7 +3245,7 @@ pipe text blocks through shell commands like indent).
.IP
.\"LINK2"
Опции в ини-файле для редактора
Опции в ini\-файле для редактора
.\"Internal File Editor / options"
.PP
@ -3316,7 +3314,7 @@ pipe text blocks through shell commands like indent).
.B info mcedit
.\"NODE "Internal File Editor / options"
.SH "Опции в ини-файле для редактора"
.SH "Опции в ini\-файле для редактора"
.PP
В данном разделе кратко описаны опции ini\-файла, относящиеся к редактору.
Опции записываются в секцию [Midnight\-Commander].
@ -3927,7 +3925,7 @@ editnormal, editbold, editmarked, editwhitespace, editlinestate.
графическом отображении хода выполнения файловых операций (копирование и
др.).
.I disabled
определяет цвет элемента диалога, который не может по каким-то причинам быть выбран
определяет цвет элемента диалога, который не может по каким\-то причинам быть выбран
для работы с ним.
.PP
Диалоговые окна используют следующие цвета:
@ -4304,7 +4302,7 @@ menuhotsel=yellow;black;bold+underline
Цвета\&.
.\"Colors"
.PP
В данном случае переназначение цветов имеет приоритет над скин-файлами и носит
В данном случае переназначение цветов имеет приоритет над скин\-файлами и носит
дополняющий характер.
.\"NODE "Filenames Highlight"

View File

@ -60,9 +60,9 @@ termcap/terminfo. Корисно је само на ХП\-овим термин
посебног списа љуске који аутоматски поставља текући директоријум
љуске на последњи директоријум у коме се налазио Поноћни наредник.
Учитајте датотеку
.B %prefix%/share/mc/bin/mc.sh
.B %libexecdir%/mc/mc.sh
(за кориснике љуски bash и zsh) или
.B %prefix%/share/mc/bin/mc.csh
.B %libexecdir%/mc/mc.csh
(за кориснике љуске tcsh), тим редом, да бисте задали
.B mc
као надимак за одговарајући спис љуске.

View File

@ -58,29 +58,31 @@ mc_config_new_or_override_file (mc_config_t * mc_config, const gchar * ini_path,
ssize_t cur_written;
vfs_path_t *ini_vpath;
ini_vpath = vfs_path_from_str (ini_path);
data = g_key_file_to_data (mc_config->handle, &len, NULL);
if (!exist_file (ini_path))
{
ret = g_file_set_contents (ini_path, data, len, error);
g_free (data);
vfs_path_free (ini_vpath);
return ret;
}
mc_util_make_backup_if_possible (ini_path, "~");
ini_vpath = vfs_path_from_str (ini_path);
fd = mc_open (ini_vpath, O_WRONLY | O_TRUNC, 0);
vfs_path_free (ini_vpath);
if (fd == -1)
{
g_propagate_error (error, g_error_new (MC_ERROR, 0, "%s", unix_error_string (errno)));
g_free (data);
vfs_path_free (ini_vpath);
return FALSE;
}
for (written_data = data, total_written = len;
(cur_written = mc_write (fd, (const void *) written_data, total_written)) > 0;
written_data += cur_written, total_written -= cur_written);
written_data += cur_written, total_written -= cur_written)
;
mc_close (fd);
g_free (data);
@ -88,12 +90,10 @@ mc_config_new_or_override_file (mc_config_t * mc_config, const gchar * ini_path,
{
mc_util_restore_from_backup_if_possible (ini_path, "~");
g_propagate_error (error, g_error_new (MC_ERROR, 0, "%s", unix_error_string (errno)));
vfs_path_free (ini_vpath);
return FALSE;
}
mc_util_unlink_backup_if_possible (ini_path, "~");
vfs_path_free (ini_vpath);
return TRUE;
}

View File

@ -217,7 +217,7 @@ mc_config_copy (const char *old_name, const char *new_name, GError ** error)
g_propagate_error (error,
g_error_new (MC_ERROR, 0,
_
("An error occured while migrating user settings: %s"),
("An error occurred while migrating user settings: %s"),
unix_error_string (errno)));
return;
}

View File

@ -406,6 +406,7 @@ size_trunc_sep (uintmax_t size, gboolean use_si)
*
* Units: size units (filesystem sizes are 1K blocks)
* 0=bytes, 1=Kbytes, 2=Mbytes, etc.
* -1 means maximum possible unit for specified size
*/
void
@ -425,7 +426,7 @@ size_trunc_len (char *buffer, unsigned int len, uintmax_t size, int units, gbool
10000000ULL,
100000000ULL,
1000000000ULL
/* maximmum value of uintmax_t (in case of 4 bytes) is
/* maximum value of uintmax_t (in case of 4 bytes) is
4294967295
*/
#if SIZEOF_UINTMAX_T == 8
@ -440,7 +441,7 @@ size_trunc_len (char *buffer, unsigned int len, uintmax_t size, int units, gbool
100000000000000000ULL,
1000000000000000000ULL,
10000000000000000000ULL
/* maximmum value of uintmax_t (in case of 8 bytes) is
/* maximum value of uintmax_t (in case of 8 bytes) is
18447644073710439615
*/
#endif
@ -462,6 +463,16 @@ size_trunc_len (char *buffer, unsigned int len, uintmax_t size, int units, gbool
len = 9;
#endif
/* find maximum unit */
if (units < 0)
{
const unsigned int divider = use_si ? 1000 : 1024;
uintmax_t size_remain = size;
for (units = 0; size_remain >= divider; units++)
size_remain /= divider;
}
/*
* recalculate from 1024 base to 1000 base if units>0
* We can't just multiply by 1024 - that might cause overflow

View File

@ -1532,20 +1532,20 @@ vfs_path_element_build_pretty_path_str (const vfs_path_element_t * element)
* @return integer value like to strcmp.
*/
int
vfs_path_cmp (const vfs_path_t * vpath1, const vfs_path_t * vpath2)
gboolean
vfs_path_equal (const vfs_path_t * vpath1, const vfs_path_t * vpath2)
{
char *path1;
char *path2;
int ret_val;
gboolean ret_val;
if (vpath1 == NULL || vpath2 == NULL)
return -1;
return FALSE;
path1 = vfs_path_to_str (vpath1);
path2 = vfs_path_to_str (vpath2);
ret_val = strcmp (path1, path2);
ret_val = strcmp (path1, path2) == 0;
g_free (path1);
g_free (path2);
@ -1564,20 +1564,20 @@ vfs_path_cmp (const vfs_path_t * vpath1, const vfs_path_t * vpath2)
* @return integer value like to strcmp.
*/
int
vfs_path_ncmp (const vfs_path_t * vpath1, const vfs_path_t * vpath2, size_t len)
gboolean
vfs_path_equal_len (const vfs_path_t * vpath1, const vfs_path_t * vpath2, size_t len)
{
char *path1;
char *path2;
int ret_val;
gboolean ret_val;
if (vpath1 == NULL || vpath2 == NULL)
return -1;
return FALSE;
path1 = vfs_path_to_str (vpath1);
path2 = vfs_path_to_str (vpath2);
ret_val = strncmp (path1, path2, len);
ret_val = strncmp (path1, path2, len) == 0;
g_free (path1);
g_free (path2);

View File

@ -92,8 +92,8 @@ char *vfs_path_build_url_params_str (const vfs_path_element_t * element, gboolea
char *vfs_path_element_build_pretty_path_str (const vfs_path_element_t * element);
size_t vfs_path_len (const vfs_path_t * vpath);
int vfs_path_cmp (const vfs_path_t * vpath1, const vfs_path_t * vpath2);
int vfs_path_ncmp (const vfs_path_t * vpath1, const vfs_path_t * vpath2, size_t len);
gboolean vfs_path_equal (const vfs_path_t * vpath1, const vfs_path_t * vpath2);
gboolean vfs_path_equal_len (const vfs_path_t * vpath1, const vfs_path_t * vpath2, size_t len);
vfs_path_t *vfs_path_to_absolute (const vfs_path_t * vpath);
/*** inline functions ****************************************************************************/

View File

@ -241,8 +241,7 @@ button_set_text (WButton * b, const char *text)
release_hotkey (b->text);
b->text = parse_hotkey (text);
w->cols = button_get_len (b);
if (w->owner != NULL)
send_message (w, NULL, MSG_DRAW, 0, NULL);
widget_redraw (w);
}
/* --------------------------------------------------------------------------------------------- */

View File

@ -47,13 +47,6 @@ WButtonBar *find_buttonbar (const WDialog * h);
/*** inline functions ****************************************************************************/
static inline void
buttonbar_redraw (WButtonBar * bb)
{
if (bb != NULL)
send_message (bb, NULL, MSG_DRAW, 0, NULL);
}
static inline void
buttonbar_set_visible (WButtonBar * bb, gboolean visible)
{

View File

@ -1382,8 +1382,7 @@ dlg_replace_widget (Widget * old_w, Widget * new_w)
if (should_focus)
dlg_select_widget (new_w);
if (new_w->owner->state == DLG_ACTIVE)
send_message (new_w, NULL, MSG_DRAW, 0, NULL);
widget_redraw (new_w);
}
/* --------------------------------------------------------------------------------------------- */

View File

@ -164,7 +164,7 @@ gauge_set_value (WGauge * g, int max, int current)
max = 1; /* I do not like division by zero :) */
g->current = current;
g->max = max;
gauge_callback (WIDGET (g), NULL, MSG_DRAW, 0, NULL);
widget_redraw (WIDGET (g));
}
/* --------------------------------------------------------------------------------------------- */
@ -175,7 +175,7 @@ gauge_show (WGauge * g, gboolean shown)
if (g->shown != shown)
{
g->shown = shown;
gauge_callback (WIDGET (g), NULL, MSG_DRAW, 0, NULL);
widget_redraw (WIDGET (g));
}
}

View File

@ -119,8 +119,6 @@ groupbox_new (int y, int x, int height, int width, const char *title)
void
groupbox_set_title (WGroupbox * g, const char *title)
{
Widget *w = WIDGET (g);
g_free (g->title);
g->title = NULL;
@ -134,8 +132,7 @@ groupbox_set_title (WGroupbox * g, const char *title)
g_free (t);
}
if (w->owner != NULL)
send_message (w, NULL, MSG_DRAW, 0, NULL);
widget_redraw (WIDGET (g));
}
/* --------------------------------------------------------------------------------------------- */

View File

@ -150,8 +150,7 @@ hline_set_text (WHLine * l, const char *text)
else
l->text = g_strdup (text);
if (WIDGET (l)->owner != NULL)
send_message (l, NULL, MSG_DRAW, 0, NULL);
widget_redraw (WIDGET (l));
}
/* --------------------------------------------------------------------------------------------- */

View File

@ -1265,6 +1265,7 @@ input_set_point (WInput * in, int pos)
void
input_update (WInput * in, gboolean clear_first)
{
Widget *w = WIDGET (in);
int has_history = 0;
int i;
int buf_len;
@ -1292,13 +1293,13 @@ input_update (WInput * in, gboolean clear_first)
in->mark = min (in->mark, buf_len);
/* don't draw widget not put into dialog */
if (WIDGET (in)->owner == NULL)
if (w->owner == NULL || w->owner->state != DLG_ACTIVE)
return;
if (has_history != 0)
draw_history_button (in);
if ((WIDGET (in)->options & W_DISABLED) != 0)
if ((w->options & W_DISABLED) != 0)
tty_setcolor (DISABLED_COLOR);
else if (in->first)
tty_setcolor (in->color[WINPUTC_UNCHANGED]);
@ -1332,13 +1333,13 @@ input_update (WInput * in, gboolean clear_first)
}
else
{
int sel_width;
int sel_width, buf_width;
widget_move (in, 0, m1 - in->term_first_shown);
buf_width = str_term_width2 (in->buffer, m1);
sel_width =
min (m2 - m1,
(in->field_width - has_history) - (str_term_width2 (in->buffer, m1) -
in->term_first_shown));
(in->field_width - has_history) - (buf_width - in->term_first_shown));
tty_print_string (str_term_substring (in->buffer, m1, sel_width));
}
}

View File

@ -1058,7 +1058,7 @@ query_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
listbox_select_entry (LISTBOX (h->current->data), i);
end = new_end;
input_handle_char (input, parm);
send_message (h->current->data, NULL, MSG_DRAW, 0, NULL);
widget_redraw (WIDGET (h->current->data));
break;
}
}
@ -1161,7 +1161,7 @@ query_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
if (need_redraw == 2)
{
insert_text (input, last_text, low);
send_message (h->current->data, NULL, MSG_DRAW, 0, NULL);
widget_redraw (WIDGET (h->current->data));
}
else if (need_redraw == 1)
{

View File

@ -182,11 +182,10 @@ label_set_text (WLabel * label, const char *text)
}
}
if (w->owner != NULL)
send_message (w, NULL, MSG_DRAW, 0, NULL);
if (newcols < w->cols)
w->cols = newcols;
widget_redraw (w);
}
/* --------------------------------------------------------------------------------------------- */

View File

@ -268,6 +268,20 @@ widget_erase (Widget * w)
/* --------------------------------------------------------------------------------------------- */
void
widget_redraw (Widget * w)
{
if (w != NULL)
{
WDialog *h = w->owner;
if (h != NULL && h->state == DLG_ACTIVE)
w->callback (w, NULL, MSG_DRAW, 0, NULL);
}
}
/* --------------------------------------------------------------------------------------------- */
/* get mouse pointer location within widget */
Gpm_Event
mouse_get_local (const Gpm_Event * global, const Widget * w)

View File

@ -142,6 +142,7 @@ void widget_set_options (Widget * w, widget_options_t options, gboolean enable);
void widget_set_size (Widget * widget, int y, int x, int lines, int cols);
/* select color for widget in dependance of state */
void widget_selectcolor (Widget * w, gboolean focused, gboolean hotkey);
void widget_redraw (Widget * w);
void widget_erase (Widget * w);
/* get mouse pointer location within widget */

View File

@ -16,8 +16,8 @@ LIBFILES_CONST = \
mcedit.menu \
filehighlight.ini \
mc.keymap \
mc.keymap.default \
mc.keymap.emacs \
mc.default.keymap \
mc.emacs.keymap \
mc.menu \
mc.menu.sr

View File

@ -1 +1 @@
mc.keymap.default
mc.default.keymap

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -72,7 +72,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2486,11 +2486,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3787,7 +3787,7 @@ msgstr ""
"%3$s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Павал Клёк <yehekim@gmail.com>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/mc/language/"
@ -76,8 +76,8 @@ msgstr "Нельга стварыць каталёґ «%s»"
msgid "FATAL: not a directory:"
msgstr "ХІБА: ня ёсьць каталёґам:"
#, c-format
msgid "An error occured while migrating user settings: %s"
#, fuzzy, c-format
msgid "An error occurred while migrating user settings: %s"
msgstr "Не ўдалося перанесьці налады карыстальніка: %s"
#, c-format
@ -2656,11 +2656,11 @@ msgid "Target file already exists!"
msgstr "Прызначаны файл ужо сінуе!"
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3991,8 +3991,8 @@ msgstr ""
"Перасьцярога: хібная пазнака «%c» у «%s»\n"
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
#, fuzzy, c-format
msgid "sftp: an error occurred while reading %s: %s"
msgstr "sftp: не ўдалося прачытаць «%s»: «%s»"
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
"Language-Team: Bulgarian (http://www.transifex.com/projects/p/mc/language/"
@ -74,7 +74,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2497,11 +2497,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3803,7 +3803,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Daniel <danicases@gmail.com>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/mc/language/"
@ -79,7 +79,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2499,11 +2499,11 @@ msgid "Target file already exists!"
msgstr "Ja existeix el fitxer de destinació"
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3812,7 +3812,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/mc/language/cs/)\n"
@ -75,7 +75,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2606,11 +2606,11 @@ msgid "Target file already exists!"
msgstr "Cílový soubor už existuje!"
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3929,7 +3929,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/mc/language/da/)\n"
@ -75,7 +75,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2608,11 +2608,11 @@ msgid "Target file already exists!"
msgstr "Målfil findes allerede!"
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3925,7 +3925,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Fabian Affolter <fab@fedoraproject.org>\n"
"Language-Team: German (http://www.transifex.com/projects/p/mc/language/de/)\n"
@ -77,7 +77,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2630,11 +2630,11 @@ msgid "Target file already exists!"
msgstr "Zieldatei existiert bereits!"
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3951,7 +3951,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/mc/"
@ -72,7 +72,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2482,11 +2482,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3752,7 +3752,7 @@ msgid ""
msgstr ""
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Panos Bouklis <panos@echidna-band.com>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/mc/language/el/)\n"
@ -75,8 +75,8 @@ msgstr "Αδυναμία δημιουργία καταλόγου %s"
msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
#, fuzzy, c-format
msgid "An error occurred while migrating user settings: %s"
msgstr "Συνέβη ένα σφάλμα κατά τη μετάβαση των ρυθμίσεων χρήστη: %s"
#, c-format
@ -2581,11 +2581,11 @@ msgid "Target file already exists!"
msgstr "Το αρχείο στόχος υπάρχει ήδη!"
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3886,9 +3886,9 @@ msgstr ""
"Προειδοποίηση: Μη έγκυρη σημαία %c στο %s:\n"
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgstr ""
#, fuzzy, c-format
msgid "sftp: an error occurred while reading %s: %s"
msgstr "Συνέβη ένα σφάλμα κατά τη μετάβαση των ρυθμίσεων χρήστη: %s"
msgid "sftp: Unable to get current user name."
msgstr ""

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Keith Bowes <zooplah@gmail.com>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/mc/language/"
@ -75,8 +75,8 @@ msgstr "Ne eblas krei dosierujon %s"
msgid "FATAL: not a directory:"
msgstr "PEREIGA: ne estas dosierujo:"
#, c-format
msgid "An error occured while migrating user settings: %s"
#, fuzzy, c-format
msgid "An error occurred while migrating user settings: %s"
msgstr "Eraro okazis dum migri uzanto-agordon: %s"
#, c-format
@ -2661,12 +2661,12 @@ msgstr "%ld B/s"
msgid "Target file already exists!"
msgstr "Cela dosiero jam ekzistas!"
#, c-format
msgid "New : %s, size %llu"
#, fuzzy, c-format
msgid "New : %s, size %s"
msgstr "Nova : %s, grando %llu"
#, c-format
msgid "Existing: %s, size %llu"
#, fuzzy, c-format
msgid "Existing: %s, size %s"
msgstr "Jama: %s, grando %llu"
msgid "Overwrite this target?"
@ -3991,8 +3991,8 @@ msgstr ""
"Averto: Nevalida marko %c in %s:\n"
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
#, fuzzy, c-format
msgid "sftp: an error occurred while reading %s: %s"
msgstr "sftp: Eraro okazis dum lego de %s: %s"
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-27 10:39+0000\n"
"Last-Translator: David Martin <david.martin@telefonica.net>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/mc/language/"
@ -79,8 +79,8 @@ msgstr "Imposible crear directorio %s"
msgid "FATAL: not a directory:"
msgstr "¡FATAL! No es directorio:"
#, c-format
msgid "An error occured while migrating user settings: %s"
#, fuzzy, c-format
msgid "An error occurred while migrating user settings: %s"
msgstr "Error en la migración de la configuración personal: %s"
#, c-format
@ -2671,12 +2671,12 @@ msgstr "%ld B/s"
msgid "Target file already exists!"
msgstr "¡El archivo destino ya existe!"
#, c-format
msgid "New : %s, size %llu"
#, fuzzy, c-format
msgid "New : %s, size %s"
msgstr "Nuevo : %s, tamaño %llu"
#, c-format
msgid "Existing: %s, size %llu"
#, fuzzy, c-format
msgid "Existing: %s, size %s"
msgstr "Actual: %s, tamaño %llu"
msgid "Overwrite this target?"
@ -4000,8 +4000,8 @@ msgstr ""
"Atención: Bandera %c no válida en %s:\n"
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
#, fuzzy, c-format
msgid "sftp: an error occurred while reading %s: %s"
msgstr "sftp: Ocurrió un error durante la lectura de «%s»: %s"
msgid "sftp: Unable to get current user name."

View File

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Midnight Commander\n"
"Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n"
"POT-Creation-Date: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2011-07-11 17:34+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -70,7 +70,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2480,11 +2480,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3750,7 +3750,7 @@ msgid ""
msgstr ""
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/mc/language/eu/)\n"
@ -75,8 +75,8 @@ msgstr "%s direktorioa ezin sortu"
msgid "FATAL: not a directory:"
msgstr "LARRIA: ez da direktorioa:"
#, c-format
msgid "An error occured while migrating user settings: %s"
#, fuzzy, c-format
msgid "An error occurred while migrating user settings: %s"
msgstr "Akats bat gertatu da erabiltzailearen ezarpenak migratzerakoan: %s"
#, c-format
@ -2638,11 +2638,11 @@ msgid "Target file already exists!"
msgstr "Helburu fitxategia dagoeneko existitzen da!"
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3961,9 +3961,9 @@ msgstr ""
"Abisua: Baliogabeko %c bandera %s-n:\n"
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgstr ""
#, fuzzy, c-format
msgid "sftp: an error occurred while reading %s: %s"
msgstr "Akats bat gertatu da erabiltzailearen ezarpenak migratzerakoan: %s"
msgid "sftp: Unable to get current user name."
msgstr ""

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-28 08:17+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/mc/language/"
@ -76,7 +76,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2488,11 +2488,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3753,7 +3753,7 @@ msgid ""
msgstr ""
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/mc/language/"
@ -73,7 +73,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2483,11 +2483,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3753,7 +3753,7 @@ msgid ""
msgstr ""
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -75,7 +75,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2492,11 +2492,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3767,7 +3767,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/mc/language/fr/)\n"
@ -76,7 +76,7 @@ msgid "FATAL: not a directory:"
msgstr "FATAL : n'est pas un répertoire :"
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2519,11 +2519,11 @@ msgid "Target file already exists!"
msgstr "Le fichier cible existe déjà !"
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3846,7 +3846,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/mc/language/"
@ -78,8 +78,8 @@ msgstr "Non é posíbel crear o directorio %s"
msgid "FATAL: not a directory:"
msgstr "FATAL! Non é un directorio:"
#, c-format
msgid "An error occured while migrating user settings: %s"
#, fuzzy, c-format
msgid "An error occurred while migrating user settings: %s"
msgstr "Produciuse un erro na migración da configuración do usuario: %s"
#, c-format
@ -2650,12 +2650,12 @@ msgstr "%ld B/s"
msgid "Target file already exists!"
msgstr "O ficheiro destino xa existe!"
#, c-format
msgid "New : %s, size %llu"
#, fuzzy, c-format
msgid "New : %s, size %s"
msgstr "Novo : %s, tamaño %llu"
#, c-format
msgid "Existing: %s, size %llu"
#, fuzzy, c-format
msgid "Existing: %s, size %s"
msgstr "Existente: %s, tamaño %llu"
msgid "Overwrite this target?"
@ -3978,9 +3978,9 @@ msgstr ""
"Atención: marca %c incorrecta en %s:\n"
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgstr ""
#, fuzzy, c-format
msgid "sftp: an error occurred while reading %s: %s"
msgstr "Produciuse un erro na migración da configuración do usuario: %s"
msgid "sftp: Unable to get current user name."
msgstr ""

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2010-12-29 10:19+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/mc/language/"
@ -73,7 +73,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2483,11 +2483,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3758,7 +3758,7 @@ msgid ""
msgstr ""
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 15:01+0000\n"
"Last-Translator: Rezső Páder <rezso@rezso.net>\n"
"Language-Team: Hungarian (http://www.transifex.com/projects/p/mc/language/"
@ -76,8 +76,8 @@ msgstr "A(z) %s könyvtár nem létrehozható"
msgid "FATAL: not a directory:"
msgstr "HIBA: nem könyvtár:"
#, c-format
msgid "An error occured while migrating user settings: %s"
#, fuzzy, c-format
msgid "An error occurred while migrating user settings: %s"
msgstr "Hiba történt a felhasználói adatok migrálásakor: %s"
#, c-format
@ -2642,11 +2642,11 @@ msgid "Target file already exists!"
msgstr "A célfájl már létezik!"
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3967,8 +3967,8 @@ msgstr ""
"Figyelem: hibás jel (%c) ebben: %s:\n"
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
#, fuzzy, c-format
msgid "sftp: an error occurred while reading %s: %s"
msgstr "sftp: hiba %s olvasásakor: %s"
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Martijn Dekker <mcdutchie@hotmail.com>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/mc/language/"
@ -77,7 +77,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2508,11 +2508,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3800,7 +3800,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Andika Triwidada <andika@gmail.com>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/mc/language/"
@ -76,7 +76,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2492,11 +2492,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3761,7 +3761,7 @@ msgid ""
msgstr ""
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-11-13 02:12+0100\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/mc/language/"
@ -77,8 +77,8 @@ msgstr "Impossibile creare la directory %s"
msgid "FATAL: not a directory:"
msgstr "FATALE: non è una directory:"
#, c-format
msgid "An error occured while migrating user settings: %s"
#, fuzzy, c-format
msgid "An error occurred while migrating user settings: %s"
msgstr ""
"Si è verificato un errore durante la migrazione delle impostazioni "
"dell'utente: %s"
@ -2703,11 +2703,11 @@ msgid "Target file already exists!"
msgstr " Il file obiettivo esiste già!"
#, fuzzy, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr "Data sorgen.: %s, dim. %llu"
#, fuzzy, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr "Data sorgen.: %s, dim. %llu"
msgid "Overwrite this target?"
@ -4034,7 +4034,7 @@ msgstr ""
"%s\n"
#, fuzzy, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
"Si è verificato un errore durante la migrazione delle impostazioni "
"dell'utente: %s"

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2011-12-07 11:21+0000\n"
"Last-Translator: slavazanko <slavazanko@gmail.com>\n"
"Language-Team: Italian (Italy) (http://www.transifex.net/projects/p/mc/team/"
@ -72,7 +72,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2482,11 +2482,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3752,7 +3752,7 @@ msgid ""
msgstr ""
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/mc/language/"
@ -79,7 +79,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2504,11 +2504,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3802,7 +3802,7 @@ msgstr ""
"%3$s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: George Machitidze <giomac@gmail.com>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/mc/language/"
@ -73,7 +73,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2485,11 +2485,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3750,7 +3750,7 @@ msgid ""
msgstr ""
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/mc/language/ko/)\n"
@ -72,7 +72,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2491,11 +2491,11 @@ msgid "Target file already exists!"
msgstr "대상 파일 \"%s\"이(가) 이미 있는데요!"
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3796,7 +3796,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: Lithuanian (http://www.transifex.com/projects/p/mc/language/"
@ -75,7 +75,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2499,11 +2499,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3813,7 +3813,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -73,7 +73,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2488,11 +2488,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3801,7 +3801,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

350
po/mc.pot
View File

@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: mc 4.8.7-76-g96d8539\n"
"Project-Id-Version: mc 4.8.7-113-gff2483e\n"
"Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n"
"POT-Creation-Date: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -87,7 +87,7 @@ msgstr ""
#: lib/mcconfig/paths.c:220
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#: lib/mcconfig/paths.c:484
@ -108,7 +108,7 @@ msgstr ""
#: lib/search/lib.c:43 src/diffviewer/search.c:230 src/editor/editcmd.c:838
#: src/editor/editcmd.c:859 src/editor/editcmd.c:899 src/editor/editcmd.c:987
#: src/editor/editcmd.c:2759 src/viewer/search.c:107
#: src/editor/editcmd.c:2664 src/viewer/search.c:107
msgid "Search string not found"
msgstr ""
@ -553,8 +553,8 @@ msgstr ""
#: lib/utilunix.c:514 lib/utilunix.c:519 lib/utilunix.c:574
#: src/editor/editcmd.c:207 src/editor/editcmd.c:230 src/editor/editcmd.c:438
#: src/editor/editcmd.c:603 src/editor/editcmd.c:1688
#: src/editor/editcmd.c:3473 src/editor/editcmd.c:3502
#: src/editor/editcmd.c:603 src/editor/editcmd.c:1682
#: src/editor/editcmd.c:3377 src/editor/editcmd.c:3406
#: src/editor/editcmd_dialogs.c:492 src/execute.c:130
#: src/filemanager/file.c:1676 src/filemanager/panel.c:4254 src/help.c:363
#: src/main.c:359 src/main.c:389 src/subshell.c:390 src/subshell.c:1056
@ -664,10 +664,10 @@ msgid "Do you want clean this history?"
msgstr ""
#: lib/widget/listbox.c:285 src/diffviewer/ydiff.c:3099
#: src/editor/editcmd.c:209 src/editor/editcmd.c:232 src/editor/editcmd.c:2883
#: src/editor/editcmd.c:2889 src/filemanager/cmd.c:143
#: src/editor/editcmd.c:209 src/editor/editcmd.c:232 src/editor/editcmd.c:2788
#: src/editor/editcmd.c:2794 src/filemanager/cmd.c:143
#: src/filemanager/file.c:692 src/filemanager/file.c:2809
#: src/filemanager/filegui.c:432 src/filemanager/hotlist.c:1115
#: src/filemanager/filegui.c:431 src/filemanager/hotlist.c:1115
#: src/filemanager/hotlist.c:1132 src/filemanager/midnight.c:1044
#: src/filemanager/midnight.c:1052 src/filemanager/panel.c:2607
#: src/filemanager/tree.c:901 src/subshell.c:1058 src/viewer/lib.c:171
@ -676,10 +676,10 @@ msgid "&Yes"
msgstr ""
#: lib/widget/listbox.c:285 src/diffviewer/ydiff.c:3099
#: src/editor/editcmd.c:209 src/editor/editcmd.c:2883
#: src/editor/editcmd.c:2889 src/filemanager/cmd.c:143
#: src/editor/editcmd.c:209 src/editor/editcmd.c:2788
#: src/editor/editcmd.c:2794 src/filemanager/cmd.c:143
#: src/filemanager/file.c:692 src/filemanager/file.c:2809
#: src/filemanager/filegui.c:434 src/filemanager/hotlist.c:1115
#: src/filemanager/filegui.c:433 src/filemanager/hotlist.c:1115
#: src/filemanager/hotlist.c:1132 src/filemanager/midnight.c:1044
#: src/filemanager/midnight.c:1052 src/filemanager/panel.c:2607
#: src/filemanager/tree.c:901 src/subshell.c:1058 src/viewer/lib.c:171
@ -687,22 +687,22 @@ msgstr ""
msgid "&No"
msgstr ""
#: lib/widget/quick.h:215 src/editor/editcmd.c:2759
#: lib/widget/quick.h:215 src/editor/editcmd.c:2664
#: src/editor/editcmd_dialogs.c:121 src/editor/editwidget.c:150
#: src/filemanager/boxes.c:1126 src/filemanager/filegui.c:1201
#: src/filemanager/boxes.c:1126 src/filemanager/filegui.c:1209
#: src/filemanager/find.c:524 src/filemanager/layout.c:450 src/subshell.c:393
msgid "&OK"
msgstr ""
#: lib/widget/quick.h:216 src/editor/editcmd.c:209 src/editor/editcmd.c:232
#: src/editor/editcmd.c:440 src/editor/editcmd.c:606 src/editor/editcmd.c:1689
#: src/editor/editcmd.c:2045 src/editor/editcmd.c:2883
#: src/editor/editcmd.c:3476 src/editor/editcmd.c:3505
#: src/editor/editcmd.c:440 src/editor/editcmd.c:606 src/editor/editcmd.c:1683
#: src/editor/editcmd.c:2039 src/editor/editcmd.c:2788
#: src/editor/editcmd.c:3380 src/editor/editcmd.c:3409
#: src/editor/editcmd_dialogs.c:123 src/editor/editcmd_dialogs.c:278
#: src/editor/editcmd_dialogs.c:494 src/editor/spell_dialogs.c:98
#: src/filemanager/achown.c:97 src/filemanager/chmod.c:126
#: src/filemanager/chown.c:92 src/filemanager/cmd.c:1282
#: src/filemanager/filegui.c:1205 src/filemanager/find.c:524
#: src/filemanager/filegui.c:1213 src/filemanager/find.c:524
#: src/filemanager/hotlist.c:192 src/filemanager/hotlist.c:971
#: src/filemanager/hotlist.c:1033 src/filemanager/layout.c:451
#: src/filemanager/panelize.c:144 src/learn.c:258 src/viewer/hex.c:389
@ -714,12 +714,12 @@ msgid "Background process:"
msgstr ""
#: lib/widget/wtools.c:287 lib/widget/wtools.c:412 src/editor/edit.c:219
#: src/editor/edit.c:253 src/editor/edit.c:405 src/editor/edit.c:2100
#: src/editor/edit.c:2110 src/editor/editcmd.c:294 src/editor/editcmd.c:304
#: src/editor/editcmd.c:382 src/editor/editcmd.c:2984 src/editor/spell.c:318
#: src/editor/edit.c:253 src/editor/edit.c:405 src/editor/edit.c:2160
#: src/editor/edit.c:2170 src/editor/editcmd.c:294 src/editor/editcmd.c:304
#: src/editor/editcmd.c:382 src/editor/editcmd.c:2889 src/editor/spell.c:318
#: src/editor/spell.c:555 src/editor/spell.c:563
#: tests/src/execute__common.c:145
#: tests/src/execute__execute_with_vfs_arg.c:158
#: tests/src/execute__execute_with_vfs_arg.c:154
msgid "Error"
msgstr ""
@ -974,7 +974,7 @@ msgstr ""
#: src/diffviewer/search.c:106 src/diffviewer/search.c:230
#: src/diffviewer/search.c:243 src/diffviewer/search.c:270
#: src/editor/editcmd.c:987 src/editor/editcmd.c:1017
#: src/editor/editcmd.c:2653 src/editor/editcmd_dialogs.c:130
#: src/editor/editcmd.c:2558 src/editor/editcmd_dialogs.c:130
#: src/viewer/dialogs.c:112 src/viewer/search.c:150 src/viewer/search.c:253
#: src/viewer/search.c:356
msgid "Search"
@ -1062,17 +1062,17 @@ msgstr ""
msgid "Goto line (right)"
msgstr ""
#: src/diffviewer/ydiff.c:2912 src/editor/editcmd.c:3063
#: src/diffviewer/ydiff.c:2912 src/editor/editcmd.c:2968
msgid "Enter line:"
msgstr ""
#: src/diffviewer/ydiff.c:2953 src/editor/editwidget.c:852
#: src/diffviewer/ydiff.c:2953 src/editor/editwidget.c:977
#: src/filemanager/midnight.c:1659 src/filemanager/tree.c:1225 src/help.c:1147
#: src/viewer/display.c:87
msgid "ButtonBar|Help"
msgstr ""
#: src/diffviewer/ydiff.c:2954 src/editor/editwidget.c:853
#: src/diffviewer/ydiff.c:2954 src/editor/editwidget.c:978
#: src/viewer/display.c:99
msgid "ButtonBar|Save"
msgstr ""
@ -1086,7 +1086,7 @@ msgstr ""
msgid "ButtonBar|Merge"
msgstr ""
#: src/diffviewer/ydiff.c:2957 src/editor/editwidget.c:858
#: src/diffviewer/ydiff.c:2957 src/editor/editwidget.c:983
#: src/viewer/display.c:109
msgid "ButtonBar|Search"
msgstr ""
@ -1095,13 +1095,13 @@ msgstr ""
msgid "ButtonBar|Options"
msgstr ""
#: src/diffviewer/ydiff.c:2959 src/editor/editwidget.c:861
#: src/diffviewer/ydiff.c:2959 src/editor/editwidget.c:986
#: src/filemanager/midnight.c:1668 src/help.c:1156 src/viewer/display.c:121
#: src/viewer/display.c:124
msgid "ButtonBar|Quit"
msgstr ""
#: src/diffviewer/ydiff.c:3096 src/editor/editcmd.c:2889 src/viewer/lib.c:169
#: src/diffviewer/ydiff.c:3096 src/editor/editcmd.c:2794 src/viewer/lib.c:169
#: src/viewer/lib.c:175
msgid "Quit"
msgstr ""
@ -1179,12 +1179,12 @@ msgstr ""
msgid "File \"%s\" is too large"
msgstr ""
#: src/editor/edit.c:2099
#: src/editor/edit.c:2159
#, c-format
msgid "Error reading from pipe: %s"
msgstr ""
#: src/editor/edit.c:2109
#: src/editor/edit.c:2169
#, c-format
msgid "Cannot open pipe for reading: %s"
msgstr ""
@ -1216,8 +1216,8 @@ msgstr ""
msgid "The file you are saving is not finished with a newline"
msgstr ""
#: src/editor/editcmd.c:440 src/editor/editcmd.c:606 src/editor/editcmd.c:3475
#: src/editor/editcmd.c:3504 src/editor/editcmd_dialogs.c:494
#: src/editor/editcmd.c:440 src/editor/editcmd.c:606 src/editor/editcmd.c:3379
#: src/editor/editcmd.c:3408 src/editor/editcmd_dialogs.c:494
msgid "C&ontinue"
msgstr ""
@ -1237,8 +1237,8 @@ msgstr ""
msgid "&Macintosh format (CR)"
msgstr ""
#: src/editor/editcmd.c:465 src/editor/editcmd.c:2066
#: src/editor/editcmd.c:3106 src/editor/editcmd.c:3138
#: src/editor/editcmd.c:465 src/editor/editcmd.c:2060
#: src/editor/editcmd.c:3011 src/editor/editcmd.c:3043
#: src/filemanager/cmd.c:861
msgid "Enter file name:"
msgstr ""
@ -1255,260 +1255,260 @@ msgstr ""
msgid "Block is large, you may not be able to undo this action"
msgstr ""
#: src/editor/editcmd.c:1585
#: src/editor/editcmd.c:1579
msgid "&Quick save"
msgstr ""
#: src/editor/editcmd.c:1586
#: src/editor/editcmd.c:1580
msgid "&Safe save"
msgstr ""
#: src/editor/editcmd.c:1587
#: src/editor/editcmd.c:1581
msgid "&Do backups with following extension:"
msgstr ""
#: src/editor/editcmd.c:1608
#: src/editor/editcmd.c:1602
msgid "Check &POSIX new line"
msgstr ""
#: src/editor/editcmd.c:1616
#: src/editor/editcmd.c:1610
msgid "Edit Save Mode"
msgstr ""
#: src/editor/editcmd.c:1673 src/editor/editcmd.c:1743
#: src/editor/editcmd.c:1667 src/editor/editcmd.c:1737
msgid "Save as"
msgstr ""
#: src/editor/editcmd.c:1675
#: src/editor/editcmd.c:1669
msgid "Cannot save: destination is not a regular file"
msgstr ""
#: src/editor/editcmd.c:1689
#: src/editor/editcmd.c:1683
msgid "A file already exists with this name"
msgstr ""
#: src/editor/editcmd.c:1689
#: src/editor/editcmd.c:1683
msgid "&Overwrite"
msgstr ""
#: src/editor/editcmd.c:1743 src/editor/editcmd.c:3116
#: src/editor/editcmd.c:1737 src/editor/editcmd.c:3021
msgid "Cannot save file"
msgstr ""
#: src/editor/editcmd.c:1768 src/editor/editcmd.c:1771
#: src/editor/editcmd.c:1762 src/editor/editcmd.c:1765
msgid "Delete macro"
msgstr ""
#: src/editor/editcmd.c:1768
#: src/editor/editcmd.c:1762
msgid "Press macro hotkey:"
msgstr ""
#: src/editor/editcmd.c:1771
#: src/editor/editcmd.c:1765
msgid "Macro not deleted"
msgstr ""
#: src/editor/editcmd.c:1826
#: src/editor/editcmd.c:1820
msgid "Save macro"
msgstr ""
#: src/editor/editcmd.c:1826
#: src/editor/editcmd.c:1820
msgid "Press the macro's new hotkey:"
msgstr ""
#: src/editor/editcmd.c:1900
#: src/editor/editcmd.c:1894
msgid "Repeat last commands"
msgstr ""
#: src/editor/editcmd.c:1900
#: src/editor/editcmd.c:1894
msgid "Repeat times:"
msgstr ""
#: src/editor/editcmd.c:2043
#: src/editor/editcmd.c:2037
#, c-format
msgid "Confirm save file: \"%s\""
msgstr ""
#: src/editor/editcmd.c:2045 src/viewer/hex.c:377 src/viewer/hex.c:389
#: src/editor/editcmd.c:2039 src/viewer/hex.c:377 src/viewer/hex.c:389
msgid "Save file"
msgstr ""
#: src/editor/editcmd.c:2045 src/editor/editmenu.c:77 src/learn.c:196
#: src/editor/editcmd.c:2039 src/editor/editmenu.c:77 src/learn.c:196
#: src/learn.c:257
msgid "&Save"
msgstr ""
#: src/editor/editcmd.c:2066
#: src/editor/editcmd.c:2060
msgid "Load"
msgstr ""
#: src/editor/editcmd.c:2099
#: src/editor/editcmd.c:2093
msgid "Syntax file edit"
msgstr ""
#: src/editor/editcmd.c:2100
#: src/editor/editcmd.c:2094
msgid "Which syntax file you want to edit?"
msgstr ""
#: src/editor/editcmd.c:2101 src/editor/editcmd.c:2146
#: src/editor/editcmd.c:2095 src/editor/editcmd.c:2140
#: src/filemanager/cmd.c:1100 src/filemanager/cmd.c:1136
#: src/filemanager/cmd.c:1194
msgid "&User"
msgstr ""
#: src/editor/editcmd.c:2101 src/editor/editcmd.c:2146
#: src/editor/editcmd.c:2095 src/editor/editcmd.c:2140
msgid "&System wide"
msgstr ""
#: src/editor/editcmd.c:2144 src/filemanager/cmd.c:1134
#: src/editor/editcmd.c:2138 src/filemanager/cmd.c:1134
msgid "Menu edit"
msgstr ""
#: src/editor/editcmd.c:2145 src/filemanager/cmd.c:1135
#: src/editor/editcmd.c:2139 src/filemanager/cmd.c:1135
msgid "Which menu file do you want to edit?"
msgstr ""
#: src/editor/editcmd.c:2146 src/filemanager/cmd.c:1136
#: src/editor/editcmd.c:2140 src/filemanager/cmd.c:1136
msgid "&Local"
msgstr ""
#: src/editor/editcmd.c:2718 src/editor/editcmd.c:2759
#: src/editor/editcmd.c:2770 src/editor/editcmd_dialogs.c:220
#: src/editor/editcmd.c:2623 src/editor/editcmd.c:2664
#: src/editor/editcmd.c:2675 src/editor/editcmd_dialogs.c:220
msgid "Replace"
msgstr ""
#: src/editor/editcmd.c:2770
#: src/editor/editcmd.c:2675
#, c-format
msgid "%ld replacements made"
msgstr ""
#: src/editor/editcmd.c:2855 src/editor/editwidget.c:399
#: src/editor/editcmd.c:2760 src/editor/editwidget.c:399
msgid "[NoName]"
msgstr ""
#: src/editor/editcmd.c:2882
#: src/editor/editcmd.c:2787
#, c-format
msgid ""
"File %s was modified.\n"
"Save before close?"
msgstr ""
#: src/editor/editcmd.c:2883
#: src/editor/editcmd.c:2788
msgid "Close file"
msgstr ""
#: src/editor/editcmd.c:2887
#: src/editor/editcmd.c:2792
#, c-format
msgid ""
"Midnight Commander is being shut down.\n"
"Save modified file %s?"
msgstr ""
#: src/editor/editcmd.c:2984
#: src/editor/editcmd.c:2889
msgid "This function is not implemented"
msgstr ""
#: src/editor/editcmd.c:2998
#: src/editor/editcmd.c:2903
msgid "Copy to clipboard"
msgstr ""
#: src/editor/editcmd.c:2998 src/editor/editcmd.c:3018
#: src/editor/editcmd.c:2903 src/editor/editcmd.c:2923
msgid "Unable to save to file"
msgstr ""
#: src/editor/editcmd.c:3018
#: src/editor/editcmd.c:2923
msgid "Cut to clipboard"
msgstr ""
#: src/editor/editcmd.c:3063
#: src/editor/editcmd.c:2968
msgid "Goto line"
msgstr ""
#: src/editor/editcmd.c:3106 src/editor/editcmd.c:3116
#: src/editor/editcmd.c:3011 src/editor/editcmd.c:3021
msgid "Save block"
msgstr ""
#: src/editor/editcmd.c:3138 src/editor/editcmd.c:3153
#: src/editor/editcmd.c:3043 src/editor/editcmd.c:3058
msgid "Insert file"
msgstr ""
#: src/editor/editcmd.c:3153
#: src/editor/editcmd.c:3058
msgid "Cannot insert file"
msgstr ""
#: src/editor/editcmd.c:3175
#: src/editor/editcmd.c:3080
msgid "Sort block"
msgstr ""
#: src/editor/editcmd.c:3175
#: src/editor/editcmd.c:3080
msgid "You must first highlight a block of text"
msgstr ""
#: src/editor/editcmd.c:3183
#: src/editor/editcmd.c:3088
msgid "Run sort"
msgstr ""
#: src/editor/editcmd.c:3184
#: src/editor/editcmd.c:3089
msgid "Enter sort options (see manpage) separated by whitespace:"
msgstr ""
#: src/editor/editcmd.c:3205 src/editor/editcmd.c:3212
#: src/editor/editcmd.c:3110 src/editor/editcmd.c:3117
msgid "Sort"
msgstr ""
#: src/editor/editcmd.c:3205
#: src/editor/editcmd.c:3110
msgid "Cannot execute sort command"
msgstr ""
#: src/editor/editcmd.c:3211
#: src/editor/editcmd.c:3116
#, c-format
msgid "Sort returned non-zero: %s"
msgstr ""
#: src/editor/editcmd.c:3246
#: src/editor/editcmd.c:3151
msgid "Paste output of external command"
msgstr ""
#: src/editor/editcmd.c:3247
#: src/editor/editcmd.c:3152
msgid "Enter shell command(s):"
msgstr ""
#: src/editor/editcmd.c:3264
#: src/editor/editcmd.c:3169
msgid "External command"
msgstr ""
#: src/editor/editcmd.c:3264
#: src/editor/editcmd.c:3169
msgid "Cannot execute command"
msgstr ""
#: src/editor/editcmd.c:3315
#: src/editor/editcmd.c:3220
msgid "mail -s <subject> -c <cc> <to>"
msgstr ""
#: src/editor/editcmd.c:3316
#: src/editor/editcmd.c:3221
msgid "To"
msgstr ""
#: src/editor/editcmd.c:3319
#: src/editor/editcmd.c:3224
msgid "Subject"
msgstr ""
#: src/editor/editcmd.c:3322
#: src/editor/editcmd.c:3227
msgid "Copies to"
msgstr ""
#: src/editor/editcmd.c:3332
#: src/editor/editcmd.c:3237
msgid "Mail"
msgstr ""
#: src/editor/editcmd.c:3436
#: src/editor/editcmd.c:3340
msgid "Insert literal"
msgstr ""
#: src/editor/editcmd.c:3437
#: src/editor/editcmd.c:3341
msgid "Press any key:"
msgstr ""
#: src/editor/editcmd.c:3474 src/editor/editcmd.c:3503
#: src/editor/editcmd.c:3378 src/editor/editcmd.c:3407
msgid ""
"Current text was modified without a file save.\n"
"Continue discards these changes"
@ -1535,7 +1535,7 @@ msgid "&Replace"
msgstr ""
#: src/editor/editcmd_dialogs.c:276 src/filemanager/file.c:692
#: src/filemanager/filegui.c:442
#: src/filemanager/filegui.c:441
msgid "A&ll"
msgstr ""
@ -1872,76 +1872,76 @@ msgstr ""
msgid "Wrap mode"
msgstr ""
#: src/editor/editoptions.c:153
#: src/editor/editoptions.c:154
msgid "Tabulation"
msgstr ""
#: src/editor/editoptions.c:154
#: src/editor/editoptions.c:155
msgid "&Fake half tabs"
msgstr ""
#: src/editor/editoptions.c:155
#: src/editor/editoptions.c:156
msgid "&Backspace through tabs"
msgstr ""
#: src/editor/editoptions.c:157
#: src/editor/editoptions.c:158
msgid "Fill tabs with &spaces"
msgstr ""
#: src/editor/editoptions.c:159
#: src/editor/editoptions.c:160
msgid "Tab spacing:"
msgstr ""
#: src/editor/editoptions.c:163 src/filemanager/boxes.c:475
#: src/editor/editoptions.c:164 src/filemanager/boxes.c:475
#: src/filemanager/layout.c:443
msgid "Other options"
msgstr ""
#: src/editor/editoptions.c:164
#: src/editor/editoptions.c:165
msgid "&Return does autoindent"
msgstr ""
#: src/editor/editoptions.c:166
#: src/editor/editoptions.c:167
msgid "Confir&m before saving"
msgstr ""
#: src/editor/editoptions.c:167
#: src/editor/editoptions.c:168
msgid "Save file &position"
msgstr ""
#: src/editor/editoptions.c:168
#: src/editor/editoptions.c:169
msgid "&Visible trailing spaces"
msgstr ""
#: src/editor/editoptions.c:169
#: src/editor/editoptions.c:170
msgid "Visible &tabs"
msgstr ""
#: src/editor/editoptions.c:170
#: src/editor/editoptions.c:171
msgid "Synta&x highlighting"
msgstr ""
#: src/editor/editoptions.c:171
#: src/editor/editoptions.c:172
msgid "C&ursor after inserted block"
msgstr ""
#: src/editor/editoptions.c:172
#: src/editor/editoptions.c:173
msgid "Pers&istent selection"
msgstr ""
#: src/editor/editoptions.c:174
#: src/editor/editoptions.c:175
msgid "Cursor be&yond end of line"
msgstr ""
#: src/editor/editoptions.c:176
#: src/editor/editoptions.c:177
msgid "&Group undo"
msgstr ""
#: src/editor/editoptions.c:177
#: src/editor/editoptions.c:178
msgid "Word wrap line length:"
msgstr ""
#: src/editor/editoptions.c:188
#: src/editor/editoptions.c:189
msgid "Editor options"
msgstr ""
@ -1967,28 +1967,28 @@ msgstr ""
msgid "Edit: "
msgstr ""
#: src/editor/editwidget.c:854
#: src/editor/editwidget.c:979
msgid "ButtonBar|Mark"
msgstr ""
#: src/editor/editwidget.c:855
#: src/editor/editwidget.c:980
msgid "ButtonBar|Replac"
msgstr ""
#: src/editor/editwidget.c:856 src/filemanager/midnight.c:1663
#: src/editor/editwidget.c:981 src/filemanager/midnight.c:1663
#: src/filemanager/tree.c:1230
msgid "ButtonBar|Copy"
msgstr ""
#: src/editor/editwidget.c:857
#: src/editor/editwidget.c:982
msgid "ButtonBar|Move"
msgstr ""
#: src/editor/editwidget.c:859 src/filemanager/midnight.c:1666
#: src/editor/editwidget.c:984 src/filemanager/midnight.c:1666
msgid "ButtonBar|Delete"
msgstr ""
#: src/editor/editwidget.c:860 src/filemanager/midnight.c:1667
#: src/editor/editwidget.c:985 src/filemanager/midnight.c:1667
msgid "ButtonBar|PullDn"
msgstr ""
@ -2016,18 +2016,18 @@ msgstr ""
msgid "Select language"
msgstr ""
#: src/editor/syntax.c:1505 src/editor/syntax.c:1511
#: src/editor/syntax.c:1501 src/editor/syntax.c:1507
msgid "Load syntax file"
msgstr ""
#: src/editor/syntax.c:1506 src/filemanager/usermenu.c:949 src/help.c:1088
#: src/editor/syntax.c:1502 src/filemanager/usermenu.c:949 src/help.c:1088
#, c-format
msgid ""
"Cannot open file %s\n"
"%s"
msgstr ""
#: src/editor/syntax.c:1512
#: src/editor/syntax.c:1508
#, c-format
msgid "Error in file %s on line %d"
msgstr ""
@ -2657,7 +2657,7 @@ msgstr ""
msgid "&Files only"
msgstr ""
#: src/filemanager/cmd.c:239 src/filemanager/filegui.c:1188
#: src/filemanager/cmd.c:239 src/filemanager/filegui.c:1196
#: src/filemanager/find.c:506
msgid "&Using shell patterns"
msgstr ""
@ -2956,7 +2956,7 @@ msgstr ""
msgid " with source mask:"
msgstr ""
#: src/filemanager/file.c:169 src/filemanager/filegui.c:1190
#: src/filemanager/file.c:169 src/filemanager/filegui.c:1198
msgid "to:"
msgstr ""
@ -2992,7 +2992,7 @@ msgstr ""
#: src/filemanager/file.c:607 src/filemanager/file.c:648
#: src/filemanager/file.c:692 src/filemanager/file.c:2515
#: src/filemanager/filegui.c:276 src/filemanager/filegui.c:450
#: src/filemanager/filegui.c:276 src/filemanager/filegui.c:449
msgid "&Abort"
msgstr ""
@ -3019,7 +3019,7 @@ msgid ""
"Delete it recursively?"
msgstr ""
#: src/filemanager/file.c:692 src/filemanager/filegui.c:446
#: src/filemanager/file.c:692 src/filemanager/filegui.c:445
msgid "Non&e"
msgstr ""
@ -3305,125 +3305,125 @@ msgstr ""
msgid "%ld B/s"
msgstr ""
#: src/filemanager/filegui.c:422
#: src/filemanager/filegui.c:421
msgid "Target file already exists!"
msgstr ""
#: src/filemanager/filegui.c:426
#: src/filemanager/filegui.c:425
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#: src/filemanager/filegui.c:428
#: src/filemanager/filegui.c:427
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
#: src/filemanager/filegui.c:430
#: src/filemanager/filegui.c:429
msgid "Overwrite this target?"
msgstr ""
#: src/filemanager/filegui.c:436 src/filemanager/hotlist.c:200
#: src/filemanager/filegui.c:435 src/filemanager/hotlist.c:200
msgid "A&ppend"
msgstr ""
#: src/filemanager/filegui.c:438
#: src/filemanager/filegui.c:437
msgid "&Reget"
msgstr ""
#: src/filemanager/filegui.c:440
#: src/filemanager/filegui.c:439
msgid "Overwrite all targets?"
msgstr ""
#: src/filemanager/filegui.c:444
#: src/filemanager/filegui.c:443
msgid "&Update"
msgstr ""
#: src/filemanager/filegui.c:448
#: src/filemanager/filegui.c:447
msgid "If &size differs"
msgstr ""
#: src/filemanager/filegui.c:469
#: src/filemanager/filegui.c:470
msgid "File exists"
msgstr ""
#: src/filemanager/filegui.c:471
#: src/filemanager/filegui.c:472
msgid "Background process: File exists"
msgstr ""
#: src/filemanager/filegui.c:904
#: src/filemanager/filegui.c:911
#, c-format
msgid "Files processed: %zu/%zu"
msgstr ""
#: src/filemanager/filegui.c:906
#: src/filemanager/filegui.c:913
#, c-format
msgid "Files processed: %zu"
msgstr ""
#: src/filemanager/filegui.c:950
#: src/filemanager/filegui.c:957
#, c-format
msgid "Time: %s %s"
msgstr ""
#: src/filemanager/filegui.c:954
#: src/filemanager/filegui.c:961
#, c-format
msgid "Time: %s %s (%s)"
msgstr ""
#: src/filemanager/filegui.c:960
#: src/filemanager/filegui.c:967
#, c-format
msgid "Time: %s"
msgstr ""
#: src/filemanager/filegui.c:964
#: src/filemanager/filegui.c:971
#, c-format
msgid "Time: %s (%s)"
msgstr ""
#: src/filemanager/filegui.c:972
#: src/filemanager/filegui.c:979
#, c-format
msgid " Total: %s "
msgstr ""
#: src/filemanager/filegui.c:976
#: src/filemanager/filegui.c:983
#, c-format
msgid " Total: %s/%s "
msgstr ""
#: src/filemanager/filegui.c:1001
#: src/filemanager/filegui.c:1008
msgid "Source"
msgstr ""
#: src/filemanager/filegui.c:1029
#: src/filemanager/filegui.c:1036
msgid "Target"
msgstr ""
#: src/filemanager/filegui.c:1051
#: src/filemanager/filegui.c:1058
msgid "Deleting"
msgstr ""
#: src/filemanager/filegui.c:1194
#: src/filemanager/filegui.c:1202
msgid "Follow &links"
msgstr ""
#: src/filemanager/filegui.c:1195
#: src/filemanager/filegui.c:1203
msgid "Preserve &attributes"
msgstr ""
#: src/filemanager/filegui.c:1197
#: src/filemanager/filegui.c:1205
msgid "Di&ve into subdir if exists"
msgstr ""
#: src/filemanager/filegui.c:1198
#: src/filemanager/filegui.c:1206
msgid "&Stable symlinks"
msgstr ""
#: src/filemanager/filegui.c:1203
#: src/filemanager/filegui.c:1211
msgid "&Background"
msgstr ""
#: src/filemanager/filegui.c:1257
#: src/filemanager/filegui.c:1265
#, c-format
msgid "Invalid source pattern `%s'"
msgstr ""
@ -4079,7 +4079,7 @@ msgstr ""
msgid "ButtonBar|Mkdir"
msgstr ""
#: src/filemanager/mountlist.c:850
#: src/filemanager/mountlist.c:853
msgid "Memory exhausted!"
msgstr ""
@ -4255,52 +4255,52 @@ msgstr ""
msgid "&Add new"
msgstr ""
#: src/filemanager/panelize.c:173 src/filemanager/panelize.c:389
#: src/filemanager/panelize.c:175 src/filemanager/panelize.c:391
msgid "External panelize"
msgstr ""
#: src/filemanager/panelize.c:182 src/filemanager/panelize.c:284
#: src/filemanager/panelize.c:587 src/filemanager/panelize.c:634
#: src/filemanager/panelize.c:184 src/filemanager/panelize.c:286
#: src/filemanager/panelize.c:589 src/filemanager/panelize.c:636
msgid "Other command"
msgstr ""
#: src/filemanager/panelize.c:186
#: src/filemanager/panelize.c:188
msgid "Command"
msgstr ""
#: src/filemanager/panelize.c:264
#: src/filemanager/panelize.c:266
msgid "Add to external panelize"
msgstr ""
#: src/filemanager/panelize.c:265
#: src/filemanager/panelize.c:267
msgid "Enter command label:"
msgstr ""
#: src/filemanager/panelize.c:324
#: src/filemanager/panelize.c:326
msgid "Cannot invoke command."
msgstr ""
#: src/filemanager/panelize.c:389
#: src/filemanager/panelize.c:391
msgid "Pipe close failed"
msgstr ""
#: src/filemanager/panelize.c:528
#: src/filemanager/panelize.c:530
msgid "Cannot run external panelize in a non-local directory"
msgstr ""
#: src/filemanager/panelize.c:591
#: src/filemanager/panelize.c:593
msgid "Modified git files"
msgstr ""
#: src/filemanager/panelize.c:592
#: src/filemanager/panelize.c:594
msgid "Find rejects after patching"
msgstr ""
#: src/filemanager/panelize.c:594
#: src/filemanager/panelize.c:596
msgid "Find *.orig after patching"
msgstr ""
#: src/filemanager/panelize.c:596
#: src/filemanager/panelize.c:598
msgid "Find SUID and SGID programs"
msgstr ""
@ -4952,7 +4952,7 @@ msgstr ""
#: src/vfs/sftpfs/config_parcer.c:222
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
#: src/vfs/sftpfs/config_parcer.c:321
@ -5296,6 +5296,6 @@ msgstr ""
msgid "Continue from beginning?"
msgstr ""
#: tests/src/execute__execute_with_vfs_arg.c:160
#: tests/src/execute__execute_with_vfs_arg.c:156
msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt"
msgstr ""

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -72,7 +72,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2486,11 +2486,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3792,7 +3792,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -72,7 +72,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2486,11 +2486,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3792,7 +3792,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: bucovaina78 <wannessmet@gmail.com>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/mc/language/nl/)\n"
@ -75,8 +75,8 @@ msgstr "Aanmaken van map %s mislukt"
msgid "FATAL: not a directory:"
msgstr "FATAAL: geen directory:"
#, c-format
msgid "An error occured while migrating user settings: %s"
#, fuzzy, c-format
msgid "An error occurred while migrating user settings: %s"
msgstr "Er trad een fout op bij het migreren van gebruikersinstellingen: %s"
#, c-format
@ -2633,11 +2633,11 @@ msgid "Target file already exists!"
msgstr "Doelbestand bestaat reeds!"
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3960,9 +3960,9 @@ msgstr ""
"Waarschuwing: ongeldige vlag %c in %s:\n"
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgstr ""
#, fuzzy, c-format
msgid "sftp: an error occurred while reading %s: %s"
msgstr "Er trad een fout op bij het migreren van gebruikersinstellingen: %s"
msgid "sftp: Unable to get current user name."
msgstr ""

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 17:35+0000\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/mc/language/pl/)\n"
@ -76,8 +76,8 @@ msgstr "Nie można utworzyć katalogu %s"
msgid "FATAL: not a directory:"
msgstr "KRYTYCZNE: nie jest katalogiem:"
#, c-format
msgid "An error occured while migrating user settings: %s"
#, fuzzy, c-format
msgid "An error occurred while migrating user settings: %s"
msgstr "Wystąpił błąd podczas migrowania ustawień użytkownika: %s"
#, c-format
@ -2667,12 +2667,12 @@ msgstr "%ld B/s"
msgid "Target file already exists!"
msgstr "Plik docelowy już istnieje."
#, c-format
msgid "New : %s, size %llu"
#, fuzzy, c-format
msgid "New : %s, size %s"
msgstr "Nowy : %s, rozmiar %llu"
#, c-format
msgid "Existing: %s, size %llu"
#, fuzzy, c-format
msgid "Existing: %s, size %s"
msgstr "Istniejący: %s, rozmiar %llu"
msgid "Overwrite this target?"
@ -4003,8 +4003,8 @@ msgstr ""
"Ostrzeżenie: nieprawidłowa flaga %c w %s:\n"
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
#, fuzzy, c-format
msgid "sftp: an error occurred while reading %s: %s"
msgstr "sftp: wystąpił błąd podczas odczytywania %s: %s"
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Gilberto J <gmj125@gmail.com>\n"
"Language-Team: Portuguese (http://www.transifex.com/projects/p/mc/language/"
@ -77,8 +77,8 @@ msgstr "Não é possível criar diretório %s"
msgid "FATAL: not a directory:"
msgstr "FATAL: não é um diretório:"
#, c-format
msgid "An error occured while migrating user settings: %s"
#, fuzzy, c-format
msgid "An error occurred while migrating user settings: %s"
msgstr "Ocorreu um erro ao migrar a configuração de utilizador: %s"
#, c-format
@ -2661,11 +2661,11 @@ msgid "Target file already exists!"
msgstr "Ficheiro alvo já existe!"
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3987,8 +3987,8 @@ msgstr ""
"Aviso: Flag inválida %c em %s:\n"
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
#, fuzzy, c-format
msgid "sftp: an error occurred while reading %s: %s"
msgstr "sftp: ocorreu um erro durante a leitura %s: %s"
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/mc/"
@ -78,7 +78,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2597,11 +2597,11 @@ msgid "Target file already exists!"
msgstr "O arquivo alvo já existe!"
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3909,7 +3909,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/mc/language/"
@ -74,7 +74,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2488,11 +2488,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3798,7 +3798,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -18,17 +18,15 @@ msgid ""
msgstr ""
"Project-Id-Version: Midnight Commander\n"
"Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n"
"POT-Creation-Date: 2013-03-09 15:45+0400\n"
"PO-Revision-Date: 2012-12-24 11:23+0300\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2013-03-12 13:31+0300\n"
"Last-Translator: Andrew Borodin <aborodin@vmail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/mc/language/"
"ru/)\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/mc/language/ru/)\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
msgid "Warning: cannot load codepages list"
msgstr "Внимание: невозможно загрузить список кодировок"
@ -87,7 +85,7 @@ msgid "FATAL: not a directory:"
msgstr "ОШИБКА: не является каталогом:"
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr "Произошла ошибка при переносе пользовательских настроек: %s"
#, c-format
@ -117,8 +115,7 @@ msgid "Not implemented yet"
msgstr "Пока не реализовано"
msgid "Num of replace tokens not equal to num of found tokens"
msgstr ""
"Количество шаблонных полей не соответствует количеству полей для замены"
msgstr "Количество шаблонных полей не соответствует количеству полей для замены"
#, c-format
msgid "Invalid token number %d"
@ -616,8 +613,7 @@ msgid "Load definitions of key bindings from specified file"
msgstr "Чтение определений привязок клавиш из указанного файла"
msgid "Don't load definitions of key bindings from file, use defaults"
msgstr ""
"Не загружать привязки клавиш из файла, использовать привязки по умолчанию"
msgstr "Не загружать привязки клавиш из файла, использовать привязки по умолчанию"
msgid "Requests to run in black and white"
msgstr "Принудительно установить черно-белый режим"
@ -654,26 +650,22 @@ msgid ""
msgstr ""
"--colors КЛЮЧЕВОЕ_СЛОВО={ТЕКСТ},{ФОН},{АТРИБУТ}:КЛЮЧЕВОЕ_СЛОВО2=...\n"
"\n"
"{ТЕКСТ}, {ФОН} и {АТРИБУТ} можно опустить, чтобы использовать значения по "
"умолчанию\n"
"{ТЕКСТ}, {ФОН} и {АТРИБУТ} можно опустить, чтобы использовать значения по умолчанию\n"
"\n"
"Ключевые слова:\n"
" Общие: errors, disabled, reverse, gauge, header\n"
" input, inputmark, inputunchanged, commandlinemark\n"
" bbarhotkey, bbarbutton, statusbar\n"
" Отображение файлов: normal, selected, marked, markselect\n"
" Диалоги: dnormal, dfocus, dhotnormal, dhotfocus, "
"errdhotnormal,\n"
" Диалоги: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n"
" errdhotfocus\n"
" Меню: menunormal, menuhot, menusel, menuhotsel, "
"menuinactive\n"
" Меню: menunormal, menuhot, menusel, menuhotsel, menuinactive\n"
" Всплывающие меню: pmenunormal, pmenusel, pmenutitle\n"
" Редактор: editnormal, editbold, editmarked, editwhitespace,\n"
" editlinestate, editbg, editframe, editframeactive\n"
" editframedrag\n"
" Просмотрщик: viewbold, viewunderline, viewselected\n"
" Справка: helpnormal, helpitalic, helpbold, helplink, "
"helpslink\n"
" Справка: helpnormal, helpitalic, helpbold, helplink, helpslink\n"
#. TRANSLATORS: don't translate color names and attributes
msgid ""
@ -698,8 +690,7 @@ msgstr ""
" от color16 до color255 или от rgb000 до rgb555 и от gray0 до gray23\n"
"\n"
"Атрибуты:\n"
" bold, underline, reverse, blink; несколько атрибутов объединяются знаком "
"\"+\"\n"
" bold, underline, reverse, blink; несколько атрибутов объединяются знаком \"+\"\n"
msgid "Color options"
msgstr "Цветовые настройки"
@ -1685,7 +1676,6 @@ msgstr "Обычный индикатор про&гресса"
msgid "Mkdi&r autoname"
msgstr "Автоим&я каталога"
#, fuzzy
msgid "&Preallocate space"
msgstr "Предварительно в&ыделить место"
@ -1717,7 +1707,6 @@ msgstr "Автоматические &меню"
msgid "&Drop down menus"
msgstr "Выпадение мен&ю при вызове"
#, fuzzy
msgid "S&hell patterns"
msgstr "Образцы в стиле &shell"
@ -2249,25 +2238,16 @@ msgid " %s%s file error"
msgstr "ошибка файла %s%s"
#, c-format
msgid ""
"The format of the %smc.ext file has changed with version 3.0. It seems that "
"the installation failed. Please fetch a fresh copy from the Midnight "
"Commander package."
msgstr ""
"Формат %smc.ext изменён с версии 3.0. Возможно, произошёл сбой при "
"установке. Пожалуйста, возьмите свежую копию из пакета Midnight Commander."
msgid "The format of the %smc.ext file has changed with version 3.0. It seems that the installation failed. Please fetch a fresh copy from the Midnight Commander package."
msgstr "Формат %smc.ext изменён с версии 3.0. Возможно, произошёл сбой при установке. Пожалуйста, возьмите свежую копию из пакета Midnight Commander."
#, c-format
msgid "%s file error"
msgstr "ошибка файла %s"
#, c-format
msgid ""
"The format of the %s file has changed with version 3.0. You may either want "
"to copy it from %smc.ext or use that file as an example of how to write it."
msgstr ""
"Формат файла %s изменён с версии 3.0. Вы можете либо скопировать его с %s/mc."
"ext, либо использовать этот файл как пример и написать свой."
msgid "The format of the %s file has changed with version 3.0. You may either want to copy it from %smc.ext or use that file as an example of how to write it."
msgstr "Формат файла %s изменён с версии 3.0. Вы можете либо скопировать его с %s/mc.ext, либо использовать этот файл как пример и написать свой."
msgid "DialogTitle|Copy"
msgstr "Копирование"
@ -2337,8 +2317,7 @@ msgid ""
"\n"
"Option Stable Symlinks will be disabled"
msgstr ""
"Невозможно создать устойчивые симв. ссылки через нелокальные файловые "
"системы:\n"
"Невозможно создать устойчивые симв. ссылки через нелокальные файловые системы:\n"
"\n"
"Опция \"Устойчивые символические ссылки\" будет отменена"
@ -2681,12 +2660,12 @@ msgid "Target file already exists!"
msgstr "Целевой файл уже существует!"
#, c-format
msgid "New : %s, size %llu"
msgstr "Новый: дата модификации: %s, размер: %llu"
msgid "New : %s, size %s"
msgstr "Новый: %s, размер: %llu"
#, c-format
msgid "Existing: %s, size %llu"
msgstr "Существующий: дата модификации: %s, размер: %llu"
msgid "Existing: %s, size %s"
msgstr "Существующий: %s, размер: %llu"
msgid "Overwrite this target?"
msgstr "Переписать этот файл?"
@ -4014,8 +3993,8 @@ msgstr ""
"Предупреждение: неправильный флаг %c в %s:\n"
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
#, fuzzy, c-format
msgid "sftp: an error occurred while reading %s: %s"
msgstr "sftp: произошла ошибка при чтении %s: %s"
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Jose Riha <jose1711@gmail.com>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/mc/language/sk/)\n"
@ -78,7 +78,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2497,11 +2497,11 @@ msgid "Target file already exists!"
msgstr "Cieľový súbor už existuje!"
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3815,7 +3815,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/mc/language/"
@ -79,7 +79,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2497,11 +2497,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3815,7 +3815,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/mc/language/"
@ -74,7 +74,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2488,11 +2488,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3802,7 +3802,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Cybjit <cybjit@gmail.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/mc/language/"
@ -74,7 +74,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2488,11 +2488,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3793,7 +3793,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2011-12-07 11:21+0000\n"
"Last-Translator: slavazanko <slavazanko@gmail.com>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.net/projects/p/mc/team/"
@ -72,7 +72,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2482,11 +2482,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3752,7 +3752,7 @@ msgid ""
msgstr ""
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -72,7 +72,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2482,11 +2482,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3752,7 +3752,7 @@ msgid ""
msgstr ""
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/mc/language/"
@ -73,7 +73,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2487,11 +2487,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3789,7 +3789,7 @@ msgstr ""
"%3$s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: peinguin <pingvein@gmail.com>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/mc/language/"
@ -78,8 +78,8 @@ msgstr "Не вдалося створити каталог %s"
msgid "FATAL: not a directory:"
msgstr "Сталася помилка. Не є каталогом:"
#, c-format
msgid "An error occured while migrating user settings: %s"
#, fuzzy, c-format
msgid "An error occurred while migrating user settings: %s"
msgstr "Сталася помилка під час перенесення користувацьких настройок: %s"
#, c-format
@ -2655,11 +2655,11 @@ msgid "Target file already exists!"
msgstr "Цільовий файл вже існує."
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3986,8 +3986,8 @@ msgstr ""
"Попередження: неправильний прапорець %c у %s:\n"
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
#, fuzzy, c-format
msgid "sftp: an error occurred while reading %s: %s"
msgstr "sftp: сталася помилка при читанні %s: %s"
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -72,7 +72,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2486,11 +2486,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3791,7 +3791,7 @@ msgstr ""
"%s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -72,7 +72,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2484,11 +2484,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3776,7 +3776,7 @@ msgid ""
msgstr ""
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mc/"
@ -77,8 +77,8 @@ msgstr "不能建立目录%s"
msgid "FATAL: not a directory:"
msgstr "严重错误:不是一个目录:"
#, c-format
msgid "An error occured while migrating user settings: %s"
#, fuzzy, c-format
msgid "An error occurred while migrating user settings: %s"
msgstr "迁移用户设置时发生了错误:%s"
#, c-format
@ -2626,11 +2626,11 @@ msgid "Target file already exists!"
msgstr "目标文件已存在!"
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3947,9 +3947,9 @@ msgstr ""
"警告:%2$s 中有无效的标志 %1$c\n"
"%3$s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgstr ""
#, fuzzy, c-format
msgid "sftp: an error occurred while reading %s: %s"
msgstr "迁移用户设置时发生了错误:%s"
msgid "sftp: Unable to get current user name."
msgstr ""

View File

@ -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: 2013-03-09 15:45+0400\n"
"POT-Creation-Date: 2013-03-12 13:28+0400\n"
"PO-Revision-Date: 2012-12-26 08:42+0000\n"
"Last-Translator: Slava Zanko <slavazanko@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -72,7 +72,7 @@ msgid "FATAL: not a directory:"
msgstr ""
#, c-format
msgid "An error occured while migrating user settings: %s"
msgid "An error occurred while migrating user settings: %s"
msgstr ""
#, c-format
@ -2486,11 +2486,11 @@ msgid "Target file already exists!"
msgstr ""
#, c-format
msgid "New : %s, size %llu"
msgid "New : %s, size %s"
msgstr ""
#, c-format
msgid "Existing: %s, size %llu"
msgid "Existing: %s, size %s"
msgstr ""
msgid "Overwrite this target?"
@ -3787,7 +3787,7 @@ msgstr ""
"%3$s\n"
#, c-format
msgid "sftp: an error occured while reading %s: %s"
msgid "sftp: an error occurred while reading %s: %s"
msgstr ""
msgid "sftp: Unable to get current user name."

View File

@ -7,11 +7,19 @@ noinst_LTLIBRARIES =
endif
libedit_la_SOURCES = \
bookmark.c edit.c editcmd.c editwidget.c editwidget.h \
editdraw.c editkeys.c \
editmenu.c editoptions.c edit-impl.h edit.h \
syntax.c wordproc.c \
choosesyntax.c etags.c etags.h editcmd_dialogs.c editcmd_dialogs.h
bookmark.c \
choosesyntax.c \
edit.c edit.h \
edit-impl.h \
editcmd.c \
editcmd_dialogs.c editcmd_dialogs.h \
editdraw.c \
editmenu.c \
editoptions.c \
editwidget.c editwidget.h \
etags.c etags.h \
syntax.c \
wordproc.c
if USE_ASPELL
if HAVE_GMODULE

View File

@ -181,7 +181,6 @@ void edit_menu_cmd (WDialog * h);
void user_menu (WEdit * edit, const char *menu_file, int selected_entry);
void edit_init_menu (struct WMenuBar *menubar);
void edit_save_mode_cmd (void);
gboolean edit_translate_key (WEdit * edit, long x_key, int *cmd, int *ch);
int edit_get_byte (const WEdit * edit, off_t byte_index);
int edit_get_utf (const WEdit * edit, off_t byte_index, int *char_width);
long edit_count_lines (const WEdit * edit, off_t current, off_t upto);
@ -214,6 +213,7 @@ void edit_delete_line (WEdit * edit);
int edit_delete (WEdit * edit, gboolean byte_delete);
int edit_backspace (WEdit * edit, gboolean byte_delete);
void edit_insert (WEdit * edit, int c);
void edit_insert_over (WEdit * edit);
void edit_cursor_move (WEdit * edit, off_t increment);
void edit_push_undo_action (WEdit * edit, long c);
void edit_push_redo_action (WEdit * edit, long c);
@ -253,10 +253,6 @@ void edit_set_spell_lang (void);
gboolean edit_save_block (WEdit * edit, const char *filename, off_t start, off_t finish);
gboolean edit_save_block_cmd (WEdit * edit);
gboolean edit_insert_file_cmd (WEdit * edit);
void edit_insert_over (WEdit * edit);
off_t edit_insert_column_of_text_from_file (WEdit * edit, int file,
off_t * start_pos, off_t * end_pos, long *col1,
long *col2);
char *edit_get_word_from_pos (const WEdit * edit, off_t start_pos, off_t * start, gsize * len,
gsize * cut);

View File

@ -2,13 +2,13 @@
Editor low level data handling and cursor fundamentals.
Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006,
2007, 2008, 2009, 2010, 2011, 2012
2007, 2008, 2009, 2010, 2011, 2012, 2013
The Free Software Foundation, Inc.
Written by:
Paul Sheer 1996, 1997
Ilia Maslakov <il.smind@gmail.com> 2009, 2010, 2011
Andrew Borodin <aborodin@vmail.ru> 2012.
Andrew Borodin <aborodin@vmail.ru> 2012, 2013
This file is part of the Midnight Commander.
@ -652,7 +652,6 @@ edit_modification (WEdit * edit)
/* --------------------------------------------------------------------------------------------- */
#ifdef HAVE_CHARSET
static char *
edit_get_byte_ptr (const WEdit * edit, off_t byte_index)
{
@ -671,7 +670,6 @@ edit_get_byte_ptr (const WEdit * edit, off_t byte_index)
return (char *) (edit->buffers1[byte_index >> S_EDIT_BUF_SIZE] +
(byte_index & M_EDIT_BUF_SIZE));
}
#endif
/* --------------------------------------------------------------------------------------------- */
@ -1759,6 +1757,75 @@ edit_print_string (WEdit * e, const char *s)
return i;
}
/* --------------------------------------------------------------------------------------------- */
static off_t
edit_insert_column_from_file (WEdit * edit, int file, off_t * start_pos, off_t * end_pos,
long *col1, long *col2)
{
off_t cursor;
int col;
off_t blocklen = -1, width = 0;
unsigned char *data;
cursor = edit->curs1;
col = edit_get_col (edit);
data = g_malloc0 (TEMP_BUF_LEN);
while ((blocklen = mc_read (file, (char *) data, TEMP_BUF_LEN)) > 0)
{
off_t i;
char *pn;
pn = strchr ((char *) data, '\n');
width = pn == NULL ? blocklen : pn - (char *) data;
for (i = 0; i < blocklen; i++)
{
if (data[i] != '\n')
edit_insert (edit, data[i]);
else
{ /* fill in and move to next line */
long l;
off_t p;
if (edit_get_byte (edit, edit->curs1) != '\n')
for (l = width - (edit_get_col (edit) - col); l > 0; l -= space_width)
edit_insert (edit, ' ');
for (p = edit->curs1; ; p++)
{
if (p == edit->last_byte)
{
edit_cursor_move (edit, edit->last_byte - edit->curs1);
edit_insert_ahead (edit, '\n');
p++;
break;
}
if (edit_get_byte (edit, p) == '\n')
{
p++;
break;
}
}
edit_cursor_move (edit, edit_move_forward3 (edit, p, col, 0) - edit->curs1);
for (l = col - edit_get_col (edit); l >= space_width; l -= space_width)
edit_insert (edit, ' ');
}
}
}
*col1 = col;
*col2 = col + width;
*start_pos = cursor;
*end_pos = edit->curs1;
edit_cursor_move (edit, cursor - edit->curs1);
g_free (data);
return blocklen;
}
/* --------------------------------------------------------------------------------------------- */
/*** public functions ****************************************************************************/
/* --------------------------------------------------------------------------------------------- */
@ -1811,7 +1878,7 @@ user_menu (WEdit * edit, const char *menu_file, int selected_entry)
edit_cursor_move (edit, curs - edit->curs1);
edit->force |= REDRAW_PAGE;
send_message (edit, NULL, MSG_DRAW, 0, NULL);
widget_redraw (WIDGET (edit));
}
/* --------------------------------------------------------------------------------------------- */
@ -1819,18 +1886,11 @@ user_menu (WEdit * edit, const char *menu_file, int selected_entry)
int
edit_get_byte (const WEdit * edit, off_t byte_index)
{
off_t p;
char *p;
if (byte_index >= (edit->curs1 + edit->curs2) || byte_index < 0)
return '\n';
p = edit_get_byte_ptr (edit, byte_index);
if (byte_index >= edit->curs1)
{
p = edit->curs1 + edit->curs2 - byte_index - 1;
return edit->buffers2[p >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE - (p & M_EDIT_BUF_SIZE) - 1];
}
return edit->buffers1[byte_index >> S_EDIT_BUF_SIZE][byte_index & M_EDIT_BUF_SIZE];
return (p != NULL) ? *(unsigned char *) p : '\n';
}
/* --------------------------------------------------------------------------------------------- */
@ -2140,7 +2200,7 @@ edit_insert_file (WEdit * edit, const vfs_path_t * filename_vpath)
off_t mark1, mark2;
long c1, c2;
blocklen = edit_insert_column_of_text_from_file (edit, file, &mark1, &mark2, &c1, &c2);
blocklen = edit_insert_column_from_file (edit, file, &mark1, &mark2, &c1, &c2);
edit_set_markers (edit, edit->curs1, mark2, c1, c2);
/* highlight inserted text then not persistent blocks */
@ -2749,6 +2809,18 @@ edit_insert_ahead (WEdit * edit, int c)
edit->curs2++;
}
/* --------------------------------------------------------------------------------------------- */
void
edit_insert_over (WEdit * edit)
{
long i;
for (i = 0; i < edit->over_col; i++)
edit_insert (edit, ' ');
edit->over_col = 0;
}
/* --------------------------------------------------------------------------------------------- */

View File

@ -2,12 +2,12 @@
Editor high level editing commands
Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006,
2007, 2011, 2012
2007, 2011, 2012, 2013
The Free Software Foundation, Inc.
Written by:
Paul Sheer, 1996, 1997
Andrew Borodin <aborodin@vmail.ru>, 2012
Andrew Borodin <aborodin@vmail.ru>, 2012, 2013
Ilia Maslakov <il.smind@gmail.com>, 2012
This file is part of the Midnight Commander.
@ -1203,7 +1203,7 @@ edit_collect_completions_get_current_word (WEdit * edit, mc_search_t * srch, off
static gsize
edit_collect_completions (WEdit * edit, off_t word_start, gsize word_len,
char *match_expr, struct selection *compl, gsize * num)
char *match_expr, GString ** compl, gsize * num)
{
gsize len = 0;
gsize max_len = 0;
@ -1267,14 +1267,12 @@ edit_collect_completions (WEdit * edit, off_t word_start, gsize word_len,
for (i = 0; i < *num; i++)
{
if (strncmp
((char *) &compl[i].text[word_len],
(char *) &temp->str[word_len], max (len, compl[i].len) - word_len) == 0)
((char *) &compl[i]->str[word_len],
(char *) &temp->str[word_len], max (len, compl[i]->len) - word_len) == 0)
{
struct selection this = compl[i];
GString *this = compl[i];
for (++i; i < *num; i++)
{
compl[i - 1] = compl[i];
}
compl[*num - 1] = this;
skip = 1;
break; /* skip it, already added */
@ -1285,11 +1283,9 @@ edit_collect_completions (WEdit * edit, off_t word_start, gsize word_len,
if (*num == MAX_WORD_COMPLETIONS)
{
g_free (compl[0].text);
g_string_free (compl[0], TRUE);
for (i = 1; i < *num; i++)
{
compl[i - 1] = compl[i];
}
(*num)--;
}
#ifdef HAVE_CHARSET
@ -1303,9 +1299,7 @@ edit_collect_completions (WEdit * edit, off_t word_start, gsize word_len,
g_string_free (recoded, TRUE);
}
#endif
compl[*num].text = g_strndup (temp->str, temp->len);
compl[*num].len = temp->len;
(*num)++;
compl[(*num)++] = g_string_new_len (temp->str, temp->len);
start += len;
/* note the maximal length needed for the completion dialog */
@ -1663,7 +1657,7 @@ edit_save_as_cmd (WEdit * edit)
{
int rv;
if (vfs_path_cmp (edit->filename_vpath, exp_vpath) != 0)
if (!vfs_path_equal (edit->filename_vpath, exp_vpath))
{
int file;
struct stat sb;
@ -2295,95 +2289,6 @@ eval_marks (WEdit * edit, off_t * start_mark, off_t * end_mark)
/* --------------------------------------------------------------------------------------------- */
void
edit_insert_over (WEdit * edit)
{
int i;
for (i = 0; i < edit->over_col; i++)
{
edit_insert (edit, ' ');
}
edit->over_col = 0;
}
/* --------------------------------------------------------------------------------------------- */
off_t
edit_insert_column_of_text_from_file (WEdit * edit, int file,
off_t * start_pos, off_t * end_pos, long *col1, long *col2)
{
off_t cursor;
int col;
off_t blocklen = -1, width = 0;
unsigned char *data;
cursor = edit->curs1;
col = edit_get_col (edit);
data = g_malloc0 (TEMP_BUF_LEN);
while ((blocklen = mc_read (file, (char *) data, TEMP_BUF_LEN)) > 0)
{
off_t i;
for (width = 0; width < blocklen; width++)
{
if (data[width] == '\n')
break;
}
for (i = 0; i < blocklen; i++)
{
if (data[i] == '\n')
{ /* fill in and move to next line */
long l;
off_t p;
if (edit_get_byte (edit, edit->curs1) != '\n')
{
l = width - (edit_get_col (edit) - col);
while (l > 0)
{
edit_insert (edit, ' ');
l -= space_width;
}
}
for (p = edit->curs1;; p++)
{
if (p == edit->last_byte)
{
edit_cursor_move (edit, edit->last_byte - edit->curs1);
edit_insert_ahead (edit, '\n');
p++;
break;
}
if (edit_get_byte (edit, p) == '\n')
{
p++;
break;
}
}
edit_cursor_move (edit, edit_move_forward3 (edit, p, col, 0) - edit->curs1);
l = col - edit_get_col (edit);
while (l >= space_width)
{
edit_insert (edit, ' ');
l -= space_width;
}
continue;
}
edit_insert (edit, data[i]);
}
}
*col1 = col;
*col2 = col + width;
*start_pos = cursor;
*end_pos = edit->curs1;
edit_cursor_move (edit, cursor - edit->curs1);
g_free (data);
return blocklen;
}
/* --------------------------------------------------------------------------------------------- */
void
edit_block_copy_cmd (WEdit * edit)
{
@ -3363,7 +3268,7 @@ edit_complete_word_cmd (WEdit * edit)
off_t word_start = 0;
unsigned char *bufpos;
char *match_expr;
struct selection compl[MAX_WORD_COMPLETIONS]; /* completions */
GString *compl[MAX_WORD_COMPLETIONS]; /* completions */
/* search start of word to be completed */
if (!edit_find_word_start (edit, &word_start, &word_len))
@ -3381,16 +3286,16 @@ edit_complete_word_cmd (WEdit * edit)
/* collect the possible completions */
/* start search from begin to end of file */
max_len =
edit_collect_completions (edit, word_start, word_len, match_expr,
(struct selection *) &compl, &num_compl);
edit_collect_completions (edit, word_start, word_len, match_expr, (GString **) &compl,
&num_compl);
if (num_compl > 0)
{
/* insert completed word if there is only one match */
if (num_compl == 1)
{
for (i = word_len; i < compl[0].len; i++)
edit_insert (edit, *(compl[0].text + i));
for (i = word_len; i < compl[0]->len; i++)
edit_insert (edit, *(compl[0]->str + i));
}
/* more than one possible completion => ask the user */
else
@ -3401,15 +3306,14 @@ edit_complete_word_cmd (WEdit * edit)
/*tty_beep (); */
/* let the user select the preferred completion */
editcmd_dialog_completion_show (edit, max_len, word_len,
(struct selection *) &compl, num_compl);
editcmd_dialog_completion_show (edit, max_len, word_len, (GString **) &compl, num_compl);
}
}
g_free (match_expr);
/* release memory before return */
for (i = 0; i < num_compl; i++)
g_free (compl[i].text);
g_string_free (compl[i], TRUE);
}
/* --------------------------------------------------------------------------------------------- */
@ -3422,7 +3326,7 @@ edit_select_codepage_cmd (WEdit * edit)
edit_set_codeset (edit);
edit->force = REDRAW_PAGE;
send_message (edit, NULL, MSG_DRAW, 0, NULL);
widget_redraw (WIDGET (edit));
}
#endif

View File

@ -338,7 +338,7 @@ editcmd_dialog_raw_key_query (const char *heading, const char *query, gboolean c
void
editcmd_dialog_completion_show (WEdit * edit, int max_len, int word_len,
struct selection *compl, int num_compl)
GString ** compl, int num_compl)
{
int start_x, start_y, offset, i;
@ -382,7 +382,7 @@ editcmd_dialog_completion_show (WEdit * edit, int max_len, int word_len,
/* fill the listbox with the completions */
for (i = num_compl - 1; i >= 0; i--) /* reverse order */
listbox_add_item (compl_list, LISTBOX_APPEND_AT_END, 0, (char *) compl[i].text, NULL);
listbox_add_item (compl_list, LISTBOX_APPEND_AT_END, 0, (char *) compl[i]->str, NULL);
/* pop up the dialog and apply the choosen completion */
if (run_dlg (compl_dlg) == B_ENTER)

View File

@ -15,12 +15,6 @@ struct etags_hash_struct;
/*** structures declarations (and typedefs of structures)*****************************************/
struct selection
{
gchar *text;
gsize len;
};
/*** global variables defined in .c file *********************************************************/
/*** declarations of public functions ************************************************************/
@ -31,7 +25,7 @@ gboolean editcmd_dialog_search_show (WEdit * edit);
int editcmd_dialog_raw_key_query (const char *heading, const char *query, gboolean cancel);
void editcmd_dialog_completion_show (WEdit *, int, int, struct selection *, int);
void editcmd_dialog_completion_show (WEdit *, int, int, GString **, int);
void editcmd_dialog_select_definition_show (WEdit *, char *, int, int, struct etags_hash_struct *,
int);

View File

@ -1,197 +0,0 @@
/*
Editor key translation.
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007, 2011, 2012
The Free Software Foundation, Inc.
Written by:
Paul Sheer, 1996, 1997
Andrew Borodin <aborodin@vmail.ru> 2012
This file is part of the Midnight Commander.
The Midnight Commander is free software: you can redistribute it
and/or modify it under the terms of the GNU General Public License as
published by the Free Software Foundation, either version 3 of the License,
or (at your option) any later version.
The Midnight Commander is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/** \file
* \brief Source: editor key translation
*/
#include <config.h>
#include <stdio.h>
#include <stdarg.h>
#include <sys/types.h>
#include <unistd.h>
#include <string.h>
#include <ctype.h>
#include <errno.h>
#include <sys/stat.h>
#include <stdlib.h>
#include "lib/global.h"
#include "lib/tty/tty.h" /* keys */
#include "lib/tty/key.h" /* KEY_M_SHIFT */
#include "lib/strutil.h" /* str_isutf8 () */
#include "lib/util.h" /* is_printable() */
#ifdef HAVE_CHARSET
#include "lib/charsets.h"
#endif
#include "edit-impl.h"
#include "editwidget.h" /* WEdit */
#include "editcmd_dialogs.h"
#include "src/keybind-defaults.h" /* keybind_lookup_keymap_command() */
/*** global variables ****************************************************************************/
/*** file scope macro definitions ****************************************************************/
/*** file scope type declarations ****************************************************************/
/*** file scope variables ************************************************************************/
/*** file scope functions ************************************************************************/
/* --------------------------------------------------------------------------------------------- */
/* --------------------------------------------------------------------------------------------- */
/*** public functions ****************************************************************************/
/* --------------------------------------------------------------------------------------------- */
/*
* Translate the keycode into either 'command' or 'char_for_insertion'.
* 'command' is one of the editor commands from cmddef.h.
*/
gboolean
edit_translate_key (WEdit * edit, long x_key, int *cmd, int *ch)
{
unsigned long command = (unsigned long) CK_InsertChar;
int char_for_insertion = -1;
/* an ordinary insertable character */
if (!edit->extmod && x_key < 256)
{
#ifndef HAVE_CHARSET
if (is_printable (x_key))
{
char_for_insertion = x_key;
goto fin;
}
#else
int c;
if (edit->charpoint >= 4)
{
edit->charpoint = 0;
edit->charbuf[edit->charpoint] = '\0';
}
if (edit->charpoint < 4)
{
edit->charbuf[edit->charpoint++] = x_key;
edit->charbuf[edit->charpoint] = '\0';
}
/* input from 8-bit locale */
if (!mc_global.utf8_display)
{
/* source in 8-bit codeset */
c = convert_from_input_c (x_key);
if (is_printable (c))
{
if (!edit->utf8)
char_for_insertion = c;
else
char_for_insertion = convert_from_8bit_to_utf_c2 ((unsigned char) x_key);
goto fin;
}
}
else
{
/* UTF-8 locale */
int res;
res = str_is_valid_char (edit->charbuf, edit->charpoint);
if (res < 0 && res != -2)
{
edit->charpoint = 0; /* broken multibyte char, skip */
goto fin;
}
if (edit->utf8)
{
/* source in UTF-8 codeset */
if (res < 0)
{
char_for_insertion = x_key;
goto fin;
}
edit->charbuf[edit->charpoint] = '\0';
edit->charpoint = 0;
if (g_unichar_isprint (g_utf8_get_char (edit->charbuf)))
{
char_for_insertion = x_key;
goto fin;
}
}
else
{
/* 8-bit source */
if (res < 0)
{
/* not finised multibyte input (in meddle multibyte utf-8 char) */
goto fin;
}
if (g_unichar_isprint (g_utf8_get_char (edit->charbuf)))
{
c = convert_from_utf_to_current (edit->charbuf);
edit->charbuf[0] = '\0';
edit->charpoint = 0;
char_for_insertion = c;
goto fin;
}
/* unprinteble utf input, skip it */
edit->charbuf[0] = '\0';
edit->charpoint = 0;
}
}
#endif /* HAVE_CHARSET */
}
/* Commands specific to the key emulation */
if (edit->extmod)
{
edit->extmod = FALSE;
command = keybind_lookup_keymap_command (editor_x_map, x_key);
}
else
command = keybind_lookup_keymap_command (editor_map, x_key);
if (command == CK_IgnoreKey)
command = CK_InsertChar;
fin:
*cmd = (int) command; /* FIXME */
*ch = char_for_insertion;
return !(command == (unsigned long) CK_InsertChar && char_for_insertion == -1);
}
/* --------------------------------------------------------------------------------------------- */

View File

@ -150,6 +150,7 @@ edit_options_dialog (WDialog * h)
QUICK_RADIO (3, wrap_str, &wrap_mode, NULL),
QUICK_STOP_GROUPBOX,
QUICK_SEPARATOR (FALSE),
QUICK_SEPARATOR (FALSE),
QUICK_START_GROUPBOX (N_("Tabulation")),
QUICK_CHECKBOX (N_("&Fake half tabs"), &option_fake_half_tabs, NULL),
QUICK_CHECKBOX (N_("&Backspace through tabs"), &option_backspace_through_tabs,

View File

@ -2,12 +2,12 @@
Editor initialisation and callback handler.
Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006,
2007, 2011, 2012
2007, 2011, 2012, 2013
The Free Software Foundation, Inc.
Written by:
Paul Sheer, 1996, 1997
Andrew Borodin <aborodin@vmail.ru> 2012
Andrew Borodin <aborodin@vmail.ru> 2012, 2013
This file is part of the Midnight Commander.
@ -33,15 +33,12 @@
#include <config.h>
#include <stdio.h>
#include <stdarg.h>
#include <sys/types.h>
#include <unistd.h>
#include <string.h>
#include <ctype.h>
#include <errno.h>
#include <sys/stat.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <unistd.h>
#include "lib/global.h"
@ -54,8 +51,11 @@
#include "lib/widget.h"
#include "lib/mcconfig.h"
#include "lib/event.h" /* mc_event_raise() */
#ifdef HAVE_CHARSET
#include "lib/charsets.h"
#endif
#include "src/keybind-defaults.h"
#include "src/keybind-defaults.h" /* keybind_lookup_keymap_command() */
#include "src/setup.h" /* home_dir */
#include "src/filemanager/cmd.h" /* view_other_cmd(), save_setup_cmd() */
#include "src/learn.h" /* learn_keys() */
@ -809,6 +809,131 @@ edit_dialog_command_execute (WDialog * h, unsigned long command)
return ret;
}
/* --------------------------------------------------------------------------------------------- */
/*
* Translate the keycode into either 'command' or 'char_for_insertion'.
* 'command' is one of the editor commands from cmddef.h.
*/
static gboolean
edit_translate_key (WEdit * edit, long x_key, int *cmd, int *ch)
{
unsigned long command = (unsigned long) CK_InsertChar;
int char_for_insertion = -1;
/* an ordinary insertable character */
if (!edit->extmod && x_key < 256)
{
#ifndef HAVE_CHARSET
if (is_printable (x_key))
{
char_for_insertion = x_key;
goto fin;
}
#else
int c;
if (edit->charpoint >= 4)
{
edit->charpoint = 0;
edit->charbuf[edit->charpoint] = '\0';
}
if (edit->charpoint < 4)
{
edit->charbuf[edit->charpoint++] = x_key;
edit->charbuf[edit->charpoint] = '\0';
}
/* input from 8-bit locale */
if (!mc_global.utf8_display)
{
/* source in 8-bit codeset */
c = convert_from_input_c (x_key);
if (is_printable (c))
{
if (!edit->utf8)
char_for_insertion = c;
else
char_for_insertion = convert_from_8bit_to_utf_c2 ((unsigned char) x_key);
goto fin;
}
}
else
{
/* UTF-8 locale */
int res;
res = str_is_valid_char (edit->charbuf, edit->charpoint);
if (res < 0 && res != -2)
{
edit->charpoint = 0; /* broken multibyte char, skip */
goto fin;
}
if (edit->utf8)
{
/* source in UTF-8 codeset */
if (res < 0)
{
char_for_insertion = x_key;
goto fin;
}
edit->charbuf[edit->charpoint] = '\0';
edit->charpoint = 0;
if (g_unichar_isprint (g_utf8_get_char (edit->charbuf)))
{
char_for_insertion = x_key;
goto fin;
}
}
else
{
/* 8-bit source */
if (res < 0)
{
/* not finised multibyte input (in meddle multibyte utf-8 char) */
goto fin;
}
if (g_unichar_isprint (g_utf8_get_char (edit->charbuf)))
{
c = convert_from_utf_to_current (edit->charbuf);
edit->charbuf[0] = '\0';
edit->charpoint = 0;
char_for_insertion = c;
goto fin;
}
/* unprinteble utf input, skip it */
edit->charbuf[0] = '\0';
edit->charpoint = 0;
}
}
#endif /* HAVE_CHARSET */
}
/* Commands specific to the key emulation */
if (edit->extmod)
{
edit->extmod = FALSE;
command = keybind_lookup_keymap_command (editor_x_map, x_key);
}
else
command = keybind_lookup_keymap_command (editor_map, x_key);
if (command == CK_IgnoreKey)
command = CK_InsertChar;
fin:
*cmd = (int) command; /* FIXME */
*ch = char_for_insertion;
return !(command == (unsigned long) CK_InsertChar && char_for_insertion == -1);
}
/* --------------------------------------------------------------------------------------------- */
static inline void
@ -1039,7 +1164,7 @@ edit_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *da
*
* @param file_vpath file object
* @param line line number
* @return TRUE if no errors was occured, FALSE otherwise
* @return TRUE if no errors was occurred, FALSE otherwise
*/
gboolean
@ -1173,7 +1298,7 @@ edit_update_screen (WEdit * e)
edit_render_keypress (e);
}
buttonbar_redraw (find_buttonbar (h));
widget_redraw (WIDGET (find_buttonbar (h)));
}
/* --------------------------------------------------------------------------------------------- */

View File

@ -139,14 +139,10 @@ static char *error_file_name = NULL;
static gint
mc_defines_destroy (gpointer key, gpointer value, gpointer data)
{
char **values = value;
(void) data;
g_free (key);
while (*values)
g_free (*values++);
g_free (value);
g_strfreev ((char **) value);
return FALSE;
}

View File

@ -1044,7 +1044,7 @@ reread_cmd (void)
panel_update_flags_t flag = UP_ONLY_CURRENT;
if (get_current_type () == view_listing && get_other_type () == view_listing &&
vfs_path_cmp (current_panel->cwd_vpath, other_panel->cwd_vpath) == 0)
vfs_path_equal (current_panel->cwd_vpath, other_panel->cwd_vpath))
flag = UP_OPTIMIZE;
update_panels (UP_RELOAD | flag, UP_KEEPSEL);
@ -1752,7 +1752,7 @@ change_listing_cmd (void)
char *user, *status;
WPanel *p = NULL;
if (get_display_type (MENU_PANEL_IDX) == view_listing)
if (SELECTED_IS_PANEL)
p = MENU_PANEL_IDX == 0 ? left_panel : right_panel;
list_type = panel_listing_box (p, &user, &status, &use_msformat, MENU_PANEL_IDX);

View File

@ -398,9 +398,8 @@ overwrite_query_dialog (FileOpContext * ctx, enum OperationMode mode)
#define ADD_RD_LABEL(i, p1, p2, ypos) \
g_snprintf (buffer, sizeof (buffer), rd_widgets [i].text, p1, p2); \
add_widget_autopos (ui->replace_dlg, \
label_new (ypos, rd_widgets [i].xpos, buffer), \
rd_widgets [i].pos_flags, \
label2 = WIDGET (label_new (ypos, rd_widgets [i].xpos, buffer)); \
add_widget_autopos (ui->replace_dlg, label2, rd_widgets [i].pos_flags, \
ui->replace_dlg->current != NULL ? ui->replace_dlg->current->data : NULL)
/* dialog sizes */
@ -422,10 +421,10 @@ overwrite_query_dialog (FileOpContext * ctx, enum OperationMode mode)
{ N_("Target file already exists!"), 3, 4, WPOS_KEEP_TOP | WPOS_CENTER_HORZ, 0 },
/* 1 */
{ "%s", 4, 4, WPOS_KEEP_TOP | WPOS_CENTER_HORZ, 0 },
/* 2 */ /* cannot use PRIuMAX here; %llu is used instead */
{ N_("New : %s, size %llu"), 6, 4, WPOS_KEEP_DEFAULT, 0 },
/* 3 */ /* cannot use PRIuMAX here; %llu is used instead */
{ N_("Existing: %s, size %llu"), 7, 4, WPOS_KEEP_DEFAULT, 0 },
/* 2 */
{ N_("New : %s, size %s"), 6, 4, WPOS_KEEP_DEFAULT, 0 },
/* 3 */
{ N_("Existing: %s, size %s"), 7, 4, WPOS_KEEP_DEFAULT, 0 },
/* 4 */
{ N_("Overwrite this target?"), 9, 4, WPOS_KEEP_DEFAULT, 0 },
/* 5 */
@ -457,6 +456,8 @@ overwrite_query_dialog (FileOpContext * ctx, enum OperationMode mode)
FileOpContextUI *ui = ctx->ui;
char buffer[BUF_SMALL];
char fsize_buffer[BUF_SMALL];
Widget *label1, *label2;
const char *title;
vfs_path_t *stripped_vpath;
const char *stripped_name;
@ -541,16 +542,19 @@ overwrite_query_dialog (FileOpContext * ctx, enum OperationMode mode)
/* prompt */
ADD_RD_LABEL (0, "", "", y++);
/* file name */
ADD_RD_LABEL (1, str_trunc (stripped_name, rd_xlen - 8), "", y++);
ADD_RD_LABEL (1, "", "", y++);
label1 = label2;
add_widget (ui->replace_dlg, hline_new (y++, -1, -1));
/* source date and size */
ADD_RD_LABEL (2, file_date (ui->s_stat->st_mtime), (unsigned long long) ui->s_stat->st_size,
y++);
size_trunc_len (fsize_buffer, sizeof (fsize_buffer), ui->s_stat->st_size, -1, panels_options.kilobyte_si);
ADD_RD_LABEL (2, file_date (ui->s_stat->st_mtime), fsize_buffer, y++);
rd_xlen = max (rd_xlen, label2->cols + 8);
/* destination date and size */
ADD_RD_LABEL (3, file_date (ui->d_stat->st_mtime), (unsigned long long) ui->d_stat->st_size,
y++);
size_trunc_len (fsize_buffer, sizeof (fsize_buffer), ui->d_stat->st_size, -1, panels_options.kilobyte_si);
ADD_RD_LABEL (3, file_date (ui->d_stat->st_mtime), fsize_buffer, y++);
rd_xlen = max (rd_xlen, label2->cols + 8);
add_widget (ui->replace_dlg, hline_new (y++, -1, -1));
@ -580,6 +584,7 @@ overwrite_query_dialog (FileOpContext * ctx, enum OperationMode mode)
ADD_RD_BUTTON (14, y); /* Abort */
label_set_text (LABEL (label1), str_trunc (stripped_name, rd_xlen - 8));
dlg_set_size (ui->replace_dlg, y + 3, rd_xlen);
dlg_select_by_id (ui->replace_dlg, yes_id);
result = run_dlg (ui->replace_dlg);
@ -629,7 +634,7 @@ place_progress_buttons (WDialog * h, gboolean suspended)
/* --------------------------------------------------------------------------------------------- */
static int
progress_start_stop (WButton * button, int action)
progress_button_callback (WButton * button, int action)
{
(void) button;
(void) action;
@ -649,7 +654,8 @@ check_progress_buttons (FileOpContext * ctx)
Gpm_Event event;
FileOpContextUI *ui;
g_return_val_if_fail (ctx->ui != NULL, FILE_CONT);
if (ctx == NULL || ctx->ui == NULL)
return FILE_CONT;
ui = ctx->ui;
@ -666,6 +672,12 @@ check_progress_buttons (FileOpContext * ctx)
switch (ui->op_dlg->ret_value)
{
case FILE_SKIP:
if (ctx->suspended)
{
/* redraw dialog in case of Skip after Suspend */
place_progress_buttons (ui->op_dlg, FALSE);
dlg_redraw (ui->op_dlg);
}
ctx->suspended = FALSE;
return FILE_SKIP;
case B_CANCEL:
@ -696,8 +708,8 @@ file_op_context_create_ui (FileOpContext * ctx, gboolean with_eta,
int dlg_width = 58, dlg_height = 17;
int y = 2, x = 3;
g_return_if_fail (ctx != NULL);
g_return_if_fail (ctx->ui == NULL);
if (ctx == NULL || ctx->ui != NULL)
return;
#ifdef ENABLE_NLS
if (progress_buttons[0].len == -1)
@ -709,7 +721,6 @@ file_op_context_create_ui (FileOpContext * ctx, gboolean with_eta,
}
#endif
ctx->dialog_type = dialog_type;
ctx->recursive_result = RECURSIVE_YES;
ctx->ui = g_new0 (FileOpContextUI, 1);
@ -769,13 +780,13 @@ file_op_context_create_ui (FileOpContext * ctx, gboolean with_eta,
progress_buttons[0].w = WIDGET (button_new (y, 0, progress_buttons[0].action,
progress_buttons[0].flags, progress_buttons[0].text,
NULL));
progress_button_callback));
if (progress_buttons[0].len == -1)
progress_buttons[0].len = button_get_len (BUTTON (progress_buttons[0].w));
progress_buttons[1].w = WIDGET (button_new (y, 0, progress_buttons[1].action,
progress_buttons[1].flags, progress_buttons[1].text,
progress_start_stop));
progress_button_callback));
if (progress_buttons[1].len == -1)
progress_buttons[1].len = button_get_len (BUTTON (progress_buttons[1].w));
@ -784,7 +795,8 @@ file_op_context_create_ui (FileOpContext * ctx, gboolean with_eta,
/* create and destroy button to get it length */
progress_buttons[2].w = WIDGET (button_new (y, 0, progress_buttons[2].action,
progress_buttons[2].flags,
progress_buttons[2].text, progress_start_stop));
progress_buttons[2].text,
progress_button_callback));
progress_buttons[2].len = button_get_len (BUTTON (progress_buttons[2].w));
send_message (progress_buttons[2].w, NULL, MSG_DESTROY, 0, NULL);
g_free (progress_buttons[2].w);
@ -822,9 +834,7 @@ file_op_context_create_ui (FileOpContext * ctx, gboolean with_eta,
void
file_op_context_destroy_ui (FileOpContext * ctx)
{
g_return_if_fail (ctx != NULL);
if (ctx->ui != NULL)
if (ctx != NULL && ctx->ui != NULL)
{
FileOpContextUI *ui = (FileOpContextUI *) ctx->ui;
@ -849,12 +859,9 @@ file_progress_show (FileOpContext * ctx, off_t done, off_t total,
char buffer2[BUF_TINY];
char buffer3[BUF_TINY];
if (!verbose)
if (!verbose || ctx == NULL || ctx->ui == NULL)
return;
g_return_if_fail (ctx != NULL);
g_return_if_fail (ctx->ui != NULL);
ui = ctx->ui;
if (total == 0)
@ -896,8 +903,8 @@ file_progress_show_count (FileOpContext * ctx, size_t done, size_t total)
char buffer[BUF_TINY];
FileOpContextUI *ui;
g_return_if_fail (ctx != NULL);
g_return_if_fail (ctx->ui != NULL);
if (ctx == NULL || ctx->ui == NULL)
return;
ui = ctx->ui;
if (ctx->progress_totals_computed)
@ -920,8 +927,8 @@ file_progress_show_total (FileOpTotalContext * tctx, FileOpContext * ctx, uintma
struct timeval tv_current;
FileOpContextUI *ui;
g_return_if_fail (ctx != NULL);
g_return_if_fail (ctx->ui != NULL);
if (ctx == NULL || ctx->ui == NULL)
return;
ui = ctx->ui;
@ -988,8 +995,8 @@ file_progress_show_source (FileOpContext * ctx, const vfs_path_t * s_vpath)
{
FileOpContextUI *ui;
g_return_if_fail (ctx != NULL);
g_return_if_fail (ctx->ui != NULL);
if (ctx == NULL || ctx->ui == NULL)
return;
ui = ctx->ui;
@ -1016,8 +1023,8 @@ file_progress_show_target (FileOpContext * ctx, const vfs_path_t * s_vpath)
{
FileOpContextUI *ui;
g_return_if_fail (ctx != NULL);
g_return_if_fail (ctx->ui != NULL);
if (ctx == NULL || ctx->ui == NULL)
return;
ui = ctx->ui;
@ -1044,8 +1051,8 @@ file_progress_show_deleting (FileOpContext * ctx, const char *s)
{
FileOpContextUI *ui;
g_return_if_fail (ctx != NULL);
g_return_if_fail (ctx->ui != NULL);
if (ctx == NULL || ctx->ui == NULL)
return;
ui = ctx->ui;
label_set_text (ui->file_label[0], _("Deleting"));
@ -1061,8 +1068,8 @@ file_progress_real_query_replace (FileOpContext * ctx,
{
FileOpContextUI *ui;
g_return_val_if_fail (ctx != NULL, FILE_CONT);
g_return_val_if_fail (ctx->ui != NULL, FILE_CONT);
if (ctx == NULL || ctx->ui == NULL)
return FILE_CONT;
ui = ctx->ui;
@ -1125,7 +1132,8 @@ file_mask_dialog (FileOpContext * ctx, FileOperation operation,
char *dest_dir, *tmp;
char *def_text_secure;
g_return_val_if_fail (ctx != NULL, NULL);
if (ctx == NULL)
return NULL;
/* unselect checkbox if target filesystem don't support attributes */
ctx->op_preserve = filegui__check_attrs_on_fs (def_text);

View File

@ -98,12 +98,12 @@ file_op_context_new (FileOperation op)
void
file_op_context_destroy (FileOpContext * ctx)
{
g_return_if_fail (ctx != NULL);
file_op_context_destroy_ui (ctx);
mc_search_free (ctx->search_handle);
/** \todo FIXME: do we need to free ctx->dest_mask? */
g_free (ctx);
if (ctx != NULL)
{
file_op_context_destroy_ui (ctx);
mc_search_free (ctx->search_handle);
g_free (ctx);
}
}
/* --------------------------------------------------------------------------------------------- */

View File

@ -922,7 +922,7 @@ find_add_match (const char *dir, const char *file)
/* Don't scroll */
if (matches == 0)
listbox_select_first (find_list);
send_message (find_list, NULL, MSG_DRAW, 0, NULL);
widget_redraw (WIDGET (find_list));
matches++;
found_num_update ();

View File

@ -233,7 +233,7 @@ update_split (const WDialog * h)
check_options[0].widget->state = _panels_layout.horizontal_equal ? 1 : 0;
else
check_options[0].widget->state = _panels_layout.vertical_equal ? 1 : 0;
send_message (check_options[0].widget, NULL, MSG_DRAW, 0, NULL);
widget_redraw (WIDGET (check_options[0].widget));
tty_setcolor (check_options[0].widget->state & C_BOOL ? DISABLED_COLOR : COLOR_NORMAL);

View File

@ -1097,10 +1097,10 @@ static void
update_dirty_panels (void)
{
if (get_current_type () == view_listing && current_panel->dirty)
send_message (current_panel, NULL, MSG_DRAW, 0, NULL);
widget_redraw (WIDGET (current_panel));
if (get_other_type () == view_listing && other_panel->dirty)
send_message (other_panel, NULL, MSG_DRAW, 0, NULL);
widget_redraw (WIDGET (other_panel));
}
/* --------------------------------------------------------------------------------------------- */

View File

@ -16,7 +16,7 @@
#define MENU_PANEL (mc_global.widget.is_right ? right_panel : left_panel)
#define MENU_PANEL_IDX (mc_global.widget.is_right ? 1 : 0)
#define SELECTED_IS_PANEL (get_display_type (mc_global.widget.is_right ? 1 : 0) == view_listing)
#define SELECTED_IS_PANEL (get_display_type (MENU_PANEL_IDX) == view_listing)
#define other_panel get_other_panel()

View File

@ -160,8 +160,12 @@
#include <sys/mntent.h>
#endif
#ifndef HAVE_HASMNTOPT
#define hasmntopt(mnt, opt) ((char *) 0)
#endif
#undef MNT_IGNORE
#if defined MNTOPT_IGNORE && defined HAVE_HASMNTOPT
#ifdef MNTOPT_IGNORE
#define MNT_IGNORE(M) hasmntopt ((M), MNTOPT_IGNORE)
#else
#define MNT_IGNORE(M) 0
@ -208,7 +212,6 @@
/* for Linux 2.6/3.x */ \
|| strcmp (Fs_type, "debugfs") == 0 \
|| strcmp (Fs_type, "devpts") == 0 \
|| strcmp (Fs_type, "devtmpfs") == 0 \
|| strcmp (Fs_type, "fusectl") == 0 \
|| strcmp (Fs_type, "mqueue") == 0 \
|| strcmp (Fs_type, "rpc_pipefs") == 0 \

View File

@ -2497,7 +2497,7 @@ do_search (WPanel * panel, int c_code)
unselect_item (panel);
panel->selected = sel;
select_item (panel);
send_message (panel, NULL, MSG_DRAW, 0, NULL);
widget_redraw (WIDGET (panel));
}
else if (c_code != KEY_BACKSPACE)
{
@ -3462,7 +3462,7 @@ panel_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
bb = find_buttonbar (w->owner);
midnight_set_buttonbar (bb);
buttonbar_redraw (bb);
widget_redraw (WIDGET (bb));
return MSG_HANDLED;
case MSG_UNFOCUS:
@ -3718,7 +3718,7 @@ panel_event (Gpm_Event * event, void *data)
finish:
if (panel->dirty)
send_message (w, NULL, MSG_DRAW, 0, NULL);
widget_redraw (w);
return MOU_NORMAL;
}
@ -4812,7 +4812,7 @@ do_cd (const vfs_path_t * new_dir_vpath, enum cd_enum exact)
size_t new_vpath_len;
new_vpath_len = vfs_path_len (new_dir_vpath);
if (vfs_path_ncmp (new_dir_vpath, panelized_panel.root_vpath, new_vpath_len) == 0)
if (vfs_path_equal_len (new_dir_vpath, panelized_panel.root_vpath, new_vpath_len))
_new_dir_vpath = panelized_panel.root_vpath;
}

View File

@ -2,7 +2,7 @@
External panelize
Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
2007, 2009, 2011
2007, 2009, 2011, 2013
The Free Software Foundation, Inc.
Written by:
@ -159,7 +159,9 @@ init_panelize (void)
blen = i - 1; /* gaps between buttons */
while (i-- != 0)
{
#ifdef ENABLE_NLS
panelize_but[i].text = _(panelize_but[i].text);
#endif
blen += str_term_width1 (panelize_but[i].text) + 3 + 1;
if (panelize_but[i].flags == DEFPUSH_BUTTON)
blen += 2;
@ -418,7 +420,7 @@ do_panelize_cd (struct WPanel *panel)
panel->count = panelized_panel.count;
panel->is_panelized = TRUE;
panelized_same = (vfs_path_cmp (panelized_panel.root_vpath, panel->cwd_vpath) == 0);
panelized_same = (vfs_path_equal (panelized_panel.root_vpath, panel->cwd_vpath));
for (i = 0; i < panelized_panel.count; i++)
{
@ -510,7 +512,7 @@ panelize_save_panel (struct WPanel *panel)
void
cd_panelize_cmd (void)
{
if (get_display_type (MENU_PANEL_IDX) != view_listing)
if (!SELECTED_IS_PANEL)
set_display_type (MENU_PANEL_IDX, view_listing);
do_panelize_cd ((struct WPanel *) get_panel_widget (MENU_PANEL_IDX));

View File

@ -314,13 +314,13 @@ show_tree (WTree * tree)
if (current->sublevel < tree->selected_ptr->sublevel)
{
if (vfs_path_cmp (current->name, tree->selected_ptr->name) == 0)
if (vfs_path_equal (current->name, tree->selected_ptr->name))
i++;
}
else if (current->sublevel == tree->selected_ptr->sublevel)
{
for (j = strlen (current_name) - 1; current_name[j] != PATH_SEP; j--);
if (vfs_path_ncmp (current->name, tree->selected_ptr->name, j) == 0)
if (vfs_path_equal_len (current->name, tree->selected_ptr->name, j))
i++;
}
else
@ -328,8 +328,8 @@ show_tree (WTree * tree)
if (current->sublevel == tree->selected_ptr->sublevel + 1
&& vfs_path_len (tree->selected_ptr->name) > 1)
{
if (vfs_path_ncmp (current->name, tree->selected_ptr->name,
vfs_path_len (tree->selected_ptr->name)) == 0)
if (vfs_path_equal_len (current->name, tree->selected_ptr->name,
vfs_path_len (tree->selected_ptr->name)))
i++;
}
}
@ -406,8 +406,8 @@ show_tree (WTree * tree)
{
if (current->sublevel < tree->selected_ptr->sublevel)
{
if (vfs_path_ncmp (current->name, tree->selected_ptr->name,
vfs_path_len (current->name)) == 0)
if (vfs_path_equal_len (current->name, tree->selected_ptr->name,
vfs_path_len (current->name)))
break;
}
else if (current->sublevel == tree->selected_ptr->sublevel)
@ -418,14 +418,14 @@ show_tree (WTree * tree)
for (j = strlen (current_name) - 1; current_name[j] != PATH_SEP; j--)
;
g_free (current_name);
if (vfs_path_ncmp (current->name, tree->selected_ptr->name, j) == 0)
if (vfs_path_equal_len (current->name, tree->selected_ptr->name, j))
break;
}
else if (current->sublevel == tree->selected_ptr->sublevel + 1
&& vfs_path_len (tree->selected_ptr->name) > 1)
{
if (vfs_path_ncmp (current->name, tree->selected_ptr->name,
vfs_path_len (tree->selected_ptr->name)) == 0)
if (vfs_path_equal_len (current->name, tree->selected_ptr->name,
vfs_path_len (tree->selected_ptr->name)))
break;
}
current = current->next;
@ -1236,7 +1236,7 @@ tree_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *da
buttonbar_clear_label (b, 7, WIDGET (tree));
#endif
buttonbar_set_label (b, 8, Q_ ("ButtonBar|Rmdir"), tree_map, w);
buttonbar_redraw (b);
widget_redraw (WIDGET (b));
/* FIXME: Should find a better way of only displaying the
currently selected item */

Some files were not shown because too many files have changed in this diff Show More