From 7c79cfe10c317fecf737b22989e75d15d1014654 Mon Sep 17 00:00:00 2001 From: Ilia Maslakov Date: Thu, 5 Mar 2009 09:59:50 +0000 Subject: [PATCH 1/7] Denis Vlasenko posted a patch which would fix issue when no dialog for break operation. Trouble: recently i accidentally entered '.' instead of '..' in the file copy dialog on a relatively big tree ... for every file in the tree i got the and are the same file message box, without any way to escape except killing mc from the outside. Rework warn_same_file for more usage glib. ... msg = g_strdup_printf() ... --- src/file.c | 62 ++++++++++++++++++++---------------------------------- 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/src/file.c b/src/file.c index 9e0e8c2f4..42b8ceee0 100644 --- a/src/file.c +++ b/src/file.c @@ -462,6 +462,22 @@ enum { DEST_FULL /* Created, fully copied */ }; +static int warn_same_file(const char *fmt, const char *a, const char *b) +{ + char *msg; + /* We don't expect %d etc, just %s, so strlen(fmt) should be ok */ + int result = 0; + msg = g_strdup_printf (fmt, a, b); + result = query_dialog (MSG_ERROR, msg, D_ERROR, 2, _("&Skip"), _("&Abort")); + g_free(msg); + do_refresh (); + if ( result ) { /* 1 == Abort */ + return FILE_ABORT; + } else { + return FILE_SKIP; + } +} + int copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path, int ask_overwrite, off_t *progress_count, @@ -516,13 +532,9 @@ copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path, if (dst_exists) { /* Destination already exists */ - if (sb.st_dev == sb2.st_dev && sb.st_ino == sb2.st_ino) { - message (D_ERROR, MSG_ERROR, - _(" `%s' and `%s' are the same file "), src_path, dst_path); - do_refresh (); - return FILE_SKIP; - } - + if (sb.st_dev == sb2.st_dev && sb.st_ino == sb2.st_ino) + return warn_same_file(_(" `%s' and `%s' are the same file "), + src_path, dst_path); /* Should we replace destination? */ if (ask_overwrite) { ctx->do_reget = 0; @@ -1048,22 +1060,8 @@ move_file_file (FileOpContext *ctx, const char *s, const char *d, if (mc_lstat (d, &dst_stats) == 0) { if (src_stats.st_dev == dst_stats.st_dev - && src_stats.st_ino == dst_stats.st_ino) { - int msize = COLS - 36; - char st[MC_MAXPATHLEN]; - char dt[MC_MAXPATHLEN]; - - if (msize < 0) - msize = 40; - msize /= 2; - - strcpy (st, path_trunc (s, msize)); - strcpy (dt, path_trunc (d, msize)); - message (D_ERROR, MSG_ERROR, - _(" `%s' and `%s' are the same file "), st, dt); - do_refresh (); - return FILE_SKIP; - } + && src_stats.st_ino == dst_stats.st_ino) + return warn_same_file(_(" `%s' and `%s' are the same file "), s, d); if (S_ISDIR (dst_stats.st_mode)) { message (D_ERROR, MSG_ERROR, @@ -1171,22 +1169,8 @@ move_dir_dir (FileOpContext *ctx, const char *s, const char *d, } else destdir = concat_dir_and_file (d, x_basename (s)); - if (sbuf.st_dev == dbuf.st_dev && sbuf.st_ino == dbuf.st_ino) { - int msize = COLS - 36; - char st[MC_MAXPATHLEN]; - char dt[MC_MAXPATHLEN]; - - if (msize < 0) - msize = 40; - msize /= 2; - - strcpy (st, path_trunc (s, msize)); - strcpy (dt, path_trunc (d, msize)); - message (D_ERROR, MSG_ERROR, - _(" `%s' and `%s' are the same directory "), st, dt); - do_refresh (); - return FILE_SKIP; - } + if (sbuf.st_dev == dbuf.st_dev && sbuf.st_ino == dbuf.st_ino) + return warn_same_file(_(" `%s' and `%s' are the same directory "), s, d); /* Check if the user inputted an existing dir */ retry_dst_stat: From 43918cc4ba659002a3c62577400477682216cad6 Mon Sep 17 00:00:00 2001 From: Ilia Maslakov Date: Thu, 5 Mar 2009 10:41:41 +0000 Subject: [PATCH 2/7] little fix for show message --- src/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/file.c b/src/file.c index 42b8ceee0..ecdbaec83 100644 --- a/src/file.c +++ b/src/file.c @@ -533,7 +533,7 @@ copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path, if (dst_exists) { /* Destination already exists */ if (sb.st_dev == sb2.st_dev && sb.st_ino == sb2.st_ino) - return warn_same_file(_(" `%s' and `%s' are the same file "), + return warn_same_file(_(" `%s' and\n `%s'\n are the same file "), src_path, dst_path); /* Should we replace destination? */ if (ask_overwrite) { From 1e59c411b5c8bd86ca38efd9c5bcde103b8c02b8 Mon Sep 17 00:00:00 2001 From: Ilia Maslakov Date: Thu, 5 Mar 2009 11:10:03 +0000 Subject: [PATCH 3/7] non-relevant comment removed --- src/file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/file.c b/src/file.c index ecdbaec83..7fe5964ce 100644 --- a/src/file.c +++ b/src/file.c @@ -465,7 +465,6 @@ enum { static int warn_same_file(const char *fmt, const char *a, const char *b) { char *msg; - /* We don't expect %d etc, just %s, so strlen(fmt) should be ok */ int result = 0; msg = g_strdup_printf (fmt, a, b); result = query_dialog (MSG_ERROR, msg, D_ERROR, 2, _("&Skip"), _("&Abort")); From 82242cbbd4f0653d8bee0c1570983f32a5b08779 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 8 Mar 2009 12:38:35 +0300 Subject: [PATCH 4/7] src/file.c: modified error messages fro warn_same_file() function. po/*.po: updated to sync with modified src/file.c file. --- po/az.po | 26 +++++++++++++++++--------- po/be-tarask.po | 26 +++++++++++++++++--------- po/be.po | 26 +++++++++++++++++--------- po/bg.po | 26 +++++++++++++++++--------- po/ca.po | 26 +++++++++++++++++--------- po/cs.po | 26 +++++++++++++++++--------- po/da.po | 26 +++++++++++++++++--------- po/de.po | 26 +++++++++++++++++--------- po/el.po | 22 +++++++++++++++------- po/es.po | 26 +++++++++++++++++--------- po/eu.po | 26 +++++++++++++++++--------- po/fi.po | 26 +++++++++++++++++--------- po/fr.po | 26 +++++++++++++++++--------- po/hu.po | 26 +++++++++++++++++--------- po/it.po | 26 +++++++++++++++++--------- po/ja.po | 26 +++++++++++++++++--------- po/ko.po | 26 +++++++++++++++++--------- po/lt.po | 26 +++++++++++++++++--------- po/lv.po | 26 +++++++++++++++++--------- po/mn.po | 26 +++++++++++++++++--------- po/nl.po | 26 +++++++++++++++++--------- po/no.po | 26 +++++++++++++++++--------- po/pl.po | 26 +++++++++++++++++--------- po/pt.po | 26 +++++++++++++++++--------- po/pt_BR.po | 26 +++++++++++++++++--------- po/ro.po | 26 +++++++++++++++++--------- po/ru.po | 38 +++++++++++++++++++++++++++----------- po/sk.po | 26 +++++++++++++++++--------- po/sl.po | 26 +++++++++++++++++--------- po/sr.po | 26 +++++++++++++++++--------- po/sv.po | 26 +++++++++++++++++--------- po/ta.po | 22 +++++++++++++++------- po/tr.po | 26 +++++++++++++++++--------- po/uk.po | 26 +++++++++++++++++--------- po/vi.po | 26 +++++++++++++++++--------- po/wa.po | 26 +++++++++++++++++--------- po/zh_CN.po | 26 +++++++++++++++++--------- po/zh_TW.po | 26 +++++++++++++++++--------- src/file.c | 9 +++++---- 39 files changed, 657 insertions(+), 344 deletions(-) diff --git a/po/az.po b/po/az.po index de6ebb838..e62dfafcb 100644 --- a/po/az.po +++ b/po/az.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.5.99a\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2001-09-26 16:43GMT +0200\n" "Last-Translator: Vasif İsmayıloğlu MD \n" "Language-Team: Azerbaijani Turkish \n" @@ -1330,6 +1330,9 @@ msgstr "" " \"%s\" Hədəf yumşaq bağa yaradıla bilmir\n" " %s " +msgid "&Abort" +msgstr "Lə&ğv et" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1346,8 +1349,12 @@ msgstr "" " \"%s\" qayanq faylı stat edilə bilmir \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' və `%s' eyni fayldır " #, c-format @@ -1529,8 +1536,12 @@ msgstr "" " \"%s\" faylını silə bilmədim \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' və `%s' eyni qovluqdur " #, c-format @@ -1612,9 +1623,6 @@ msgstr " Bağışlayın. Arxaya əməliyyat ala bilmərəm " msgid "&Retry" msgstr "Təzədən &sına" -msgid "&Abort" -msgstr "Lə&ğv et" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/be-tarask.po b/po/be-tarask.po index 4342cd7bc..1679312ec 100644 --- a/po/be-tarask.po +++ b/po/be-tarask.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.6.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2002-08-25 16:15GMT+2\n" "Last-Translator: Vital Khilko \n" "Language-Team: belarusian \n" @@ -1325,6 +1325,9 @@ msgstr "" " Немагчыма стварыць сымб. спасылку мэты \"%s\" \n" " %s " +msgid "&Abort" +msgstr "&Перарваць" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1341,8 +1344,12 @@ msgstr "" " Немагчыма атрымаць уласьцівасьці зыходнага файлу \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' і `%s' адзін і той жа файл " #, c-format @@ -1524,8 +1531,12 @@ msgstr "" " Немагчыма выдаліць файл \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' і `%s' адзін і той жа каталёг " #, c-format @@ -1607,9 +1618,6 @@ msgstr " Выбачайце, зрабіць гэта ў тле немагчым msgid "&Retry" msgstr "Па&ўтарыць" -msgid "&Abort" -msgstr "&Перарваць" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/be.po b/po/be.po index 74a4a7a6b..399bc2b51 100644 --- a/po/be.po +++ b/po/be.po @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: be\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2008-12-21 23:28+0200\n" "Last-Translator: Pavel Piatruk \n" "Language-Team: Belarusian (Official spelling) \n" @@ -1315,6 +1315,9 @@ msgstr "" " Немагчыма стварыць сімв. спасылку мэты \"%s\" \n" " %s " +msgid "&Abort" +msgstr "&Перарваць" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1331,8 +1334,12 @@ msgstr "" " Немагчыма атрымаць уласцівасці зыходнага файла \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' і `%s' адзін і той жа файл " #, c-format @@ -1514,8 +1521,12 @@ msgstr "" " Немагчыма выдаліць файл \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' і `%s' адзін і той жа каталог " #, c-format @@ -1597,9 +1608,6 @@ msgstr " Выбачайце, зрабіць гэта ў тле немагчым msgid "&Retry" msgstr "Па&ўтарыць" -msgid "&Abort" -msgstr "&Перарваць" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/bg.po b/po/bg.po index 75750e8d5..82c600816 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: 4.5.55\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2002-06-24 02:15+0300\n" "Last-Translator: Todor Buyukliev \n" "Language-Team: Bulgarian \n" @@ -1327,6 +1327,9 @@ msgstr "" " Не може да се създаде връзката назначение \"%s\" \n" " %s " +msgid "&Abort" +msgstr "Отказ" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1343,8 +1346,12 @@ msgstr "" " Не може да се stat-не файлът източник \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' и `%s' са един и същи файл. " #, c-format @@ -1526,8 +1533,12 @@ msgstr "" " Не може да се изтрие файлът \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' и `%s' са една и съща директория " #, c-format @@ -1609,9 +1620,6 @@ msgstr " Съжалявам, не може да се сложи задачата msgid "&Retry" msgstr "Отново" -msgid "&Abort" -msgstr "Отказ" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/ca.po b/po/ca.po index 32eeee9be..d3e6a0739 100644 --- a/po/ca.po +++ b/po/ca.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.5.99a\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2001-09-29 17:41+0200\n" "Last-Translator: Softcatal \n" "Language-Team: Catalan \n" @@ -1333,6 +1333,9 @@ msgstr "" " No puc crear l'enlla simblic objectiu \"%s\" \n" " %s " +msgid "&Abort" +msgstr "a&Vorta" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1349,8 +1352,12 @@ msgstr "" " No puc estudiar el fitxer origen \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' i `%s' sn el mateix fitxer " #, c-format @@ -1532,8 +1539,12 @@ msgstr "" " No puc suprimir el fitxer \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' i `%s' sn el mateix directori " #, c-format @@ -1615,9 +1626,6 @@ msgstr " Ho sento, no he pogut posar la tasca al rerafons " msgid "&Retry" msgstr "&Reintenta" -msgid "&Abort" -msgstr "a&Vorta" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/cs.po b/po/cs.po index 5b318df08..b481c3a37 100644 --- a/po/cs.po +++ b/po/cs.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.5.99a\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2008-06-05 17:36+0100\n" "Last-Translator: Anna Talianova \n" "Language-Team: Czech \n" @@ -1332,6 +1332,9 @@ msgstr "" " Nelze vytvoit clov symlink \"%s\" \n" " %s " +msgid "&Abort" +msgstr "&Zruit" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1348,8 +1351,12 @@ msgstr "" " Na zdrojovm souboru \"%s\" nelze provst stat \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' a `%s' jsou stejn soubor " #, c-format @@ -1531,8 +1538,12 @@ msgstr "" " Nelze smazat soubor \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' a `%s' jsou stejn adrese " #, c-format @@ -1614,9 +1625,6 @@ msgstr " Bohu msgid "&Retry" msgstr "&Zkusit znovu" -msgid "&Abort" -msgstr "&Zruit" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/da.po b/po/da.po index 3fc4a817d..90255ade3 100644 --- a/po/da.po +++ b/po/da.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.5.41\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2001-10-20 21:37+02:00\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -1337,6 +1337,9 @@ msgstr "" " Kan ikke oprette mlsymlnken \"%s\" \n" " %s " +msgid "&Abort" +msgstr "&Afbryd" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1353,8 +1356,12 @@ msgstr "" " Kan ikke kre stat p kildefilen \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' og `%s' er samme fil " #, c-format @@ -1536,8 +1543,12 @@ msgstr "" " Kan ikke fjerne filen \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' og `%s' er den samme mappe " #, c-format @@ -1619,9 +1630,6 @@ msgstr " Beklager, Jeg kunne ikke placere jobbet i baggrunden " msgid "&Retry" msgstr "&Prv igen" -msgid "&Abort" -msgstr "&Afbryd" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/de.po b/po/de.po index c2d2941ef..839db69dc 100644 --- a/po/de.po +++ b/po/de.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.6.x\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2009-01-25 17:50-0000\n" "Last-Translator: Patrick Winnertz \n" "Language-Team: German \n" @@ -1322,6 +1322,9 @@ msgstr "" " Kann Ziel des symbolischen Links \"%s\" nicht anlegen \n" " %s " +msgid "&Abort" +msgstr "&Abbrechen" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1338,8 +1341,12 @@ msgstr "" " Kann Quelldatei \"%s\" nicht untersuchen \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' und `%s' sind die gleichen Dateien " #, c-format @@ -1521,8 +1528,12 @@ msgstr "" " Kann Datei \"%s\" nicht lschen \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' und `%s' sind das gleiche Verzeichnis " #, c-format @@ -1604,9 +1615,6 @@ msgstr " Ich kann den Job nicht im Hintergrund bearbeiten " msgid "&Retry" msgstr "wiede&Rholen" -msgid "&Abort" -msgstr "&Abbrechen" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/el.po b/po/el.po index 1c58b4593..98287572d 100644 --- a/po/el.po +++ b/po/el.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.5.38\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 1997-07-23 00:04-0400\n" "Last-Translator: Spiros Papadimitriou \n" "Language-Team: Greek \n" @@ -1288,6 +1288,9 @@ msgid "" " %s " msgstr "" +msgid "&Abort" +msgstr "" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1301,7 +1304,11 @@ msgid "" msgstr "" #, c-format -msgid " `%s' and `%s' are the same file " +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr "" #, c-format @@ -1444,7 +1451,11 @@ msgid "" msgstr "" #, c-format -msgid " `%s' and `%s' are the same directory " +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr "" #, c-format @@ -1520,9 +1531,6 @@ msgstr "" msgid "&Retry" msgstr "" -msgid "&Abort" -msgstr "" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/es.po b/po/es.po index 4384a4cc2..3e2e0dd0d 100644 --- a/po/es.po +++ b/po/es.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: 4.6.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2008-06-15 19:00+0100\n" "Last-Translator: David Martín \n" @@ -1316,6 +1316,9 @@ msgstr "" " Imposible crear el enlace simbólico destino \"%s\" \n" " %s " +msgid "&Abort" +msgstr "&Abortar" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1332,8 +1335,12 @@ msgstr "" " Imposible identificar el archivo origen \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " \"%s\" y \"%s\" son el mismo archivo " #, c-format @@ -1515,8 +1522,12 @@ msgstr "" " Imposible borrar el archivo \"%s\" \n" " %s" -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " \"%s\" y \"%s\" son el mismo directorio " #, c-format @@ -1598,9 +1609,6 @@ msgstr " Lo siento, no pude poner la tarea en 2º plano " msgid "&Retry" msgstr "&Reintentar" -msgid "&Abort" -msgstr "&Abortar" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/eu.po b/po/eu.po index a67f79d4e..7c5524809 100644 --- a/po/eu.po +++ b/po/eu.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.5.99\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2001-05-25 13:35+0200\n" "Last-Translator: mari susperregi \n" "Language-Team: Euskara\n" @@ -1336,6 +1336,9 @@ msgstr "" "Ezin da \"%s\" helburu-esteka sinbolikorik sortu\n" " %s " +msgid "&Abort" +msgstr "&Abortatu" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1352,8 +1355,12 @@ msgstr "" "Ezin da \"%s\" iturburu-fitxategia identifikatu\n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr "`%s' eta `%s' fitxategi bera dira " #, c-format @@ -1535,8 +1542,12 @@ msgstr "" "Ezin da \"%s\" fitxategia kendu\n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr "`%s' eta `%s' direktorio bera dira " #, c-format @@ -1618,9 +1629,6 @@ msgstr "Ezin izan dut lana atzeko planoan ipini " msgid "&Retry" msgstr "&Saiatu berriz" -msgid "&Abort" -msgstr "&Abortatu" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/fi.po b/po/fi.po index 8428b99f1..159852318 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: gmc finnish 0.01\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 1999-08-23 17:30+0200\n" "Last-Translator: Mikko Rauhala \n" "Language-Team: Finnish \n" @@ -1333,6 +1333,9 @@ msgstr "" " Ei voitu luoda symbolista linkki \"%s\" \n" " %s " +msgid "&Abort" +msgstr "" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1349,9 +1352,13 @@ msgstr "" " Ei saada tietoja lhdetiedostosta \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " -msgstr "" +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " +msgstr " '%s' ja '%s' ovat sama tiedosto. " #, c-format msgid "" @@ -1497,7 +1504,11 @@ msgid "" msgstr "" #, fuzzy, c-format -msgid " `%s' and `%s' are the same directory " +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " '%s' ja '%s' ovat sama tiedosto. " #, c-format @@ -1573,9 +1584,6 @@ msgstr "" msgid "&Retry" msgstr "" -msgid "&Abort" -msgstr "" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/fr.po b/po/fr.po index 66ee78bf2..b1c61dba3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.5.99a\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2002-04-30 16:46+0200\n" "Last-Translator: Christophe Merlet (RedFox) \n" "Language-Team: GNOME French Team \n" @@ -1335,6 +1335,9 @@ msgstr "" " Ne peut crer le lien symbolique cible %s \n" " %s " +msgid "&Abort" +msgstr "&Interrompre" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1351,8 +1354,12 @@ msgstr "" " Ne peut analyser le fichier source %s \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " %s et %s sont le mme fichier " #, c-format @@ -1532,8 +1539,12 @@ msgstr "" " Ne peut supprimer le fichier %s \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " %s et %s sont dans le mme rpertoire " #, c-format @@ -1615,9 +1626,6 @@ msgstr " D msgid "&Retry" msgstr "&R-essayer" -msgid "&Abort" -msgstr "&Interrompre" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/hu.po b/po/hu.po index 40c9a318d..e417bea4e 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2005-07-22 00:47+0200\n" "Last-Translator: Arpad Biro \n" "Language-Team: Hungarian\n" @@ -1363,6 +1363,9 @@ msgstr "" " (\"%s\"). \n" " %s " +msgid "&Abort" +msgstr "&Megszakts" + # 2. %s: hibazenet #, c-format msgid "" @@ -1381,8 +1384,12 @@ msgstr "" " forrsfjl adatait. \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr "" " \"%s\" s \n" " \"%s\" ugyanaz a fjl " @@ -1578,8 +1585,12 @@ msgstr "" " Nem sikerlt letrlni a(z) \"%s\" fjlt. \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr "" " \"%s\" s \n" " \"%s\" ugyanaz a knyvtr " @@ -1676,9 +1687,6 @@ msgstr " Nem lehet a m msgid "&Retry" msgstr "j&ra" -msgid "&Abort" -msgstr "&Megszakts" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/it.po b/po/it.po index c3c7ed2a7..3620f8edf 100644 --- a/po/it.po +++ b/po/it.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: 4.6.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2008-04-07 17:25+0200\n" "Last-Translator: Marco Ciampa \n" "Language-Team: Italian ,\n" @@ -1322,6 +1322,9 @@ msgstr "" " Impossibile creare il coll. simbolico di destinazione \"%s\" \n" " %s " +msgid "&Abort" +msgstr "&Esci" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1338,8 +1341,12 @@ msgstr "" " Non trovo le informazioni sul file \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' e `%s' sono lo stesso file " #, c-format @@ -1521,8 +1528,12 @@ msgstr "" " Non posso rimuovere il file `%s' \n" " %s" -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' e `%s' sono lo stesso file " #, c-format @@ -1606,9 +1617,6 @@ msgstr " Spiacente, non posso mettere il programma in background " msgid "&Retry" msgstr "&Riprova" -msgid "&Abort" -msgstr "&Esci" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/ja.po b/po/ja.po index 404b336a4..a663096ba 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: mc CVS-20011220\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2001-12-20 18:33+0900\n" "Last-Translator: Akira TAGOH \n" "Language-Team: Japanese \n" @@ -1331,6 +1331,9 @@ msgstr "" " åȤΥܥå \"%s\" Ǥޤ \n" " %s " +msgid "&Abort" +msgstr "(&A)" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1347,8 +1350,12 @@ msgstr "" " ե \"%s\" stat Ǥޤ\n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' `%s' ƱեǤ " #, c-format @@ -1530,8 +1537,12 @@ msgstr "" " ե \"%s\" Ǥޤ\n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' `%s' Ʊǥ쥯ȥǤ" #, c-format @@ -1613,9 +1624,6 @@ msgstr " msgid "&Retry" msgstr "ƻ(&R)" -msgid "&Abort" -msgstr "(&A)" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/ko.po b/po/ko.po index 95da022cb..f8edadfa8 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.6.0-pre3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2003-01-22 17:31+0900\n" "Last-Translator: Nam SungHyun \n" "Language-Team: Korean \n" @@ -1319,6 +1319,9 @@ msgstr "" " ɺũ \"%s\"() ϴ \n" " %s " +msgid "&Abort" +msgstr "ߴ(&A)" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1335,8 +1338,12 @@ msgstr "" " \"%s\" ϴ \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' `%s'() Դϴ " #, c-format @@ -1518,8 +1525,12 @@ msgstr "" " \"%s\" ϴ \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' `%s'() 丮Դϴ " #, c-format @@ -1601,9 +1612,6 @@ msgstr " msgid "&Retry" msgstr "õ(&R)" -msgid "&Abort" -msgstr "ߴ(&A)" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/lt.po b/po/lt.po index 00ebd39f8..4d3761a62 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.6.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2009-02-16 19:45+0300\n" "Last-Translator: Andrius Štikonas \n" "Language-Team: Lithuanian \n" @@ -1313,6 +1313,9 @@ msgstr "" " Nepavyko pakeisti „%s“ režimo \n" " %s " +msgid "&Abort" +msgstr "Nutr&aukti" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1329,8 +1332,12 @@ msgstr "" " Nepavyko nustatyti failo „%s“ būklės („stat“) \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " „%s“ ir „%s“ yra tas pats failas " #, c-format @@ -1512,8 +1519,12 @@ msgstr "" " Nepavyko pašalinti failo „%s“ \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " „%s“ ir „%s“ yra tas pats aplankas " #, c-format @@ -1597,9 +1608,6 @@ msgstr " Nepavyko nukelti darbo į foną " msgid "&Retry" msgstr "&Iš naujo" -msgid "&Abort" -msgstr "Nutr&aukti" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/lv.po b/po/lv.po index f979c51ea..ebd72058d 100644 --- a/po/lv.po +++ b/po/lv.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: mc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2001-11-20 15:15+0200\n" "Last-Translator: Artis Trops \n" "Language-Team: Latvian \n" @@ -1332,6 +1332,9 @@ msgstr "" " Nevar izveidot mra simbolsaiti \"%s\" \n" " %s " +msgid "&Abort" +msgstr "&Atsaukt" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1348,8 +1351,12 @@ msgstr "" " Nevar sknt avota failu \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' un `%s' ir tas pats fails " #, c-format @@ -1531,8 +1538,12 @@ msgstr "" " Nevar izdzst failu \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' un `%s' ir tas pats direktorijs " #, c-format @@ -1614,9 +1625,6 @@ msgstr " Atvaino, bet nevar msgid "&Retry" msgstr "&Vlreiz" -msgid "&Abort" -msgstr "&Atsaukt" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/mn.po b/po/mn.po index f34f7c716..3dd154ef2 100644 --- a/po/mn.po +++ b/po/mn.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: mn\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2003-03-04 21:16+0100\n" "Last-Translator: Sanlig Badral \n" "Language-Team: Mongolian \n" @@ -1328,6 +1328,9 @@ msgstr "" " Заагдсан тэмдэгт холбоосийг үүсгэж чадсангүй \"%s\" \n" " %s " +msgid "&Abort" +msgstr "&Таслах" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1344,8 +1347,12 @@ msgstr "" " Эх файлыг байрлуулж чадсангүй \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' ба `%s' ууд нь адил файл байна " #, c-format @@ -1527,8 +1534,12 @@ msgstr "" " \"%s\" файлыг устгаж чадсангүй \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " %s ба %s - нь адил лавлахууд байна " #, c-format @@ -1611,9 +1622,6 @@ msgstr " Уучлаарай, арын фонд ажилыг оруулж чад msgid "&Retry" msgstr "&Дахих" -msgid "&Abort" -msgstr "&Таслах" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/nl.po b/po/nl.po index b905d8495..20d069d11 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.6.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2009-02-13\n" "Last-Translator: Marcel Pol \n" "Language-Team: \n" @@ -1317,6 +1317,9 @@ msgstr "" " Maken van doel van symbolische link \"%s\" mislukt \n" " %s " +msgid "&Abort" +msgstr "&Afbreken" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1333,8 +1336,12 @@ msgstr "" " Bronbestand \"%s\" kan niet genspecteerd worden \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' en `%s' zijn het zelfde bestand " #, c-format @@ -1516,8 +1523,12 @@ msgstr "" " Verwijderen van bestand \"%s\" mislukt \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' en `%s' zijn dezelfde map " #, c-format @@ -1599,9 +1610,6 @@ msgstr " De job kon niet in de achtergrond geplaatst worden " msgid "&Retry" msgstr "Nogmaals" -msgid "&Abort" -msgstr "&Afbreken" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/no.po b/po/no.po index 7b4e5e419..4991e33ce 100644 --- a/po/no.po +++ b/po/no.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.5.54\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2002-10-22 14:28+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -1326,6 +1326,9 @@ msgstr "" " Kan ikke lage mllenken \"%s\" \n" " %s " +msgid "&Abort" +msgstr "&Avbryt" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1342,8 +1345,12 @@ msgstr "" " Kan ikke kjre stat p kildefilen \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' og `%s' er samme fil " #, c-format @@ -1525,8 +1532,12 @@ msgstr "" " Kan ikke fjerne filen \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' og `%s' er samme katalog " #, c-format @@ -1608,9 +1619,6 @@ msgstr " Beklager, Jeg kunne ikke plassere jobben i bakgrunnen " msgid "&Retry" msgstr "&Prv igjen" -msgid "&Abort" -msgstr "&Avbryt" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/pl.po b/po/pl.po index 0bb403232..0a8f0bc62 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: mc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2003-02-04 02:57+0100\n" "Last-Translator: Andrzej Zaborowski \n" "Language-Team: Polish\n" @@ -1320,6 +1320,9 @@ msgstr "" " Nie mona utworzy dowizania symbolicznego \"%s\" \n" " %s " +msgid "&Abort" +msgstr "&Rezygnuj" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1336,8 +1339,12 @@ msgstr "" " Nie mona wykona operacji stat na pliku rdowym \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " '%s' oraz '%s' to ten sam plik " #, c-format @@ -1519,8 +1526,12 @@ msgstr "" " Nie mona usun pliku \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " '%s' oraz '%s' to ten sam katalog " #, c-format @@ -1602,9 +1613,6 @@ msgstr " Niestety nie mo msgid "&Retry" msgstr "Ponw" -msgid "&Abort" -msgstr "&Rezygnuj" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/pt.po b/po/pt.po index fd256141f..e079de51f 100644 --- a/po/pt.po +++ b/po/pt.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2002-04-25 03:55+0000\n" "Last-Translator: Duarte Loreto \n" "Language-Team: Portuguese \n" @@ -1331,6 +1331,9 @@ msgstr "" " Incapaz de criar alvo de atalho \"%s\" \n" " %s " +msgid "&Abort" +msgstr "&Abortar" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1347,8 +1350,12 @@ msgstr "" " Incapaz de opter informao do ficheiro origem \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' e `%s' so o mesmo ficheiro " #, c-format @@ -1530,8 +1537,12 @@ msgstr "" " Incapaz de remover ficheiro \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' e `%s' so o mesmo directrio " #, c-format @@ -1613,9 +1624,6 @@ msgstr " Incapaz de colocar o processo em exedcu msgid "&Retry" msgstr "&Repetir" -msgid "&Abort" -msgstr "&Abortar" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/pt_BR.po b/po/pt_BR.po index ba21ce488..9bcf40d78 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: mc-4.5.36\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2000-10-27 15:37-03:00\n" "Last-Translator: E. A. Taco \n" "Language-Team: pt_BR \n" @@ -1350,6 +1350,9 @@ msgstr "" " Impossvel criar ligao simblica \"%s\" \n" " %s " +msgid "&Abort" +msgstr "C&Ancelar" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1366,8 +1369,12 @@ msgstr "" " No possvel testar arquivo de origem \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " '%s' e '%s' so o mesmo arquivo" #, c-format @@ -1549,8 +1556,12 @@ msgstr "" " Impossvel apagar arquivo \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " '%s' e '%s' so o mesmo diretrio" #, c-format @@ -1632,9 +1643,6 @@ msgstr "Desculpe, mas n msgid "&Retry" msgstr "&Tentar Novamente" -msgid "&Abort" -msgstr "C&Ancelar" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/ro.po b/po/ro.po index 29f742594..afbdc0e3a 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.6\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2003-01-31 00:11+0200\n" "Last-Translator: Miu Moldovan \n" "Language-Team: Romanian \n" @@ -1324,6 +1324,9 @@ msgstr "" " Nu pot crea legtura simbolic int \"%s\" \n" " %s " +msgid "&Abort" +msgstr "&ntrerup" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1340,8 +1343,12 @@ msgstr "" " Nu pot executa stat pe fiierul surs \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' i `%s' sunt acelai fiier " #, c-format @@ -1523,8 +1530,12 @@ msgstr "" " Nu pot terge fiierul \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' i `%s' sunt acelai director " #, c-format @@ -1606,9 +1617,6 @@ msgstr " Scuze, nu am putut trimite opera msgid "&Retry" msgstr "&Rencerc" -msgid "&Abort" -msgstr "&ntrerup" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/ru.po b/po/ru.po index 86c8c8ea6..c2a48d27c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2005-09-09 14:37+0300\n" "Last-Translator: Anton S. Chumak \n" "Language-Team: Russian ru@li.org\n" @@ -1324,6 +1324,9 @@ msgstr "" " . \"%s\" \n" " %s " +msgid "&Abort" +msgstr "&" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1341,8 +1344,16 @@ msgstr "" " %s " #, c-format -msgid " `%s' and `%s' are the same file " -msgstr " `%s' `%s' " +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " +msgstr "" +" `%s' \n" +" \n" +" `%s' \n" +" file " #, c-format msgid "" @@ -1524,8 +1535,16 @@ msgstr "" " %s " #, c-format -msgid " `%s' and `%s' are the same directory " -msgstr " %s %s - " +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " +msgstr "" +" `%s' \n" +" \n" +" `%s' \n" +" " #, c-format msgid " Cannot overwrite directory \"%s\" %s " @@ -1607,9 +1626,6 @@ msgstr " msgid "&Retry" msgstr "&" -msgid "&Abort" -msgstr "&" - msgid "" "\n" " Directory not empty. \n" @@ -1913,10 +1929,10 @@ msgstr " msgid " Hotlist Load " msgstr " " -#, fuzzy, c-format +#, c-format msgid "" "MC was unable to write ~/%s file, your old hotlist entries were not deleted" -msgstr " file, " +msgstr "MC ~/%s, " #, c-format msgid "Midnight Commander %s" diff --git a/po/sk.po b/po/sk.po index 2f4b1a9b4..a192efe15 100644 --- a/po/sk.po +++ b/po/sk.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: mc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2003-01-22 21:50+0100\n" "Last-Translator: Marcel Telka \n" "Language-Team: Slovak \n" @@ -1323,6 +1323,9 @@ msgstr "" " Nemôžem vytvoriť cieľový symbolický odkaz \"%s\" \n" " %s " +msgid "&Abort" +msgstr "p&Rerušiť" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1339,8 +1342,12 @@ msgstr "" " Nemôžem určiť zdrojový súbor \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' a `%s' sú rovnaké súbory " #, c-format @@ -1522,8 +1529,12 @@ msgstr "" " Nemôžem odstrániť súbor \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' a `%s' sú ten istý adresár " #, c-format @@ -1605,9 +1616,6 @@ msgstr " Ľutujem, ale nemohol som uložiť úlohu do pozadia " msgid "&Retry" msgstr "&Zopakovať" -msgid "&Abort" -msgstr "p&Rerušiť" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/sl.po b/po/sl.po index 2bb9f77a8..79413e0a1 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: mc \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2000-06-22 00:00+0200\n" "Last-Translator: Andraz Tori \n" "Language-Team: Slovenian \n" @@ -1324,6 +1324,9 @@ msgstr "" " Ne morem ustvariti cilja simbolične povezeave \"%s\" \n" " %s " +msgid "&Abort" +msgstr "&Prekini" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1340,8 +1343,12 @@ msgstr "" " Ne morem poizvedeti o stanju izvorne datoteke \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " datoteki `%s' in `%s' sta isti " #, c-format @@ -1523,8 +1530,12 @@ msgstr "" " Ne morem odstraniti datoteke \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " imenika `%s' and `%s' sta ista" #, c-format @@ -1606,9 +1617,6 @@ msgstr " Oprostite, posla nisem mogel postaviti v ozadje" msgid "&Retry" msgstr "Poskusi &znova" -msgid "&Abort" -msgstr "&Prekini" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/sr.po b/po/sr.po index 572f4e553..81e4a753f 100644 --- a/po/sr.po +++ b/po/sr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.6.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2003-09-20 18:50+0200\n" "Last-Translator: Strahinya Radich ( ) \n" @@ -1324,6 +1324,9 @@ msgstr "" " `%s' \n" " %s " +msgid "&Abort" +msgstr "&" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1340,8 +1343,12 @@ msgstr "" " `stat' `%s' \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' `%s' " #, c-format @@ -1523,8 +1530,12 @@ msgstr "" " `%s' \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' `%s' " #, c-format @@ -1606,9 +1617,6 @@ msgstr " msgid "&Retry" msgstr "& " -msgid "&Abort" -msgstr "&" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/sv.po b/po/sv.po index ffd68ddb4..c0aab746a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: mc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2003-01-22 18:10+0100\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" @@ -1346,6 +1346,9 @@ msgstr "" " Kan inte skapa symbolisk lnk \"%s\" \n" " %s " +msgid "&Abort" +msgstr "&Avbryt" + # bttre n 'mlsymlnk'? #, c-format msgid "" @@ -1363,8 +1366,12 @@ msgstr "" " Kan inte inhmta status om fil \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " \"%s\" och \"%s\" r samma fil " #, c-format @@ -1547,8 +1554,12 @@ msgstr "" " Kan inte radera fil \"%s\" \n" " %s" -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " \"%s\" och \"%s\" r samma katalog " #, c-format @@ -1630,9 +1641,6 @@ msgstr " Tyv msgid "&Retry" msgstr "frsk &Igen" -msgid "&Abort" -msgstr "&Avbryt" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/ta.po b/po/ta.po index ab8c756ae..5ef0d6651 100644 --- a/po/ta.po +++ b/po/ta.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: mc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2000-10-26 11:00 CST\n" "Last-Translator: Dinesh Nadarajah \n" "Language-Team: Tamil\n" @@ -1292,6 +1292,9 @@ msgid "" " %s " msgstr "" +msgid "&Abort" +msgstr "" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1305,7 +1308,11 @@ msgid "" msgstr "" #, c-format -msgid " `%s' and `%s' are the same file " +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr "" #, c-format @@ -1448,7 +1455,11 @@ msgid "" msgstr "" #, c-format -msgid " `%s' and `%s' are the same directory " +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr "" #, c-format @@ -1524,9 +1535,6 @@ msgstr "" msgid "&Retry" msgstr "" -msgid "&Abort" -msgstr "" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/tr.po b/po/tr.po index f49ee743e..56dba9329 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.5.54\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2001-11-06 05:50+0200\n" "Last-Translator: Nilgn Belma Bugner \n" "Language-Team: Turkish \n" @@ -1330,6 +1330,9 @@ msgstr "" " Hedef sembolik ba \"%s\" oluturulamyor \n" " %s" +msgid "&Abort" +msgstr "&ptal" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1346,8 +1349,12 @@ msgstr "" " \"%s\" kaynak dosyas durumlanamyor \n" " %s" -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' ve `%s' ayn dosyadr " #, c-format @@ -1529,8 +1536,12 @@ msgstr "" " \"%s\" dosyas silinemiyor \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' ve `%s' ayn dizin " #, c-format @@ -1612,9 +1623,6 @@ msgstr " msgid "&Retry" msgstr "&Tekrar" -msgid "&Abort" -msgstr "&ptal" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/uk.po b/po/uk.po index 1b9ac10e7..91f608555 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: uk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2005-09-10 13:28+0300\n" "Last-Translator: Anton Sergeevich Chumak \n" "Language-Team: \n" @@ -1313,6 +1313,9 @@ msgstr "" " æ \"%s\" \n" " %s " +msgid "&Abort" +msgstr "&" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1329,8 +1332,12 @@ msgstr "" " Ԧ Ȧ \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " \"%s\" \"%s\" " #, c-format @@ -1512,8 +1519,12 @@ msgstr "" " \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " \"%s\" \"%s\" " #, c-format @@ -1595,9 +1606,6 @@ msgstr " msgid "&Retry" msgstr "&" -msgid "&Abort" -msgstr "&" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/vi.po b/po/vi.po index 850ad6660..248da7357 100644 --- a/po/vi.po +++ b/po/vi.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.6.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2006-08-16 16:20+0400\n" "Last-Translator: Phan Vĩnh Thịnh \n" "Language-Team: Vietnamese \n" @@ -1317,6 +1317,9 @@ msgstr "" " Khônt tạo được liên kết mềm đích \"%s\" \n" " %s " +msgid "&Abort" +msgstr "&Dừng" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1333,8 +1336,12 @@ msgstr "" " Không lấy được tính chất (stat) của tập tin nguồn \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' và `%s' là một tập tin " #, c-format @@ -1516,8 +1523,12 @@ msgstr "" " Không thể xóa tập tin \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " %s và %s - là một thư mục " #, c-format @@ -1600,9 +1611,6 @@ msgstr " Xin lỗi, không thể đặt công việc nào vào chế độ nền msgid "&Retry" msgstr "&Thử lại" -msgid "&Abort" -msgstr "&Dừng" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/wa.po b/po/wa.po index f890917ae..475819eee 100644 --- a/po/wa.po +++ b/po/wa.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.5.99a\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 1999-03-18 23:11+0100\n" "Last-Translator: Lorint Hendschel \n" "Language-Team: walon \n" @@ -1347,6 +1347,9 @@ msgstr "" " Dji n' sai f li loyn simbolike sme %s \n" " %s " +msgid "&Abort" +msgstr "Ri&nonc" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1364,8 +1367,12 @@ msgstr "" " Dji n' sai f on stat sol fitch sordant %s \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " %s eyet %s sont li minme fitch " #, c-format @@ -1548,8 +1555,12 @@ msgstr "" " Dji n' sai waester li fitch %s \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " %s eyet %s sont li minme ridant " #, c-format @@ -1631,9 +1642,6 @@ msgstr " Dji rgrete, dji n' sai mete ci bezogne la e fond " msgid "&Retry" msgstr "&Rissay" -msgid "&Abort" -msgstr "Ri&nonc" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 5b0c099db..156773d27 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: mc\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2002-01-29 22:05+0800\n" "Last-Translator: Wang Jian \n" "Language-Team: zh_CN \n" @@ -1322,6 +1322,9 @@ msgstr "" " 无法创建目标符号链接“%s” \n" " %s " +msgid "&Abort" +msgstr "中止(&A)" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1338,8 +1341,12 @@ msgstr "" " 无法 stat 源文件“%s” \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " “%s”和“%s”是同一个文件 " #, c-format @@ -1521,8 +1528,12 @@ msgstr "" " 无法删除文件“%s” \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " “%s”和“%s”是同一个目录 " #, c-format @@ -1604,9 +1615,6 @@ msgstr " 抱歉，无法将任务放到后台 " msgid "&Retry" msgstr "重试(&R)" -msgid "&Abort" -msgstr "中止(&A)" - msgid "" "\n" " Directory not empty. \n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 25775814e..d95ecbfb6 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.5.54a\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" +"POT-Creation-Date: 2009-03-08 12:19+0300\n" "PO-Revision-Date: 2001-07-27 03:02+0800\n" "Last-Translator: Jing-Jong Shyue \n" "Language-Team: Chinese \n" @@ -1328,6 +1328,9 @@ msgstr "" " LkإߥؼвŸs \"%s\" \n" " %s " +msgid "&Abort" +msgstr "_" + #, c-format msgid "" " Cannot overwrite directory \"%s\" \n" @@ -1344,8 +1347,12 @@ msgstr "" " Lk stat ӷɮ \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same file " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same file " msgstr " `%s' P `%s' OP@ɮ " #, c-format @@ -1527,8 +1534,12 @@ msgstr "" " Lkɮ \"%s\" \n" " %s " -#, c-format -msgid " `%s' and `%s' are the same directory " +#, fuzzy, c-format +msgid "" +" `%s' \n" +" and \n" +" `%s' \n" +" are the same directory " msgstr " `%s' P `%s' OP@ɮ " #, c-format @@ -1610,9 +1621,6 @@ msgstr " msgid "&Retry" msgstr "" -msgid "&Abort" -msgstr "_" - msgid "" "\n" " Directory not empty. \n" diff --git a/src/file.c b/src/file.c index 7fe5964ce..d5a855462 100644 --- a/src/file.c +++ b/src/file.c @@ -462,7 +462,8 @@ enum { DEST_FULL /* Created, fully copied */ }; -static int warn_same_file(const char *fmt, const char *a, const char *b) +static FileProgressStatus +warn_same_file (const char *fmt, const char *a, const char *b) { char *msg; int result = 0; @@ -532,7 +533,7 @@ copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path, if (dst_exists) { /* Destination already exists */ if (sb.st_dev == sb2.st_dev && sb.st_ino == sb2.st_ino) - return warn_same_file(_(" `%s' and\n `%s'\n are the same file "), + return warn_same_file (_(" `%s' \n and \n `%s' \n are the same file "), src_path, dst_path); /* Should we replace destination? */ if (ask_overwrite) { @@ -1060,7 +1061,7 @@ move_file_file (FileOpContext *ctx, const char *s, const char *d, if (mc_lstat (d, &dst_stats) == 0) { if (src_stats.st_dev == dst_stats.st_dev && src_stats.st_ino == dst_stats.st_ino) - return warn_same_file(_(" `%s' and `%s' are the same file "), s, d); + return warn_same_file (_(" `%s' \n and \n `%s' \n are the same file "), s, d); if (S_ISDIR (dst_stats.st_mode)) { message (D_ERROR, MSG_ERROR, @@ -1169,7 +1170,7 @@ move_dir_dir (FileOpContext *ctx, const char *s, const char *d, destdir = concat_dir_and_file (d, x_basename (s)); if (sbuf.st_dev == dbuf.st_dev && sbuf.st_ino == dbuf.st_ino) - return warn_same_file(_(" `%s' and `%s' are the same directory "), s, d); + return warn_same_file (_(" `%s' \n and \n `%s' \n are the same directory "), s, d); /* Check if the user inputted an existing dir */ retry_dst_stat: From 5d50f64a2b2b010ff1adfaaeafa56fab96db4ecb Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 8 Mar 2009 12:49:28 +0300 Subject: [PATCH 5/7] fileopctx.h: set definitely values for FileProgressStatus enum type. file.c file.h: fixed types for file/dir operation functions. --- src/file.c | 95 ++++++++++++++++++++++++------------------------- src/file.h | 22 ++++++------ src/fileopctx.h | 8 ++--- 3 files changed, 61 insertions(+), 64 deletions(-) diff --git a/src/file.c b/src/file.c index d5a855462..359d8b82d 100644 --- a/src/file.c +++ b/src/file.c @@ -125,16 +125,16 @@ const char *op_names[3] = { /* }}} */ -static int query_replace (FileOpContext * ctx, const char *destname, - struct stat *_s_stat, struct stat *_d_stat); -static int query_recursive (FileOpContext * ctx, const char *s); -static int do_file_error (const char *str); -static int erase_dir_iff_empty (FileOpContext *ctx, const char *s); -static int erase_file (FileOpContext *ctx, const char *s, - off_t *progress_count, double *progress_bytes, - int is_toplevel_file); -static int files_error (const char *format, const char *file1, - const char *file2); +static FileProgressStatus query_replace (FileOpContext * ctx, const char *destname, + struct stat *_s_stat, struct stat *_d_stat); +static FileProgressStatus query_recursive (FileOpContext * ctx, const char *s); +static FileProgressStatus do_file_error (const char *str); +static FileProgressStatus erase_dir_iff_empty (FileOpContext *ctx, const char *s); +static FileProgressStatus erase_file (FileOpContext *ctx, const char *s, + off_t *progress_count, double *progress_bytes, + int is_toplevel_file); +static FileProgressStatus files_error (const char *format, const char *file1, + const char *file2); enum CaseConvs { NO_CONV = 0, UP_CHAR = 1, LOW_CHAR = 2, UP_SECT = @@ -157,7 +157,7 @@ convert_case (char c, enum CaseConvs *conversion) return c; } -static int transform_error = 0; +static FileProgressStatus transform_error = FILE_CONT; static const char * do_transform_source (FileOpContext *ctx, const char *source) @@ -345,12 +345,12 @@ check_hardlinks (const char *src_name, const char *dst_name, struct stat *pstat) * If dst_path is an existing symlink it will be deleted silently * (upper levels take already care of existing files at dst_path). */ -static int +static FileProgressStatus make_symlink (FileOpContext *ctx, const char *src_path, const char *dst_path) { char link_target[MC_MAXPATHLEN]; int len; - int return_status; + FileProgressStatus return_status; struct stat sb; int dst_is_symlink; @@ -478,7 +478,7 @@ warn_same_file (const char *fmt, const char *a, const char *b) } } -int +FileProgressStatus copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path, int ask_overwrite, off_t *progress_count, double *progress_bytes, int is_toplevel_file) @@ -495,7 +495,7 @@ copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path, struct utimbuf utb; int dst_exists = 0, appending = 0; off_t n_read_total = 0, file_size = -1; - int return_status, temp_status; + FileProgressStatus return_status, temp_status; struct timeval tv_transfer_start; int dst_status = DEST_NONE; /* 1 if the file is not fully copied */ @@ -552,12 +552,8 @@ copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path, return FILE_CONT; } - if (S_ISLNK (sb.st_mode)) { - int retval; - - retval = make_symlink (ctx, src_path, dst_path); - return retval; - } + if (S_ISLNK (sb.st_mode)) + return make_symlink (ctx, src_path, dst_path); if (S_ISCHR (sb.st_mode) || S_ISBLK (sb.st_mode) || S_ISFIFO (sb.st_mode) || S_ISNAM (sb.st_mode) || @@ -837,7 +833,7 @@ copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path, */ /* FIXME: This function needs to check the return values of the function calls */ -int +FileProgressStatus copy_dir_dir (FileOpContext *ctx, const char *s, const char *d, int toplevel, int move_over, int delete, struct link *parent_dirs, off_t *progress_count, double *progress_bytes) @@ -846,7 +842,7 @@ copy_dir_dir (FileOpContext *ctx, const char *s, const char *d, int toplevel, struct stat buf, cbuf; DIR *reading; char *path, *mdpath, *dest_file, *dest_dir; - int return_status = FILE_CONT; + FileProgressStatus return_status = FILE_CONT; struct utimbuf utb; struct link *lp; @@ -1036,12 +1032,12 @@ copy_dir_dir (FileOpContext *ctx, const char *s, const char *d, int toplevel, /* {{{ Move routines */ -static int +static FileProgressStatus move_file_file (FileOpContext *ctx, const char *s, const char *d, off_t *progress_count, double *progress_bytes) { struct stat src_stats, dst_stats; - int return_status = FILE_CONT; + FileProgressStatus return_status = FILE_CONT; gboolean copy_done = FALSE; if (file_progress_show_source (ctx, s) == FILE_ABORT @@ -1144,14 +1140,14 @@ move_file_file (FileOpContext *ctx, const char *s, const char *d, return return_status; } -int +FileProgressStatus move_dir_dir (FileOpContext *ctx, const char *s, const char *d, off_t *progress_count, double *progress_bytes) { struct stat sbuf, dbuf, destbuf; struct link *lp; char *destdir; - int return_status; + FileProgressStatus return_status; int move_over = 0; if (file_progress_show_source (ctx, s) == FILE_ABORT || @@ -1257,7 +1253,7 @@ move_dir_dir (FileOpContext *ctx, const char *s, const char *d, /* {{{ Erase routines */ /* Don't update progress status if progress_count==NULL */ -static int +static FileProgressStatus erase_file (FileOpContext *ctx, const char *s, off_t *progress_count, double *progress_bytes, int is_toplevel_file) { @@ -1287,7 +1283,7 @@ erase_file (FileOpContext *ctx, const char *s, off_t *progress_count, return FILE_CONT; } -static int +static FileProgressStatus recursive_erase (FileOpContext *ctx, const char *s, off_t *progress_count, double *progress_bytes) { @@ -1295,15 +1291,15 @@ recursive_erase (FileOpContext *ctx, const char *s, off_t *progress_count, struct stat buf; DIR *reading; char *path; - int return_status = FILE_CONT; + FileProgressStatus return_status = FILE_CONT; if (!strcmp (s, "..")) - return 1; + return FILE_RETRY; reading = mc_opendir (s); if (!reading) - return 1; + return FILE_RETRY; while ((next = mc_readdir (reading)) && return_status == FILE_CONT) { if (!strcmp (next->d_name, ".")) @@ -1314,13 +1310,13 @@ recursive_erase (FileOpContext *ctx, const char *s, off_t *progress_count, if (mc_lstat (path, &buf)) { g_free (path); mc_closedir (reading); - return 1; + return FILE_RETRY; } if (S_ISDIR (buf.st_mode)) return_status = (recursive_erase (ctx, path, progress_count, progress_bytes) - != FILE_CONT); + != FILE_CONT) ? FILE_RETRY : FILE_CONT; else return_status = erase_file (ctx, path, progress_count, progress_bytes, 0); @@ -1369,11 +1365,11 @@ check_dir_is_empty (const char *path) return i; } -int +FileProgressStatus erase_dir (FileOpContext *ctx, const char *s, off_t *progress_count, double *progress_bytes) { - int error; + FileProgressStatus error; if (strcmp (s, "..") == 0) return FILE_SKIP; @@ -1412,10 +1408,10 @@ erase_dir (FileOpContext *ctx, const char *s, off_t *progress_count, return FILE_CONT; } -static int +static FileProgressStatus erase_dir_iff_empty (FileOpContext *ctx, const char *s) { - int error; + FileProgressStatus error; if (strcmp (s, "..") == 0) return FILE_SKIP; @@ -1723,7 +1719,8 @@ panel_operate (void *source_panel, FileOperation operation, int single_entry = (get_current_type () == view_tree) || (panel->marked <= 1) || force_single; struct stat src_stat, dst_stat; - int i, value; + int i; + FileProgressStatus value; FileOpContext *ctx; off_t count = 0; @@ -2076,7 +2073,7 @@ panel_operate (void *source_panel, FileOperation operation, /* {{{ Query/status report routines */ -static int +static FileProgressStatus real_do_file_error (enum OperationMode mode, const char *error) { int result; @@ -2103,7 +2100,7 @@ real_do_file_error (enum OperationMode mode, const char *error) } /* Report error with one file */ -int +FileProgressStatus file_error (const char *format, const char *file) { g_snprintf (cmd_buf, sizeof (cmd_buf), format, @@ -2113,7 +2110,7 @@ file_error (const char *format, const char *file) } /* Report error with two files */ -static int +static FileProgressStatus files_error (const char *format, const char *file1, const char *file2) { char nfile1[16]; @@ -2128,7 +2125,7 @@ files_error (const char *format, const char *file1, const char *file2) return do_file_error (cmd_buf); } -static int +static FileProgressStatus real_query_recursive (FileOpContext *ctx, enum OperationMode mode, const char *s) { gchar *text; @@ -2172,7 +2169,7 @@ real_query_recursive (FileOpContext *ctx, enum OperationMode mode, const char *s } #ifdef WITH_BACKGROUND -static int +static FileProgressStatus do_file_error (const char *str) { if (we_are_background) @@ -2182,7 +2179,7 @@ do_file_error (const char *str) return real_do_file_error (Foreground, str); } -static int +static FileProgressStatus query_recursive (FileOpContext *ctx, const char *s) { if (we_are_background) @@ -2191,7 +2188,7 @@ query_recursive (FileOpContext *ctx, const char *s) return real_query_recursive (ctx, Foreground, s); } -static int +static FileProgressStatus query_replace (FileOpContext *ctx, const char *destname, struct stat *_s_stat, struct stat *_d_stat) { @@ -2208,19 +2205,19 @@ query_replace (FileOpContext *ctx, const char *destname, struct stat *_s_stat, } #else -static int +static FileProgressStatus do_file_error (const char *str) { return real_do_file_error (Foreground, str); } -static int +static FileProgressStatus query_recursive (FileOpContext *ctx, const char *s) { return real_query_recursive (ctx, Foreground, s); } -static int +static FileProgressStatus query_replace (FileOpContext *ctx, const char *destname, struct stat *_s_stat, struct stat *_d_stat) { diff --git a/src/file.h b/src/file.h index 97c38cf1e..d95eeeff1 100644 --- a/src/file.h +++ b/src/file.h @@ -5,16 +5,16 @@ struct link; -int copy_file_file (FileOpContext *ctx, const char *s, const char *d, - int ask_overwrite, off_t *progress_count, - double *progress_bytes, int is_toplevel_file); -int move_dir_dir (FileOpContext *ctx, const char *s, const char *d, - off_t *progress_count, double *progress_bytes); -int copy_dir_dir (FileOpContext *ctx, const char *s, const char *d, int toplevel, - int move_over, int delete, struct link *parent_dirs, - off_t *progress_count, double *progress_bytes); -int erase_dir (FileOpContext *ctx, const char *s, off_t *progress_count, - double *progress_bytes); +FileProgressStatus copy_file_file (FileOpContext *ctx, const char *s, const char *d, + int ask_overwrite, off_t *progress_count, + double *progress_bytes, int is_toplevel_file); +FileProgressStatus move_dir_dir (FileOpContext *ctx, const char *s, const char *d, + off_t *progress_count, double *progress_bytes); +FileProgressStatus copy_dir_dir (FileOpContext *ctx, const char *s, const char *d, int toplevel, + int move_over, int delete, struct link *parent_dirs, + off_t *progress_count, double *progress_bytes); +FileProgressStatus erase_dir (FileOpContext *ctx, const char *s, off_t *progress_count, + double *progress_bytes); int panel_operate (void *source_panel, FileOperation op, int force_single); @@ -23,7 +23,7 @@ extern int file_op_compute_totals; /* Error reporting routines */ /* Report error with one file */ -int file_error (const char *format, const char *file); +FileProgressStatus file_error (const char *format, const char *file); /* Query routines */ diff --git a/src/fileopctx.h b/src/fileopctx.h index d2de6a99c..d12acbb3c 100644 --- a/src/fileopctx.h +++ b/src/fileopctx.h @@ -118,10 +118,10 @@ void file_op_context_destroy (FileOpContext *ctx); extern const char *op_names [3]; typedef enum { - FILE_CONT, - FILE_RETRY, - FILE_SKIP, - FILE_ABORT + FILE_CONT = 0, + FILE_RETRY = 1, + FILE_SKIP = 2, + FILE_ABORT = 3 } FileProgressStatus; typedef enum { From bf8ac0594e36c85a023fbde6bbd5ee5c98bb6b94 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 8 Mar 2009 13:22:10 +0300 Subject: [PATCH 6/7] src/file.c: move_dir_dir(): * changed type of move_over variable from int to gboolean; * fixed memory leak: destdir is not free'd when the same directory is copied; * don't use the non-valid dbuf variable if mc_stat(d, &dbuf) returns non-zero. --- src/file.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/file.c b/src/file.c index 359d8b82d..0cadad84d 100644 --- a/src/file.c +++ b/src/file.c @@ -1148,7 +1148,8 @@ move_dir_dir (FileOpContext *ctx, const char *s, const char *d, struct link *lp; char *destdir; FileProgressStatus return_status; - int move_over = 0; + gboolean move_over = FALSE; + gboolean dstat_ok; if (file_progress_show_source (ctx, s) == FILE_ABORT || file_progress_show_target (ctx, d) == FILE_ABORT) @@ -1157,17 +1158,19 @@ move_dir_dir (FileOpContext *ctx, const char *s, const char *d, mc_refresh (); mc_stat (s, &sbuf); - if (mc_stat (d, &dbuf)) + dstat_ok = (mc_stat (d, &dbuf) == 0); + + if (dstat_ok && sbuf.st_dev == dbuf.st_dev && sbuf.st_ino == dbuf.st_ino) + return warn_same_file (_(" `%s' \n and \n `%s' \n are the same directory "), s, d); + + if (!dstat_ok) destdir = g_strdup (d); /* destination doesn't exist */ else if (!ctx->dive_into_subdirs) { destdir = g_strdup (d); - move_over = 1; + move_over = TRUE; } else destdir = concat_dir_and_file (d, x_basename (s)); - if (sbuf.st_dev == dbuf.st_dev && sbuf.st_ino == dbuf.st_ino) - return warn_same_file (_(" `%s' \n and \n `%s' \n are the same directory "), s, d); - /* Check if the user inputted an existing dir */ retry_dst_stat: if (!mc_stat (destdir, &destbuf)) { From b6d767d2776e8d251a6c776daa950fec7798e08b Mon Sep 17 00:00:00 2001 From: Ilia Maslakov Date: Sat, 14 Mar 2009 18:45:45 +0000 Subject: [PATCH 7/7] complete conflict sk.po --- po/sk.po | 751 ++++++++++++++++++++++++------------------------------- 1 file changed, 332 insertions(+), 419 deletions(-) diff --git a/po/sk.po b/po/sk.po index a192efe15..01d8405f7 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2,56 +2,56 @@ # Miroslav Baranko , 1999. # Stanislav Visnovsky , 2001,2002. # Marcel Telka , 2002, 2003. +# Ivan Masár , 2009. # msgid "" msgstr "" "Project-Id-Version: mc\n" -"Report-Msgid-Bugs-To: mc-devel@gnome.org\n" -"POT-Creation-Date: 2009-03-08 12:19+0300\n" -"PO-Revision-Date: 2003-01-22 21:50+0100\n" -"Last-Translator: Marcel Telka \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-03-02 22:22+0300\n" +"PO-Revision-Date: 2009-03-10 19:42+0100\n" +"Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n" -#, fuzzy msgid " Choose syntax highlighting " -msgstr "zvýraznenie s&Yntaxe" +msgstr " Vyberte zvýraznenie syntaxe" -#, fuzzy msgid "< Auto >" -msgstr " O aplikácii " +msgstr "< Auto >" msgid "< Reload Current Syntax >" -msgstr "" +msgstr "< Znovu načítať aktuálnu syntax >" -#, fuzzy, c-format +#, c-format msgid " Cannot open %s for reading " -msgstr " Neúspešný pokus o otvorenie rúry pre čítanie: " +msgstr " Nepodarilo sa otvoriť %s na čítanie " msgid "Error" msgstr "Chyba" -#, fuzzy, c-format +#, c-format msgid " Error reading from pipe: %s " -msgstr " Chyba pri čítaní z rúry: " +msgstr " Chyba pri čítaní z rúry: %s " -#, fuzzy, c-format +#, c-format msgid " Cannot open pipe for reading: %s " -msgstr " Neúspešný pokus o otvorenie rúry pre čítanie: " +msgstr " Nepodarilo sa otvoriť rúru na čítanie: %s " -#, fuzzy, c-format +#, c-format msgid " Cannot get size/permissions for %s " -msgstr " Nemôžem získať info súbor o veľkosti/právach: " +msgstr " Nepodarilo sa zistiť veľkosti/práva %s " -#, fuzzy, c-format +#, c-format msgid " %s is not a regular file " -msgstr " Nemôžem nahliadnuť: toto nie je normálny súbor " +msgstr " %s nie je normálny súbor " -#, fuzzy, c-format +#, c-format msgid " File %s is too large " -msgstr " Súbor je príliš veľký: " +msgstr " Súbor %s je príliš veľký" msgid "Macro recursion is too deep" msgstr "Rekurzia makra je príliš hlboká" @@ -60,7 +60,7 @@ msgid "Warning" msgstr "Varovanie" msgid " File has hard-links. Detach before saving? " -msgstr "" +msgstr " Súbor má pevné odkazy. Odpojiť pred uložením? " msgid "&Yes" msgstr "Án&o" @@ -72,7 +72,7 @@ msgid "&Cancel" msgstr "&Zrušiť" msgid "The file has been modified in the meantime. Save anyway?" -msgstr "" +msgstr "Súbor bol medzitým zmenený. Uložiť napriek tomu?" msgid " Error writing to pipe: " msgstr " Chyba počas zápisu do rúry: " @@ -96,20 +96,19 @@ msgid "Extension:" msgstr "Prípona:" msgid " Edit Save Mode " -msgstr " Upraviť mód ukladania " +msgstr " Upraviť režim ukladania " msgid " Save As " msgstr " Uložiť ako " msgid " Enter file name: " -msgstr " Zadajte meno súbpru: " +msgstr " Zadajte meno súboru: " msgid " A file already exists with this name. " msgstr " Súbor s daným meno už existuje. " -#, fuzzy msgid "&Overwrite" -msgstr "Prepísať" +msgstr "&Prepísať" msgid " Cannot save file. " msgstr " Chyba počas ukladania súboru. " @@ -133,13 +132,13 @@ msgid " Save macro " msgstr " Uložiť makro " msgid " Press the macro's new hotkey: " -msgstr " Stlačte nové makro hotkey: " +msgstr " Stlačte nový kláves pre makro: " msgid " Press macro hotkey: " msgstr " Stlačte kláves pre makro: " msgid " Load macro " -msgstr " Nahrať makro " +msgstr " Načítať makro " msgid " Confirm save file? : " msgstr " Potvrdiť uloženie súboru? : " @@ -157,9 +156,8 @@ msgstr "" " Aktuálny text bol modifikovaný bez uloženia súboru. \n" " Pokračovať zrušením týchto zmien. " -#, fuzzy msgid "C&ontinue" -msgstr "Pokračovať" +msgstr "P&okračovať" msgid " Load " msgstr " Nahrať " @@ -221,16 +219,14 @@ msgstr " Nahradiť " msgid "Search" msgstr "Hľadať" -msgid "" -" Invalid regular expression, or scanf expression with too many conversions " +msgid " Invalid regular expression, or scanf expression with too many conversions " msgstr " Nesprávny výraz, alebo scanf výraz s mnohými zmenami " msgid " Error in replacement format string. " msgstr " Chyba vo formáte nahradzovaného reťazca. " -#, fuzzy msgid " Replacement too long. " -msgstr " Zadajte reťazec pre nahradenie:" +msgstr " Reťazec pre nahradenie je príliš dlhý." #, c-format msgid " %ld replacements made. " @@ -249,28 +245,26 @@ msgstr "Skončiť" msgid " File was modified, Save with exit? " msgstr " Súbor bol zmenený, uložiť a skončiť? " -#, fuzzy msgid "&Cancel quit" -msgstr "Zrušiť ukončenie" +msgstr "&Zrušiť ukončenie" -#, fuzzy msgid " Error " -msgstr "Chyba" +msgstr " Chyba" msgid " This function is not implemented. " -msgstr "" +msgstr " Táto funkcia nie je implementovaná. " msgid " Copy to clipboard " msgstr " Kopírovať do schránky " msgid " Unable to save to file. " -msgstr " Nemôžem uložiť do súboru. " +msgstr " Nepodarilo sa uložiť do súboru. " msgid " Cut to clipboard " -msgstr " Vystrihnuť do schránky " +msgstr " Vystrihnúť do schránky " msgid " Goto line " -msgstr " Choď na riadok " +msgstr " Prejsť na riadok " msgid " Enter line: " msgstr " Zadajte riadok: " @@ -294,8 +288,7 @@ msgid " Run Sort " msgstr " Spustiť triedenie " msgid " Enter sort options (see manpage) separated by whitespace: " -msgstr "" -" Zadajte voľby pre triedenie oddelené prázdnym miestom (pozri man stránku): " +msgstr " Zadajte voľby pre triedenie oddelené prázdnym miestom (pozri man stránku): " msgid " Sort " msgstr " Triediť " @@ -307,34 +300,31 @@ msgid " Sort returned non-zero: " msgstr " Triedenie vrátilo nenulovú hodnotu: " msgid "Paste output of external command" -msgstr "" +msgstr "Vložiť výstup externého príkazu" -#, fuzzy msgid "Enter shell command(s):" -msgstr " Zadajte návestie pre príkaz: " +msgstr "Zadajte príkaz shellu:" -#, fuzzy msgid "External command" -msgstr "Další príkaz" +msgstr "Externý príkaz" -#, fuzzy msgid "Cannot execute command" -msgstr " Chyba počas pokusu vykonať príkaz pre triedenie " +msgstr "Nie je možné vykonať príkaz" msgid "Error creating script:" -msgstr "Chyba pri vytvárení skriptu:" +msgstr "Chyba pri vytváraní skriptu:" msgid "Error reading script:" msgstr "Chyba pri čítaní skriptu:" msgid "Error closing script:" -msgstr "Chyba pri zatvárení skriptu:" +msgstr "Chyba pri zatváraní skriptu:" msgid "Script created:" msgstr "Vytvorený skript:" msgid "Process block" -msgstr "Spracovávam blok " +msgstr "Spracovať blok " msgid " Mail " msgstr " Pošta " @@ -355,7 +345,7 @@ msgid " Insert Literal " msgstr " Vložiť znak " msgid " Press any key: " -msgstr " Stlačte nejakú klávesu: " +msgstr " Stlačte ľubovoľný kláves: " msgid " Execute Macro " msgstr " Spustiť makro " @@ -372,15 +362,18 @@ msgid "" "User: %s\n" "Process ID: %d" msgstr "" +"Na súbore \"%s\" už prebiehajú úpravy\n" +"Používateľ: %s\n" +"ID procesu: %d" msgid "File locked" -msgstr "" +msgstr "Súbor zamknutý" msgid "&Grab lock" -msgstr "" +msgstr "&Získať zámok" msgid "&Ignore lock" -msgstr "" +msgstr "&Ignorovať zámok" msgid " About " msgstr " O aplikácii " @@ -399,7 +392,7 @@ msgstr "" "\n" " Copyright (C) 1996 the Free Software Foundation\n" "\n" -" Používateľský prístupný textový editor napísaný\n" +" Používateľsky prívetivý textový editor napísaný\n" " pre Midnight Commander.\n" msgid "&Open file..." @@ -508,10 +501,10 @@ msgid "Sor&t... M-t" msgstr "&Usporiadať... M-t" msgid "Paste o&utput of... M-u" -msgstr "" +msgstr "Vložiť výst&up... M-u" msgid "E&xternal Formatter F19" -msgstr "Externý &Formátor F19" +msgstr "Externý &Formátovač F19" msgid "&Mail... " msgstr "&Pošta... " @@ -520,25 +513,22 @@ msgid "&Execute macro... C-x e, KEY" msgstr "&Vykonať makro... C-x e, KEY" msgid "'ispell' s&pell check M-$" -msgstr "'isp&ell' jazyková kontrola M-$" +msgstr "kontrola pravopisu 'isp&ell' M-$" msgid "&General... " -msgstr "&Všeobecne... " +msgstr "&Všeobecné... " msgid "&Save mode..." -msgstr "&Ukladací mód..." +msgstr "Režim &Ukladania..." -#, fuzzy msgid "Learn &Keys..." -msgstr "uč&Enie kláves..." +msgstr "Uč&Enie kláves..." -#, fuzzy msgid "Syntax &Highlighting..." -msgstr "zvýraznenie s&Yntaxe" +msgstr "Zvýraznenie s&Yntaxe..." -#, fuzzy msgid "Save setu&p..." -msgstr "&Uložiť nastavenie" +msgstr "&Uložiť nastavenie..." msgid " File " msgstr " Súbor " @@ -561,9 +551,8 @@ msgstr "Intuitívne" msgid "Emacs" msgstr "Emacs" -#, fuzzy msgid "User-defined" -msgstr "d&Efinovaný používateľom:" +msgstr "d&Efinovaný používateľom" msgid "None" msgstr "Žiaden" @@ -572,13 +561,13 @@ msgid "Dynamic paragraphing" msgstr "Dynamické rob. odstavcov" msgid "Type writer wrap" -msgstr "Napíšte autora zarovnania" +msgstr "Zalamovanie písacieho stroja" msgid "Word wrap line length: " -msgstr "Zarov. textu podľa dĺžky riadku: " +msgstr "Zalamovanie od dĺžky riadka: " msgid "Tab spacing: " -msgstr "Tabelovať vzdialenosť: " +msgstr "Rozostupy tabulátora: " msgid "Synta&x highlighting" msgstr "zvýraznenie s&Yntaxe" @@ -602,7 +591,7 @@ msgid "&Fake half tabs" msgstr "&Spraviť polovičný tabulátor" msgid "Wrap mode" -msgstr "Zarovnávací mód" +msgstr "Zalamovanie riadkov" msgid "Key emulation" msgstr "Emulácia kľúča" @@ -642,7 +631,7 @@ msgid "" " Cannot open file %s \n" " %s " msgstr "" -" Nemôžem otvoriť súbor %s \n" +" Nemôžno otvoriť súbor %s \n" " %s " #, c-format @@ -651,51 +640,51 @@ msgstr " Chyba v súbore %s na riadku %d " #, c-format msgid "bind: Wrong argument number, bind " -msgstr "" +msgstr "bind: Nesprávne číslo argumentu, bind " #, c-format msgid "bind: Bad key value `%s'" -msgstr "" +msgstr "bind: Zlá hodnota klávesu `%s'" #, c-format msgid "bind: Ehh...no key?" -msgstr "" +msgstr "bind: Hmm... žiaden kláves?" #, c-format msgid "bind: Unknown key: `%s'" -msgstr "" +msgstr "bind: neznámy kláves: `%s'" -#, fuzzy, c-format +#, c-format msgid "bind: Unknown command: `%s'" -msgstr " Príkaz zmeny vlastníka " +msgstr "bind: neznámy príkaz: `%s'" #, c-format msgid "%s: Syntax: %s