From 090dce1cee5e7a7efb9703dba9149217dd1117e0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 00:56:26 -0600 Subject: [PATCH] Rename a number of libraries and executables to avoid conflicts with KDE4 --- ChangeLog | 2 +- acinclude.m4 | 8 +- plugin/smb4k_konqplugin.cpp | 4 +- po/de.po | 94 +++++++++---------- po/es.po | 94 +++++++++---------- po/it.po | 94 +++++++++---------- po/ja.po | 94 +++++++++---------- po/sv.po | 94 +++++++++---------- po/uk.po | 94 +++++++++---------- smb4k.kdevses | 4 +- smb4k/configdlg/Makefile.am | 10 +- ...nfigdialog.cpp => smb4tdeconfigdialog.cpp} | 10 +- ...4kconfigdialog.h => smb4tdeconfigdialog.h} | 4 +- smb4k/configdlg/smb4tdersyncoptions.cpp | 2 +- smb4k/core/Makefile.am | 6 +- smb4k/core/smb4kcore.h | 2 +- smb4k/core/smb4kglobal.cpp | 2 +- smb4k/core/smb4kglobal.h | 2 +- smb4k/core/smb4kglobal_p.h | 2 +- smb4k/core/smb4khomesshareshandler.h | 2 +- smb4k/core/smb4kprint.cpp | 2 +- smb4k/core/smb4ksambaoptionshandler.h | 2 +- smb4k/core/smb4ksettings.cpp | 2 +- .../{smb4kfileio.cpp => smb4tdefileio.cpp} | 6 +- smb4k/core/{smb4kfileio.h => smb4tdefileio.h} | 2 +- smb4k/dialogs/smb4kbookmarkeditor.cpp | 2 +- smb4k/iconview/smb4ksharesiconview.cpp | 2 +- smb4k/listview/smb4kshareslistview.cpp | 2 +- smb4k/main.cpp | 2 +- smb4k/smb4k.cpp | 4 +- smb4k/smb4ksystemtray.cpp | 4 +- 31 files changed, 327 insertions(+), 327 deletions(-) rename smb4k/configdlg/{smb4kconfigdialog.cpp => smb4tdeconfigdialog.cpp} (99%) rename smb4k/configdlg/{smb4kconfigdialog.h => smb4tdeconfigdialog.h} (98%) rename smb4k/core/{smb4kfileio.cpp => smb4tdefileio.cpp} (99%) rename smb4k/core/{smb4kfileio.h => smb4tdefileio.h} (99%) diff --git a/ChangeLog b/ChangeLog index 46e36ba..8077ace 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,7 +59,7 @@ Smb4K 0.9.0: compatibility with older versions of Smb4K. - Replaced the old configuration dialog with a new one based on TDEConfigDialog to take advantange of the TDEConfig XT infrastructure. It is a KDE module - library: libsmb4kconfigdialog. + library: libsmb4tdeconfigdialog. - Added some configuration options: + The '-S ' (signing state) and '-P' (use machine account) arguments of smbclient are now supported. diff --git a/acinclude.m4 b/acinclude.m4 index 60985a2..d58e432 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi if test -n "$trinity2ornewer"; then - KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) + KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi if test -n "$trinity3ornewer"; then @@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then @@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2104,7 +2104,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/plugin/smb4k_konqplugin.cpp b/plugin/smb4k_konqplugin.cpp index 6c4a6f5..d1a5dd5 100644 --- a/plugin/smb4k_konqplugin.cpp +++ b/plugin/smb4k_konqplugin.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include // plugin specific includes // #include "smb4k_konqplugin.moc" @@ -184,7 +184,7 @@ void KonqSidebar_Smb4K::slotSearch() void KonqSidebar_Smb4K::slotSmb4KOptionsDlg() { // Load the factory of the config dialog: - KLibFactory *config_factory = KLibLoader::self()->factory( "libsmb4kconfigdialog" ); + KLibFactory *config_factory = KLibLoader::self()->factory( "libsmb4tdeconfigdialog" ); if ( config_factory ) { diff --git a/po/de.po b/po/de.po index 7995434..55d06f2 100644 --- a/po/de.po +++ b/po/de.po @@ -500,18 +500,18 @@ msgstr "Benutze nmblookup (empfohlen)" msgid "Use smbclient" msgstr "Benutze smbclient" -#: smb4k/configdlg/smb4kconfigdialog.cpp:162 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:162 msgid "User Interface" msgstr "Benutzerschnittstelle" -#: smb4k/configdlg/smb4kconfigdialog.cpp:163 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:163 #: smb4k/browser/smb4knetworkbrowser.cpp:50 #: smb4k/browser/smb4knetworkbrowser_part.cpp:186 #: smb4k/browser/smb4knetworkbrowser_part.cpp:319 msgid "Network" msgstr "Netzwerk" -#: smb4k/configdlg/smb4kconfigdialog.cpp:164 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:164 #: smb4k/listview/smb4kshareslistview_part.cpp:144 #: smb4k/listview/smb4kshareslistview_part.cpp:346 #: smb4k/iconview/smb4ksharesiconview_part.cpp:141 @@ -519,28 +519,28 @@ msgstr "Netzwerk" msgid "Shares" msgstr "Freigaben" -#: smb4k/configdlg/smb4kconfigdialog.cpp:165 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:165 #: smb4k/configdlg/smb4ksambaoptions.cpp:89 #: smb4k/core/smb4kpasswordhandler.cpp:237 msgid "Authentication" msgstr "Authentifizierung" -#: smb4k/configdlg/smb4kconfigdialog.cpp:166 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:166 msgid "Samba" msgstr "Samba" -#: smb4k/configdlg/smb4kconfigdialog.cpp:167 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:167 #: smb4k/dialogs/smb4ksynchronizationdialog.cpp:47 msgid "Synchronization" msgstr "Synchronisation" -#: smb4k/configdlg/smb4kconfigdialog.cpp:168 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:168 msgid "Super User" msgstr "Administrator" -#: smb4k/configdlg/smb4kconfigdialog.cpp:327 -#: smb4k/configdlg/smb4kconfigdialog.cpp:328 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1039 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:327 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:328 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1039 #: smb4k/configdlg/smb4ksambaoptions.cpp:400 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:180 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:253 @@ -549,25 +549,25 @@ msgstr "Administrator" msgid "auto" msgstr "automatisch" -#: smb4k/configdlg/smb4kconfigdialog.cpp:331 -#: smb4k/configdlg/smb4kconfigdialog.cpp:352 -#: smb4k/configdlg/smb4kconfigdialog.cpp:441 -#: smb4k/configdlg/smb4kconfigdialog.cpp:451 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1098 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:331 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:352 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:441 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:451 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1098 #: smb4k/configdlg/smb4ksambaoptions.cpp:428 msgid "yes" msgstr "ja" -#: smb4k/configdlg/smb4kconfigdialog.cpp:332 -#: smb4k/configdlg/smb4kconfigdialog.cpp:353 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1099 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:332 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:353 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1099 #: smb4k/configdlg/smb4ksambaoptions.cpp:427 msgid "no" msgstr "nein" -#: smb4k/configdlg/smb4kconfigdialog.cpp:360 -#: smb4k/configdlg/smb4kconfigdialog.cpp:458 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1060 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:360 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:458 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1060 #: smb4k/configdlg/smb4ksambaoptions.cpp:215 #: smb4k/configdlg/smb4ksambaoptions.cpp:418 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:289 @@ -578,8 +578,8 @@ msgstr "nein" msgid "read-write" msgstr "beschreibbar" -#: smb4k/configdlg/smb4kconfigdialog.cpp:361 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1061 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:361 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1061 #: smb4k/configdlg/smb4ksambaoptions.cpp:216 #: smb4k/configdlg/smb4ksambaoptions.cpp:419 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:290 @@ -588,56 +588,56 @@ msgstr "beschreibbar" msgid "read-only" msgstr "schreibgeschützt" -#: smb4k/configdlg/smb4kconfigdialog.cpp:460 -#: smb4k/configdlg/smb4kconfigdialog.cpp:465 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1072 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1082 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:460 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:465 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1072 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1082 #: smb4k/configdlg/smb4ksambaoptions.cpp:141 #: smb4k/configdlg/smb4ksambaoptions.cpp:167 msgid "default" msgstr "Standard" -#: smb4k/configdlg/smb4kconfigdialog.cpp:707 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:707 msgid "[Network] The custom master browser has not been entered.\n" msgstr "" "[Netzwerk] Der benutzerdefinierte Masterbrowser ist nicht eingetragen " "worden.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:722 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:722 msgid "[Network] The broadcast areas have not been entered.\n" msgstr "[Netzwerk] Die Broadcastbereiche sind nicht eingetragen worden.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:733 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:733 msgid "[Shares] The mount prefix is empty.\n" msgstr "[Freigaben] Das Basisverzeichnis zum Einhängen der Freigaben ist leer.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:748 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:748 msgid "[Authentication] The default user name has not been entered.\n" msgstr "" "[Authentifizierung] Der standardmäßige Benutzername wurde nicht " "eingetragen.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:759 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:759 msgid "[Samba] The file mask is empty.\n" msgstr "[Samba] Die Dateimaske ist leer.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:770 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:770 msgid "[Samba] The directory mask is empty.\n" msgstr "[Samba] Die Verzeichnismaske ist leer.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:781 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:781 msgid "[Samba] The UID is empty.\n" msgstr "[Samba] Die Benutzerkennung (UID) ist leer.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:792 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:792 msgid "[Samba] The GID is empty.\n" msgstr "[Samba] Die Gruppenkennung (GID) ist leer.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:803 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:803 msgid "[Synchronization] The rsync prefix is empty.\n" msgstr "[Synchronisation] Das Basisverzeichnis für rsync ist leer.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:816 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:816 msgid "" "[Synchronization] The directory where partially transferred files should be " "stored is empty.\n" @@ -645,33 +645,33 @@ msgstr "" "[Synchronisation] Das Verzeichnis, in dem teilweise übertragene Dateien " "abgelegt werden sollen, ist leer.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:829 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:829 msgid "[Synchronization] The exclude patterns have not been entered.\n" msgstr "[Synchronisation] Die Ausschlussmuster wurden nicht eingetragen.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:842 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:842 msgid "[Synchronization] The path of the exclude file is empty.\n" msgstr "[Synchronisation] Der Pfad der Ausschlussdatei ist leer.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:855 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:855 msgid "[Synchronization] The include patterns have not been entered.\n" msgstr "[Synchronisation] Die Einschlussmuster wurden nicht eingetragen.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:868 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:868 msgid "[Synchronization] The path of the include file is empty.\n" msgstr "[Synchronisation] Der Pfad zur Einschlussdatei ist leer.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:887 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:887 msgid "[Synchronization] The backup suffix has not been defined.\n" msgstr "" "[Synchronisation] Das Suffix für die Sicherheitskopien wurde nicht " "angegeben.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:900 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:900 msgid "[Synchronization] The backup directory is empty.\n" msgstr "[Synchronisation] Das Verzeichnis für die Sicherheitskopien ist leer.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:908 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:908 msgid "" "The configuration could not be written, because one setting is incomplete:\n" "%1Please correct this issue." @@ -680,7 +680,7 @@ msgstr "" "vollständig ist:\n" "%1Bitte korrigieren Sie dieses Problem." -#: smb4k/configdlg/smb4kconfigdialog.cpp:912 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:912 msgid "" "The configuration could not be written, because %1 settings are incomplete:\n" "%1Please correct these issues." @@ -689,7 +689,7 @@ msgstr "" "vollständig sind:\n" "%1Bitte korrigieren Sie diese Probleme." -#: smb4k/configdlg/smb4kconfigdialog.cpp:1191 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1191 msgid "Smb4TDEConfigDialog" msgstr "Smb4TDEConfigDialog" @@ -1364,7 +1364,7 @@ msgstr "" "Freigaben zuzugreifen.\n" "Wollen Sie fortfahren?" -#: smb4k/core/smb4kfileio.cpp:923 smb4k/core/smb4kfileio.cpp:1057 +#: smb4k/core/smb4tdefileio.cpp:923 smb4k/core/smb4tdefileio.cpp:1057 msgid "Buffer size exceeded" msgstr "Puffergröße überschritten" diff --git a/po/es.po b/po/es.po index 25a1533..718228f 100644 --- a/po/es.po +++ b/po/es.po @@ -504,18 +504,18 @@ msgstr "Utilizar nmblookup (recomendado)" msgid "Use smbclient" msgstr "Utilizar smbclient" -#: smb4k/configdlg/smb4kconfigdialog.cpp:162 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:162 msgid "User Interface" msgstr "Interfaz de usuario" -#: smb4k/configdlg/smb4kconfigdialog.cpp:163 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:163 #: smb4k/browser/smb4knetworkbrowser.cpp:50 #: smb4k/browser/smb4knetworkbrowser_part.cpp:186 #: smb4k/browser/smb4knetworkbrowser_part.cpp:319 msgid "Network" msgstr "Red" -#: smb4k/configdlg/smb4kconfigdialog.cpp:164 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:164 #: smb4k/listview/smb4kshareslistview_part.cpp:144 #: smb4k/listview/smb4kshareslistview_part.cpp:346 #: smb4k/iconview/smb4ksharesiconview_part.cpp:141 @@ -523,28 +523,28 @@ msgstr "Red" msgid "Shares" msgstr "Recursos compartidos" -#: smb4k/configdlg/smb4kconfigdialog.cpp:165 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:165 #: smb4k/configdlg/smb4ksambaoptions.cpp:89 #: smb4k/core/smb4kpasswordhandler.cpp:237 msgid "Authentication" msgstr "Autenticación" -#: smb4k/configdlg/smb4kconfigdialog.cpp:166 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:166 msgid "Samba" msgstr "Samba" -#: smb4k/configdlg/smb4kconfigdialog.cpp:167 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:167 #: smb4k/dialogs/smb4ksynchronizationdialog.cpp:47 msgid "Synchronization" msgstr "Sincronización" -#: smb4k/configdlg/smb4kconfigdialog.cpp:168 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:168 msgid "Super User" msgstr "Superusuario" -#: smb4k/configdlg/smb4kconfigdialog.cpp:327 -#: smb4k/configdlg/smb4kconfigdialog.cpp:328 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1039 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:327 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:328 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1039 #: smb4k/configdlg/smb4ksambaoptions.cpp:400 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:180 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:253 @@ -553,25 +553,25 @@ msgstr "Superusuario" msgid "auto" msgstr "automático" -#: smb4k/configdlg/smb4kconfigdialog.cpp:331 -#: smb4k/configdlg/smb4kconfigdialog.cpp:352 -#: smb4k/configdlg/smb4kconfigdialog.cpp:441 -#: smb4k/configdlg/smb4kconfigdialog.cpp:451 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1098 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:331 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:352 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:441 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:451 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1098 #: smb4k/configdlg/smb4ksambaoptions.cpp:428 msgid "yes" msgstr "si" -#: smb4k/configdlg/smb4kconfigdialog.cpp:332 -#: smb4k/configdlg/smb4kconfigdialog.cpp:353 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1099 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:332 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:353 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1099 #: smb4k/configdlg/smb4ksambaoptions.cpp:427 msgid "no" msgstr "no" -#: smb4k/configdlg/smb4kconfigdialog.cpp:360 -#: smb4k/configdlg/smb4kconfigdialog.cpp:458 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1060 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:360 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:458 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1060 #: smb4k/configdlg/smb4ksambaoptions.cpp:215 #: smb4k/configdlg/smb4ksambaoptions.cpp:418 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:289 @@ -582,8 +582,8 @@ msgstr "no" msgid "read-write" msgstr "lectura-escritura" -#: smb4k/configdlg/smb4kconfigdialog.cpp:361 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1061 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:361 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1061 #: smb4k/configdlg/smb4ksambaoptions.cpp:216 #: smb4k/configdlg/smb4ksambaoptions.cpp:419 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:290 @@ -592,52 +592,52 @@ msgstr "lectura-escritura" msgid "read-only" msgstr "sólo-lectura" -#: smb4k/configdlg/smb4kconfigdialog.cpp:460 -#: smb4k/configdlg/smb4kconfigdialog.cpp:465 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1072 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1082 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:460 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:465 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1072 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1082 #: smb4k/configdlg/smb4ksambaoptions.cpp:141 #: smb4k/configdlg/smb4ksambaoptions.cpp:167 msgid "default" msgstr "predeterminado" -#: smb4k/configdlg/smb4kconfigdialog.cpp:707 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:707 msgid "[Network] The custom master browser has not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:722 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:722 msgid "[Network] The broadcast areas have not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:733 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:733 msgid "[Shares] The mount prefix is empty.\n" msgstr "[Recursos] El prefijo de montaje está vacío.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:748 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:748 msgid "[Authentication] The default user name has not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:759 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:759 msgid "[Samba] The file mask is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:770 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:770 msgid "[Samba] The directory mask is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:781 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:781 msgid "[Samba] The UID is empty.\n" msgstr "[Samba] El UID está vacío.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:792 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:792 msgid "[Samba] The GID is empty.\n" msgstr "[Samba] El GID está vacío.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:803 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:803 msgid "[Synchronization] The rsync prefix is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:816 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:816 msgid "" "[Synchronization] The directory where partially transferred files should be " "stored is empty.\n" @@ -645,43 +645,43 @@ msgstr "" "[Sincronización] El directorio donde los archivos parcialmente transferidos " "deberían estar está vacío.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:829 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:829 msgid "[Synchronization] The exclude patterns have not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:842 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:842 msgid "[Synchronization] The path of the exclude file is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:855 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:855 msgid "[Synchronization] The include patterns have not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:868 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:868 msgid "[Synchronization] The path of the include file is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:887 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:887 msgid "[Synchronization] The backup suffix has not been defined.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:900 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:900 msgid "[Synchronization] The backup directory is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:908 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:908 msgid "" "The configuration could not be written, because one setting is incomplete:\n" "%1Please correct this issue." msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:912 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:912 msgid "" "The configuration could not be written, because %1 settings are incomplete:\n" "%1Please correct these issues." msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:1191 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1191 msgid "Smb4TDEConfigDialog" msgstr "Smb4TDEConfigDialog" @@ -1350,7 +1350,7 @@ msgstr "" "CIFS. Konqueror fallará si intenta acceder a uno.\n" "¿Desea continuar?" -#: smb4k/core/smb4kfileio.cpp:923 smb4k/core/smb4kfileio.cpp:1057 +#: smb4k/core/smb4tdefileio.cpp:923 smb4k/core/smb4tdefileio.cpp:1057 msgid "Buffer size exceeded" msgstr "Tamaño del búfer excedido" diff --git a/po/it.po b/po/it.po index 52b566d..ba87cd2 100644 --- a/po/it.po +++ b/po/it.po @@ -517,18 +517,18 @@ msgstr "Usa nmblookup (raccomandato)" msgid "Use smbclient" msgstr "Usa smbclient" -#: smb4k/configdlg/smb4kconfigdialog.cpp:162 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:162 msgid "User Interface" msgstr "Interfaccia utente" -#: smb4k/configdlg/smb4kconfigdialog.cpp:163 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:163 #: smb4k/browser/smb4knetworkbrowser.cpp:50 #: smb4k/browser/smb4knetworkbrowser_part.cpp:186 #: smb4k/browser/smb4knetworkbrowser_part.cpp:319 msgid "Network" msgstr "Rete" -#: smb4k/configdlg/smb4kconfigdialog.cpp:164 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:164 #: smb4k/listview/smb4kshareslistview_part.cpp:144 #: smb4k/listview/smb4kshareslistview_part.cpp:346 #: smb4k/iconview/smb4ksharesiconview_part.cpp:141 @@ -536,28 +536,28 @@ msgstr "Rete" msgid "Shares" msgstr "Condivisioni" -#: smb4k/configdlg/smb4kconfigdialog.cpp:165 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:165 #: smb4k/configdlg/smb4ksambaoptions.cpp:89 #: smb4k/core/smb4kpasswordhandler.cpp:237 msgid "Authentication" msgstr "Autenticazione" -#: smb4k/configdlg/smb4kconfigdialog.cpp:166 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:166 msgid "Samba" msgstr "Samba" -#: smb4k/configdlg/smb4kconfigdialog.cpp:167 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:167 #: smb4k/dialogs/smb4ksynchronizationdialog.cpp:47 msgid "Synchronization" msgstr "Sincronizzazione" -#: smb4k/configdlg/smb4kconfigdialog.cpp:168 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:168 msgid "Super User" msgstr "Amministratore" -#: smb4k/configdlg/smb4kconfigdialog.cpp:327 -#: smb4k/configdlg/smb4kconfigdialog.cpp:328 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1039 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:327 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:328 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1039 #: smb4k/configdlg/smb4ksambaoptions.cpp:400 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:180 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:253 @@ -566,25 +566,25 @@ msgstr "Amministratore" msgid "auto" msgstr "auto" -#: smb4k/configdlg/smb4kconfigdialog.cpp:331 -#: smb4k/configdlg/smb4kconfigdialog.cpp:352 -#: smb4k/configdlg/smb4kconfigdialog.cpp:441 -#: smb4k/configdlg/smb4kconfigdialog.cpp:451 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1098 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:331 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:352 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:441 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:451 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1098 #: smb4k/configdlg/smb4ksambaoptions.cpp:428 msgid "yes" msgstr "si" -#: smb4k/configdlg/smb4kconfigdialog.cpp:332 -#: smb4k/configdlg/smb4kconfigdialog.cpp:353 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1099 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:332 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:353 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1099 #: smb4k/configdlg/smb4ksambaoptions.cpp:427 msgid "no" msgstr "no" -#: smb4k/configdlg/smb4kconfigdialog.cpp:360 -#: smb4k/configdlg/smb4kconfigdialog.cpp:458 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1060 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:360 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:458 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1060 #: smb4k/configdlg/smb4ksambaoptions.cpp:215 #: smb4k/configdlg/smb4ksambaoptions.cpp:418 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:289 @@ -595,8 +595,8 @@ msgstr "no" msgid "read-write" msgstr "lettura-scrittura" -#: smb4k/configdlg/smb4kconfigdialog.cpp:361 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1061 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:361 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1061 #: smb4k/configdlg/smb4ksambaoptions.cpp:216 #: smb4k/configdlg/smb4ksambaoptions.cpp:419 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:290 @@ -605,95 +605,95 @@ msgstr "lettura-scrittura" msgid "read-only" msgstr "solo lettura" -#: smb4k/configdlg/smb4kconfigdialog.cpp:460 -#: smb4k/configdlg/smb4kconfigdialog.cpp:465 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1072 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1082 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:460 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:465 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1072 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1082 #: smb4k/configdlg/smb4ksambaoptions.cpp:141 #: smb4k/configdlg/smb4ksambaoptions.cpp:167 msgid "default" msgstr "predefinito" -#: smb4k/configdlg/smb4kconfigdialog.cpp:707 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:707 msgid "[Network] The custom master browser has not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:722 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:722 msgid "[Network] The broadcast areas have not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:733 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:733 msgid "[Shares] The mount prefix is empty.\n" msgstr "[Condivisioni] Il percorso di montaggio è vuoto.\n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:748 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:748 msgid "[Authentication] The default user name has not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:759 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:759 msgid "[Samba] The file mask is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:770 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:770 msgid "[Samba] The directory mask is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:781 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:781 msgid "[Samba] The UID is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:792 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:792 msgid "[Samba] The GID is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:803 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:803 msgid "[Synchronization] The rsync prefix is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:816 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:816 #, fuzzy msgid "" "[Synchronization] The directory where partially transferred files should be " "stored is empty.\n" msgstr "Conserva i file parzialmente trasferiti in" -#: smb4k/configdlg/smb4kconfigdialog.cpp:829 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:829 msgid "[Synchronization] The exclude patterns have not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:842 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:842 msgid "[Synchronization] The path of the exclude file is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:855 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:855 msgid "[Synchronization] The include patterns have not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:868 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:868 msgid "[Synchronization] The path of the include file is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:887 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:887 msgid "[Synchronization] The backup suffix has not been defined.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:900 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:900 msgid "[Synchronization] The backup directory is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:908 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:908 msgid "" "The configuration could not be written, because one setting is incomplete:\n" "%1Please correct this issue." msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:912 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:912 msgid "" "The configuration could not be written, because %1 settings are incomplete:\n" "%1Please correct these issues." msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:1191 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1191 #, fuzzy msgid "Smb4TDEConfigDialog" msgstr "Smb4KMontaggio" @@ -1383,7 +1383,7 @@ msgstr "" "di esse.\n" "Si desidera continuare?" -#: smb4k/core/smb4kfileio.cpp:923 smb4k/core/smb4kfileio.cpp:1057 +#: smb4k/core/smb4tdefileio.cpp:923 smb4k/core/smb4tdefileio.cpp:1057 msgid "Buffer size exceeded" msgstr "Dimensione del buffer superata" diff --git a/po/ja.po b/po/ja.po index bc3d028..6c5ffb1 100644 --- a/po/ja.po +++ b/po/ja.po @@ -501,18 +501,18 @@ msgstr "nmblookup を使用(推奨)" msgid "Use smbclient" msgstr "smbclient を使用" -#: smb4k/configdlg/smb4kconfigdialog.cpp:162 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:162 msgid "User Interface" msgstr "ユーザインターフェイス" -#: smb4k/configdlg/smb4kconfigdialog.cpp:163 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:163 #: smb4k/browser/smb4knetworkbrowser.cpp:50 #: smb4k/browser/smb4knetworkbrowser_part.cpp:186 #: smb4k/browser/smb4knetworkbrowser_part.cpp:319 msgid "Network" msgstr "ネットワーク" -#: smb4k/configdlg/smb4kconfigdialog.cpp:164 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:164 #: smb4k/listview/smb4kshareslistview_part.cpp:144 #: smb4k/listview/smb4kshareslistview_part.cpp:346 #: smb4k/iconview/smb4ksharesiconview_part.cpp:141 @@ -520,28 +520,28 @@ msgstr "ネットワーク" msgid "Shares" msgstr "共有" -#: smb4k/configdlg/smb4kconfigdialog.cpp:165 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:165 #: smb4k/configdlg/smb4ksambaoptions.cpp:89 #: smb4k/core/smb4kpasswordhandler.cpp:237 msgid "Authentication" msgstr "認証" -#: smb4k/configdlg/smb4kconfigdialog.cpp:166 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:166 msgid "Samba" msgstr "Samba" -#: smb4k/configdlg/smb4kconfigdialog.cpp:167 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:167 #: smb4k/dialogs/smb4ksynchronizationdialog.cpp:47 msgid "Synchronization" msgstr "同期化" -#: smb4k/configdlg/smb4kconfigdialog.cpp:168 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:168 msgid "Super User" msgstr "スーパー ユーザ" -#: smb4k/configdlg/smb4kconfigdialog.cpp:327 -#: smb4k/configdlg/smb4kconfigdialog.cpp:328 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1039 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:327 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:328 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1039 #: smb4k/configdlg/smb4ksambaoptions.cpp:400 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:180 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:253 @@ -550,25 +550,25 @@ msgstr "スーパー ユーザ" msgid "auto" msgstr "自動(オート)" -#: smb4k/configdlg/smb4kconfigdialog.cpp:331 -#: smb4k/configdlg/smb4kconfigdialog.cpp:352 -#: smb4k/configdlg/smb4kconfigdialog.cpp:441 -#: smb4k/configdlg/smb4kconfigdialog.cpp:451 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1098 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:331 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:352 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:441 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:451 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1098 #: smb4k/configdlg/smb4ksambaoptions.cpp:428 msgid "yes" msgstr "はい" -#: smb4k/configdlg/smb4kconfigdialog.cpp:332 -#: smb4k/configdlg/smb4kconfigdialog.cpp:353 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1099 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:332 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:353 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1099 #: smb4k/configdlg/smb4ksambaoptions.cpp:427 msgid "no" msgstr "いいえ" -#: smb4k/configdlg/smb4kconfigdialog.cpp:360 -#: smb4k/configdlg/smb4kconfigdialog.cpp:458 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1060 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:360 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:458 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1060 #: smb4k/configdlg/smb4ksambaoptions.cpp:215 #: smb4k/configdlg/smb4ksambaoptions.cpp:418 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:289 @@ -579,8 +579,8 @@ msgstr "いいえ" msgid "read-write" msgstr "読出し-書込み" -#: smb4k/configdlg/smb4kconfigdialog.cpp:361 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1061 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:361 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1061 #: smb4k/configdlg/smb4ksambaoptions.cpp:216 #: smb4k/configdlg/smb4ksambaoptions.cpp:419 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:290 @@ -589,83 +589,83 @@ msgstr "読出し-書込み" msgid "read-only" msgstr "読み出し専用" -#: smb4k/configdlg/smb4kconfigdialog.cpp:460 -#: smb4k/configdlg/smb4kconfigdialog.cpp:465 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1072 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1082 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:460 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:465 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1072 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1082 #: smb4k/configdlg/smb4ksambaoptions.cpp:141 #: smb4k/configdlg/smb4ksambaoptions.cpp:167 msgid "default" msgstr "デフォルト" -#: smb4k/configdlg/smb4kconfigdialog.cpp:707 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:707 msgid "[Network] The custom master browser has not been entered.\n" msgstr "[ネットワーク] カスタム マスターブラウザーは入力されていません \n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:722 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:722 msgid "[Network] The broadcast areas have not been entered.\n" msgstr "[ネットワーク] ブロードキャスト エリアは入力されていません \n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:733 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:733 msgid "[Shares] The mount prefix is empty.\n" msgstr "[共有] マウントプレフィックスは空です \n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:748 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:748 msgid "[Authentication] The default user name has not been entered.\n" msgstr "[認証] デフォルト・ユーザー名は入力されていません \n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:759 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:759 msgid "[Samba] The file mask is empty.\n" msgstr "[Samba] ファイル マスク は空です \n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:770 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:770 msgid "[Samba] The directory mask is empty.\n" msgstr "[Samba] ディレクトリ マスク は空です \n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:781 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:781 msgid "[Samba] The UID is empty.\n" msgstr "[Samba] UID は空です \n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:792 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:792 msgid "[Samba] The GID is empty.\n" msgstr "[Samba] GID は空です \n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:803 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:803 msgid "[Synchronization] The rsync prefix is empty.\n" msgstr "[同期化] rsync サフィックスは空です \n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:816 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:816 msgid "" "[Synchronization] The directory where partially transferred files should be " "stored is empty.\n" msgstr "" "[同期化] 部分的に転送されるファイルが保存されるディレクトリーは空です \n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:829 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:829 msgid "[Synchronization] The exclude patterns have not been entered.\n" msgstr "[同期化] 除外 パターンは入力されていません \n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:842 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:842 msgid "[Synchronization] The path of the exclude file is empty.\n" msgstr "[同期化] 除外 ファイルのパスは空です \n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:855 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:855 msgid "[Synchronization] The include patterns have not been entered.\n" msgstr "[同期化] 包括(インクルード) パターンは入力されていません \n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:868 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:868 msgid "[Synchronization] The path of the include file is empty.\n" msgstr "[同期化] 包括(インクルード) ファイルのパスは空です \n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:887 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:887 msgid "[Synchronization] The backup suffix has not been defined.\n" msgstr "[同期化] バックアップサフィックスは定義されていません \n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:900 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:900 msgid "[Synchronization] The backup directory is empty.\n" msgstr "[同期化]バックアップ・ディレクトリーは空です \n" -#: smb4k/configdlg/smb4kconfigdialog.cpp:908 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:908 msgid "" "The configuration could not be written, because one setting is incomplete:\n" "%1Please correct this issue." @@ -673,7 +673,7 @@ msgstr "" "ひとつの設定が不完全なので、構成(コンフィグレーション)ができません:\n" "%1 この問題を修正してください" -#: smb4k/configdlg/smb4kconfigdialog.cpp:912 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:912 msgid "" "The configuration could not be written, because %1 settings are incomplete:\n" "%1Please correct these issues." @@ -681,7 +681,7 @@ msgstr "" "%1 設定が不完全なので、設定ファイルに記述することができません。:\n" "これら( %1 )の問題を修正してください" -#: smb4k/configdlg/smb4kconfigdialog.cpp:1191 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1191 msgid "Smb4TDEConfigDialog" msgstr "Smb4K設定・ダイアログ" @@ -1358,7 +1358,7 @@ msgstr "" "ングするでしょう。\n" "それでも、あなたは、続行しますか？" -#: smb4k/core/smb4kfileio.cpp:923 smb4k/core/smb4kfileio.cpp:1057 +#: smb4k/core/smb4tdefileio.cpp:923 smb4k/core/smb4tdefileio.cpp:1057 msgid "Buffer size exceeded" msgstr "バッファー・サイズが越えました" diff --git a/po/sv.po b/po/sv.po index cc0b1bf..d8b33c3 100644 --- a/po/sv.po +++ b/po/sv.po @@ -250,7 +250,7 @@ msgid "Remote SMB port:" msgstr "Avlägsen SMB-port:" #: smb4k/configdlg/smb4ksambaoptions.cpp:89 -#: smb4k/configdlg/smb4kconfigdialog.cpp:165 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:165 #: smb4k/core/smb4kpasswordhandler.cpp:237 msgid "Authentication" msgstr "Autentisering" @@ -314,10 +314,10 @@ msgstr "Linux charset:" #: smb4k/configdlg/smb4ksambaoptions.cpp:141 #: smb4k/configdlg/smb4ksambaoptions.cpp:167 -#: smb4k/configdlg/smb4kconfigdialog.cpp:460 -#: smb4k/configdlg/smb4kconfigdialog.cpp:465 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1072 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1082 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:460 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:465 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1072 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1082 msgid "default" msgstr "grundinställning" @@ -345,9 +345,9 @@ msgstr "" #: smb4k/configdlg/smb4ksambaoptions.cpp:215 #: smb4k/configdlg/smb4ksambaoptions.cpp:418 -#: smb4k/configdlg/smb4kconfigdialog.cpp:360 -#: smb4k/configdlg/smb4kconfigdialog.cpp:458 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1060 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:360 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:458 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1060 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:289 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:422 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:704 @@ -358,8 +358,8 @@ msgstr "läs-skriv" #: smb4k/configdlg/smb4ksambaoptions.cpp:216 #: smb4k/configdlg/smb4ksambaoptions.cpp:419 -#: smb4k/configdlg/smb4kconfigdialog.cpp:361 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1061 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:361 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1061 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:290 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:423 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:988 @@ -524,9 +524,9 @@ msgid "Protocol:" msgstr "Protokoll" #: smb4k/configdlg/smb4ksambaoptions.cpp:400 -#: smb4k/configdlg/smb4kconfigdialog.cpp:327 -#: smb4k/configdlg/smb4kconfigdialog.cpp:328 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1039 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:327 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:328 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1039 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:180 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:253 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:874 @@ -548,18 +548,18 @@ msgid "Kerberos:" msgstr "" #: smb4k/configdlg/smb4ksambaoptions.cpp:427 -#: smb4k/configdlg/smb4kconfigdialog.cpp:332 -#: smb4k/configdlg/smb4kconfigdialog.cpp:353 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1099 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:332 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:353 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1099 msgid "no" msgstr "" #: smb4k/configdlg/smb4ksambaoptions.cpp:428 -#: smb4k/configdlg/smb4kconfigdialog.cpp:331 -#: smb4k/configdlg/smb4kconfigdialog.cpp:352 -#: smb4k/configdlg/smb4kconfigdialog.cpp:441 -#: smb4k/configdlg/smb4kconfigdialog.cpp:451 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1098 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:331 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:352 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:441 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:451 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1098 msgid "yes" msgstr "" @@ -1127,18 +1127,18 @@ msgstr "Docka i systembrickan" msgid "Preview Dialog" msgstr "Förhandsgranskning" -#: smb4k/configdlg/smb4kconfigdialog.cpp:162 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:162 msgid "User Interface" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:163 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:163 #: smb4k/browser/smb4knetworkbrowser_part.cpp:186 #: smb4k/browser/smb4knetworkbrowser_part.cpp:319 #: smb4k/browser/smb4knetworkbrowser.cpp:50 msgid "Network" msgstr "Nätverk" -#: smb4k/configdlg/smb4kconfigdialog.cpp:164 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:164 #: smb4k/listview/smb4kshareslistview_part.cpp:144 #: smb4k/listview/smb4kshareslistview_part.cpp:346 #: smb4k/iconview/smb4ksharesiconview_part.cpp:141 @@ -1146,100 +1146,100 @@ msgstr "Nätverk" msgid "Shares" msgstr "Kataloger" -#: smb4k/configdlg/smb4kconfigdialog.cpp:166 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:166 msgid "Samba" msgstr "Samba" -#: smb4k/configdlg/smb4kconfigdialog.cpp:167 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:167 #: smb4k/dialogs/smb4ksynchronizationdialog.cpp:47 #, fuzzy msgid "Synchronization" msgstr "Fransk översättning" -#: smb4k/configdlg/smb4kconfigdialog.cpp:168 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:168 msgid "Super User" msgstr "Superanvändare" -#: smb4k/configdlg/smb4kconfigdialog.cpp:707 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:707 msgid "[Network] The custom master browser has not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:722 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:722 msgid "[Network] The broadcast areas have not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:733 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:733 #, fuzzy msgid "[Shares] The mount prefix is empty.\n" msgstr "Montera kataloger:" -#: smb4k/configdlg/smb4kconfigdialog.cpp:748 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:748 msgid "[Authentication] The default user name has not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:759 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:759 msgid "[Samba] The file mask is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:770 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:770 msgid "[Samba] The directory mask is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:781 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:781 msgid "[Samba] The UID is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:792 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:792 msgid "[Samba] The GID is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:803 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:803 msgid "[Synchronization] The rsync prefix is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:816 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:816 msgid "" "[Synchronization] The directory where partially transferred files should be " "stored is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:829 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:829 msgid "[Synchronization] The exclude patterns have not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:842 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:842 msgid "[Synchronization] The path of the exclude file is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:855 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:855 msgid "[Synchronization] The include patterns have not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:868 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:868 msgid "[Synchronization] The path of the include file is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:887 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:887 msgid "[Synchronization] The backup suffix has not been defined.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:900 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:900 msgid "[Synchronization] The backup directory is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:908 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:908 msgid "" "The configuration could not be written, because one setting is incomplete:\n" "%1Please correct this issue." msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:912 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:912 msgid "" "The configuration could not be written, because %1 settings are incomplete:\n" "%1Please correct these issues." msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:1191 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1191 msgid "Smb4TDEConfigDialog" msgstr "" @@ -3195,7 +3195,7 @@ msgid "" "password to write the necessary changes to the configuration file." msgstr "" -#: smb4k/core/smb4kfileio.cpp:923 smb4k/core/smb4kfileio.cpp:1057 +#: smb4k/core/smb4tdefileio.cpp:923 smb4k/core/smb4tdefileio.cpp:1057 #, fuzzy msgid "Buffer size exceeded" msgstr "Buffertstorlek:" diff --git a/po/uk.po b/po/uk.po index ebcd8d5..33a5350 100644 --- a/po/uk.po +++ b/po/uk.po @@ -538,18 +538,18 @@ msgstr "Вживати nmblookup (рекомендовано)" msgid "Use smbclient" msgstr "Вживати smbclient" -#: smb4k/configdlg/smb4kconfigdialog.cpp:162 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:162 msgid "User Interface" msgstr "Інтерфейс користувача" -#: smb4k/configdlg/smb4kconfigdialog.cpp:163 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:163 #: smb4k/browser/smb4knetworkbrowser.cpp:50 #: smb4k/browser/smb4knetworkbrowser_part.cpp:186 #: smb4k/browser/smb4knetworkbrowser_part.cpp:319 msgid "Network" msgstr "Мережа" -#: smb4k/configdlg/smb4kconfigdialog.cpp:164 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:164 #: smb4k/listview/smb4kshareslistview_part.cpp:144 #: smb4k/listview/smb4kshareslistview_part.cpp:346 #: smb4k/iconview/smb4ksharesiconview_part.cpp:141 @@ -557,28 +557,28 @@ msgstr "Мережа" msgid "Shares" msgstr "Спільні ресурси" -#: smb4k/configdlg/smb4kconfigdialog.cpp:165 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:165 #: smb4k/configdlg/smb4ksambaoptions.cpp:89 #: smb4k/core/smb4kpasswordhandler.cpp:237 msgid "Authentication" msgstr "Автентифікація" -#: smb4k/configdlg/smb4kconfigdialog.cpp:166 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:166 msgid "Samba" msgstr "Samba" -#: smb4k/configdlg/smb4kconfigdialog.cpp:167 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:167 #: smb4k/dialogs/smb4ksynchronizationdialog.cpp:47 msgid "Synchronization" msgstr "Синхронізація" -#: smb4k/configdlg/smb4kconfigdialog.cpp:168 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:168 msgid "Super User" msgstr "Суперкористувач" -#: smb4k/configdlg/smb4kconfigdialog.cpp:327 -#: smb4k/configdlg/smb4kconfigdialog.cpp:328 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1039 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:327 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:328 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1039 #: smb4k/configdlg/smb4ksambaoptions.cpp:400 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:180 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:253 @@ -587,25 +587,25 @@ msgstr "Суперкористувач" msgid "auto" msgstr "авто" -#: smb4k/configdlg/smb4kconfigdialog.cpp:331 -#: smb4k/configdlg/smb4kconfigdialog.cpp:352 -#: smb4k/configdlg/smb4kconfigdialog.cpp:441 -#: smb4k/configdlg/smb4kconfigdialog.cpp:451 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1098 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:331 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:352 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:441 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:451 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1098 #: smb4k/configdlg/smb4ksambaoptions.cpp:428 msgid "yes" msgstr "так" -#: smb4k/configdlg/smb4kconfigdialog.cpp:332 -#: smb4k/configdlg/smb4kconfigdialog.cpp:353 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1099 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:332 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:353 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1099 #: smb4k/configdlg/smb4ksambaoptions.cpp:427 msgid "no" msgstr "ні" -#: smb4k/configdlg/smb4kconfigdialog.cpp:360 -#: smb4k/configdlg/smb4kconfigdialog.cpp:458 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1060 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:360 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:458 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1060 #: smb4k/configdlg/smb4ksambaoptions.cpp:215 #: smb4k/configdlg/smb4ksambaoptions.cpp:418 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:289 @@ -616,8 +616,8 @@ msgstr "ні" msgid "read-write" msgstr "читання-запис" -#: smb4k/configdlg/smb4kconfigdialog.cpp:361 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1061 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:361 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1061 #: smb4k/configdlg/smb4ksambaoptions.cpp:216 #: smb4k/configdlg/smb4ksambaoptions.cpp:419 #: smb4k/dialogs/smb4kcustomoptionsdialog.cpp:290 @@ -626,96 +626,96 @@ msgstr "читання-запис" msgid "read-only" msgstr "тільки читання" -#: smb4k/configdlg/smb4kconfigdialog.cpp:460 -#: smb4k/configdlg/smb4kconfigdialog.cpp:465 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1072 -#: smb4k/configdlg/smb4kconfigdialog.cpp:1082 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:460 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:465 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1072 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1082 #: smb4k/configdlg/smb4ksambaoptions.cpp:141 #: smb4k/configdlg/smb4ksambaoptions.cpp:167 msgid "default" msgstr "типові" -#: smb4k/configdlg/smb4kconfigdialog.cpp:707 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:707 msgid "[Network] The custom master browser has not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:722 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:722 msgid "[Network] The broadcast areas have not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:733 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:733 #, fuzzy msgid "[Shares] The mount prefix is empty.\n" msgstr "Префікс монтування:" -#: smb4k/configdlg/smb4kconfigdialog.cpp:748 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:748 msgid "[Authentication] The default user name has not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:759 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:759 msgid "[Samba] The file mask is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:770 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:770 msgid "[Samba] The directory mask is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:781 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:781 msgid "[Samba] The UID is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:792 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:792 msgid "[Samba] The GID is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:803 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:803 msgid "[Synchronization] The rsync prefix is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:816 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:816 #, fuzzy msgid "" "[Synchronization] The directory where partially transferred files should be " "stored is empty.\n" msgstr "Покласти частково перенесений файл у" -#: smb4k/configdlg/smb4kconfigdialog.cpp:829 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:829 msgid "[Synchronization] The exclude patterns have not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:842 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:842 msgid "[Synchronization] The path of the exclude file is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:855 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:855 msgid "[Synchronization] The include patterns have not been entered.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:868 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:868 msgid "[Synchronization] The path of the include file is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:887 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:887 msgid "[Synchronization] The backup suffix has not been defined.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:900 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:900 msgid "[Synchronization] The backup directory is empty.\n" msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:908 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:908 msgid "" "The configuration could not be written, because one setting is incomplete:\n" "%1Please correct this issue." msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:912 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:912 msgid "" "The configuration could not be written, because %1 settings are incomplete:\n" "%1Please correct these issues." msgstr "" -#: smb4k/configdlg/smb4kconfigdialog.cpp:1191 +#: smb4k/configdlg/smb4tdeconfigdialog.cpp:1191 msgid "Smb4TDEConfigDialog" msgstr "Smb4TDEConfigDialog" @@ -1403,7 +1403,7 @@ msgstr "" "ресурсами CIFS. Konqueror зависає при спробі доступу до них.\n" "Хочете продовжити?" -#: smb4k/core/smb4kfileio.cpp:923 smb4k/core/smb4kfileio.cpp:1057 +#: smb4k/core/smb4tdefileio.cpp:923 smb4k/core/smb4tdefileio.cpp:1057 msgid "Buffer size exceeded" msgstr "Перевищено розмір буфера" diff --git a/smb4k.kdevses b/smb4k.kdevses index c8a01d3..b577c59 100644 --- a/smb4k.kdevses +++ b/smb4k.kdevses @@ -5,10 +5,10 @@ - + - + diff --git a/smb4k/configdlg/Makefile.am b/smb4k/configdlg/Makefile.am index 356c121..405392a 100644 --- a/smb4k/configdlg/Makefile.am +++ b/smb4k/configdlg/Makefile.am @@ -1,12 +1,12 @@ INCLUDES = $(all_includes) METASOURCES = AUTO -kde_module_LTLIBRARIES = libsmb4kconfigdialog.la -noinst_HEADERS = smb4kauthoptions.h smb4kconfigdialog.h smb4knetworkoptions.h \ +kde_module_LTLIBRARIES = libsmb4tdeconfigdialog.la +noinst_HEADERS = smb4kauthoptions.h smb4tdeconfigdialog.h smb4knetworkoptions.h \ smb4tdersyncoptions.h smb4ksambaoptions.h smb4kshareoptions.h smb4ksuperuseroptions.h \ smb4kuserinterfaceoptions.h -libsmb4kconfigdialog_la_SOURCES = smb4kauthoptions.cpp smb4kconfigdialog.cpp \ +libsmb4tdeconfigdialog_la_SOURCES = smb4kauthoptions.cpp smb4tdeconfigdialog.cpp \ smb4knetworkoptions.cpp smb4tdersyncoptions.cpp smb4ksambaoptions.cpp smb4kshareoptions.cpp \ smb4ksuperuseroptions.cpp smb4kuserinterfaceoptions.cpp -libsmb4kconfigdialog_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ +libsmb4tdeconfigdialog_la_LIBADD = $(top_builddir)/smb4k/core/libsmb4kcore.la \ $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_QT) -libsmb4kconfigdialog_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TDECORE) $(LIB_KFILE) +libsmb4tdeconfigdialog_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TDECORE) $(LIB_KFILE) diff --git a/smb4k/configdlg/smb4kconfigdialog.cpp b/smb4k/configdlg/smb4tdeconfigdialog.cpp similarity index 99% rename from smb4k/configdlg/smb4kconfigdialog.cpp rename to smb4k/configdlg/smb4tdeconfigdialog.cpp index fc04c0d..d603385 100644 --- a/smb4k/configdlg/smb4kconfigdialog.cpp +++ b/smb4k/configdlg/smb4tdeconfigdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - smb4kconfigdialog - The configuration dialog of Smb4K + smb4tdeconfigdialog - The configuration dialog of Smb4K ------------------- begin : Sa Apr 14 2007 copyright : (C) 2007 by Alexander Reinholdt @@ -39,7 +39,7 @@ #include // application specific includes -#include "smb4kconfigdialog.h" +#include "smb4tdeconfigdialog.h" #include "smb4kuserinterfaceoptions.h" #include "smb4knetworkoptions.h" #include "smb4kshareoptions.h" @@ -1188,7 +1188,7 @@ TDEInstance *Smb4TDEConfigDialogFactory::instance() { if( !m_instance ) { - m_about = new TDEAboutData( "smb4kconfigdialog", I18N_NOOP( "Smb4TDEConfigDialog" ), "1.0" ); + m_about = new TDEAboutData( "smb4tdeconfigdialog", I18N_NOOP( "Smb4TDEConfigDialog" ), "1.0" ); m_about->addAuthor("Alexander Reinholdt", 0, "dustpuppy@users.berlios.de"); m_about->setLicense( TDEAboutData::License_GPL ); m_instance = new TDEInstance( m_about ); @@ -1212,11 +1212,11 @@ const TQStringList & ) extern "C" { - void *init_libsmb4kconfigdialog() + void *init_libsmb4tdeconfigdialog() { TDEGlobal::locale()->insertCatalogue( "smb4k" ); return new Smb4TDEConfigDialogFactory; } } -#include "smb4kconfigdialog.moc" +#include "smb4tdeconfigdialog.moc" diff --git a/smb4k/configdlg/smb4kconfigdialog.h b/smb4k/configdlg/smb4tdeconfigdialog.h similarity index 98% rename from smb4k/configdlg/smb4kconfigdialog.h rename to smb4k/configdlg/smb4tdeconfigdialog.h index 55aab71..b47b05b 100644 --- a/smb4k/configdlg/smb4kconfigdialog.h +++ b/smb4k/configdlg/smb4tdeconfigdialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - smb4kconfigdialog - The configuration dialog of Smb4K + smb4tdeconfigdialog - The configuration dialog of Smb4K ------------------- begin : Sa Apr 14 2007 copyright : (C) 2007 by Alexander Reinholdt @@ -31,7 +31,7 @@ #endif // KDE includes -#include +#include #include #include #include diff --git a/smb4k/configdlg/smb4tdersyncoptions.cpp b/smb4k/configdlg/smb4tdersyncoptions.cpp index 71e810d..2fbbe8a 100644 --- a/smb4k/configdlg/smb4tdersyncoptions.cpp +++ b/smb4k/configdlg/smb4tdersyncoptions.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include // application specific includes #include "smb4tdersyncoptions.h" diff --git a/smb4k/core/Makefile.am b/smb4k/core/Makefile.am index 12b7449..3d426b5 100644 --- a/smb4k/core/Makefile.am +++ b/smb4k/core/Makefile.am @@ -5,14 +5,14 @@ lib_LTLIBRARIES = libsmb4kcore.la libsmb4kcore_la_LDFLAGS = -no-undefined $(all_libraries) -ltdewalletclient \ -version-info 2:0:0 include_HEADERS = smb4kauthinfo.h smb4kbookmark.h smb4kbookmarkhandler.h \ - smb4kcore.h smb4kdefs.h smb4kerror.h smb4kfileio.h smb4kglobal.h \ + smb4kcore.h smb4kdefs.h smb4kerror.h smb4tdefileio.h smb4kglobal.h \ smb4khomesshareshandler.h smb4kmounter.h smb4knetworkitems.h \ smb4kpasswordhandler.h smb4kpreviewer.h smb4kpreviewitem.h \ smb4kprint.h smb4kprintinfo.h smb4ksambaoptionshandler.h \ smb4ksambaoptionsinfo.h smb4kscanner.h smb4kshare.h \ smb4ksynchronizationinfo.h smb4ksynchronizer.h libsmb4kcore_la_SOURCES = smb4kauthinfo.cpp smb4kbookmark.cpp \ - smb4kbookmarkhandler.cpp smb4kcore.cpp smb4kerror.cpp smb4kfileio.cpp smb4kglobal.cpp \ + smb4kbookmarkhandler.cpp smb4kcore.cpp smb4kerror.cpp smb4tdefileio.cpp smb4kglobal.cpp \ smb4kglobal_p.cpp smb4khomesshareshandler.cpp smb4kmounter.cpp smb4kmounter_p.cpp \ smb4knetworkitems.cpp smb4kpasswordhandler.cpp smb4kpreviewer.cpp smb4kpreviewitem.cpp \ smb4kprint.cpp smb4kprintinfo.cpp smb4ksambaoptionshandler.cpp \ @@ -24,7 +24,7 @@ kde_kcfg_DATA = smb4k.kcfg # Build rules smb4kcore.lo: smb4ksettings.h -smb4kfileio.lo: smb4ksettings.h +smb4tdefileio.lo: smb4ksettings.h smb4kmounter.lo: smb4ksettings.h smb4kpasswordhandler.lo: smb4ksettings.h smb4kprint.lo: smb4ksettings.h diff --git a/smb4k/core/smb4kcore.h b/smb4k/core/smb4kcore.h index e49b4db..fd3a488 100644 --- a/smb4k/core/smb4kcore.h +++ b/smb4k/core/smb4kcore.h @@ -39,7 +39,7 @@ // application specific includes #include "smb4kscanner.h" #include "smb4kmounter.h" -#include "smb4kfileio.h" +#include "smb4tdefileio.h" #include "smb4kbookmarkhandler.h" #include "smb4kprint.h" #include "smb4ksynchronizer.h" diff --git a/smb4k/core/smb4kglobal.cpp b/smb4k/core/smb4kglobal.cpp index e2e98ce..a1d09c8 100644 --- a/smb4k/core/smb4kglobal.cpp +++ b/smb4k/core/smb4kglobal.cpp @@ -24,7 +24,7 @@ ***************************************************************************/ // KDE includes -#include +#include #include // application specific includes diff --git a/smb4k/core/smb4kglobal.h b/smb4k/core/smb4kglobal.h index 1c7db8a..c6da2a4 100644 --- a/smb4k/core/smb4kglobal.h +++ b/smb4k/core/smb4kglobal.h @@ -29,7 +29,7 @@ #include #include -#include +#include // forward declarations: class Smb4KPasswordHandler; diff --git a/smb4k/core/smb4kglobal_p.h b/smb4k/core/smb4kglobal_p.h index 898d66e..8148f3a 100644 --- a/smb4k/core/smb4kglobal_p.h +++ b/smb4k/core/smb4kglobal_p.h @@ -35,7 +35,7 @@ #include // KDE includes -#include +#include // application specific includes #include "smb4kpasswordhandler.h" diff --git a/smb4k/core/smb4khomesshareshandler.h b/smb4k/core/smb4khomesshareshandler.h index 44c3710..b343698 100644 --- a/smb4k/core/smb4khomesshareshandler.h +++ b/smb4k/core/smb4khomesshareshandler.h @@ -35,7 +35,7 @@ // KDE includes #include -#include +#include /** diff --git a/smb4k/core/smb4kprint.cpp b/smb4k/core/smb4kprint.cpp index 3661db0..ae7655c 100644 --- a/smb4k/core/smb4kprint.cpp +++ b/smb4k/core/smb4kprint.cpp @@ -29,7 +29,7 @@ // KDE includes #include -#include +#include #include // system includes diff --git a/smb4k/core/smb4ksambaoptionshandler.h b/smb4k/core/smb4ksambaoptionshandler.h index 7e20c83..eca3f9e 100644 --- a/smb4k/core/smb4ksambaoptionshandler.h +++ b/smb4k/core/smb4ksambaoptionshandler.h @@ -35,7 +35,7 @@ #include // KDE includes -#include +#include // forward declarations class Smb4KSambaOptionsInfo; diff --git a/smb4k/core/smb4ksettings.cpp b/smb4k/core/smb4ksettings.cpp index 8fc39bb..3aa8240 100644 --- a/smb4k/core/smb4ksettings.cpp +++ b/smb4k/core/smb4ksettings.cpp @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from smb4k.kcfg. +// This file is generated by tdeconfig_compiler from smb4k.kcfg. // All changes you do to this file will be lost. #include "smb4ksettings.h" diff --git a/smb4k/core/smb4kfileio.cpp b/smb4k/core/smb4tdefileio.cpp similarity index 99% rename from smb4k/core/smb4kfileio.cpp rename to smb4k/core/smb4tdefileio.cpp index 05d59a9..617763c 100644 --- a/smb4k/core/smb4kfileio.cpp +++ b/smb4k/core/smb4tdefileio.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - smb4kfileio - Does file IO operations for Smb4K + smb4tdefileio - Does file IO operations for Smb4K ------------------- begin : Do Jan 1 2004 copyright : (C) 2004-2007 by Alexander Reinholdt @@ -44,7 +44,7 @@ #include // application specific includes -#include "smb4kfileio.h" +#include "smb4tdefileio.h" #include "smb4kdefs.h" #include "smb4kerror.h" #include "smb4kglobal.h" @@ -1792,4 +1792,4 @@ void Smb4KFileIO::slotProcessExited( TDEProcess * ) m_error_occurred = false; } -#include "smb4kfileio.moc" +#include "smb4tdefileio.moc" diff --git a/smb4k/core/smb4kfileio.h b/smb4k/core/smb4tdefileio.h similarity index 99% rename from smb4k/core/smb4kfileio.h rename to smb4k/core/smb4tdefileio.h index b014fcf..9da6aae 100644 --- a/smb4k/core/smb4kfileio.h +++ b/smb4k/core/smb4tdefileio.h @@ -1,5 +1,5 @@ /*************************************************************************** - smb4kfileio - Does file IO operations for Smb4K + smb4tdefileio - Does file IO operations for Smb4K ------------------- begin : Do Jan 1 2004 copyright : (C) 2004-2007 by Alexander Reinholdt diff --git a/smb4k/dialogs/smb4kbookmarkeditor.cpp b/smb4k/dialogs/smb4kbookmarkeditor.cpp index f68882f..93b2713 100644 --- a/smb4k/dialogs/smb4kbookmarkeditor.cpp +++ b/smb4k/dialogs/smb4kbookmarkeditor.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/smb4k/iconview/smb4ksharesiconview.cpp b/smb4k/iconview/smb4ksharesiconview.cpp index bc486b1..c61d550 100644 --- a/smb4k/iconview/smb4ksharesiconview.cpp +++ b/smb4k/iconview/smb4ksharesiconview.cpp @@ -26,7 +26,7 @@ // KDE includes #include #include -#include +#include #include // application specific includes diff --git a/smb4k/listview/smb4kshareslistview.cpp b/smb4k/listview/smb4kshareslistview.cpp index 1f52edc..2d01084 100644 --- a/smb4k/listview/smb4kshareslistview.cpp +++ b/smb4k/listview/smb4kshareslistview.cpp @@ -29,7 +29,7 @@ // KDE includes #include #include -#include +#include #include #include diff --git a/smb4k/main.cpp b/smb4k/main.cpp index 1936f63..1b225f5 100644 --- a/smb4k/main.cpp +++ b/smb4k/main.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/smb4k/smb4k.cpp b/smb4k/smb4k.cpp index de2ade8..bdb3c77 100644 --- a/smb4k/smb4k.cpp +++ b/smb4k/smb4k.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include // application specific includes @@ -567,7 +567,7 @@ void Smb4KApp::slotConfigDialog() } // Load the factory of the config dialog: - KLibFactory *config_factory = KLibLoader::self()->factory( "libsmb4kconfigdialog" ); + KLibFactory *config_factory = KLibLoader::self()->factory( "libsmb4tdeconfigdialog" ); if ( config_factory ) { diff --git a/smb4k/smb4ksystemtray.cpp b/smb4k/smb4ksystemtray.cpp index 9dd160b..aeef93e 100644 --- a/smb4k/smb4ksystemtray.cpp +++ b/smb4k/smb4ksystemtray.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include // application specific includes @@ -188,7 +188,7 @@ void Smb4KSystemTray::slotConfigDialog() } // Load the factory of the config dialog: - KLibFactory *config_factory = KLibLoader::self()->factory( "libsmb4kconfigdialog" ); + KLibFactory *config_factory = KLibLoader::self()->factory( "libsmb4tdeconfigdialog" ); if ( config_factory ) {