From fbe76102e941b9f1edaf236788e42678f05fdf9a Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:08:06 +0200 Subject: 3.9 --- Application.cpp | 70 +- Application.h | 2 +- BUILD/Changelog.txt | 19 + BUILD/FreeFileSync.chm | Bin 374528 -> 376650 bytes BUILD/Help/Table of Contents.hhc | 2 +- BUILD/Help/html/Features.html | 8 +- BUILD/Help/html/Unbenannt 1.odf | Bin 0 -> 4975 bytes BUILD/Help/html/advanced/Batch Scripting.html | 14 +- BUILD/Help/html/advanced/DragDrop.html | 8 +- BUILD/Help/html/advanced/ExcludeSubfolder.html | 80 +- BUILD/Help/html/advanced/TimeStamped.html | 29 +- BUILD/Languages/chinese_simple.lng | 94 +- BUILD/Languages/chinese_traditional.lng | 58 +- BUILD/Languages/czech.lng | 60 +- BUILD/Languages/dutch.lng | 48 +- BUILD/Languages/english_uk.lng | 54 +- BUILD/Languages/finnish.lng | 48 +- BUILD/Languages/french.lng | 48 +- BUILD/Languages/german.lng | 40 +- BUILD/Languages/hebrew.lng | 48 +- BUILD/Languages/hungarian.lng | 54 +- BUILD/Languages/italian.lng | 92 +- BUILD/Languages/japanese.lng | 48 +- BUILD/Languages/polish.lng | 56 +- BUILD/Languages/portuguese.lng | 48 +- BUILD/Languages/portuguese_br.lng | 56 +- BUILD/Languages/romanian.lng | 56 +- BUILD/Languages/russian.lng | 120 +- BUILD/Languages/slovenian.lng | 54 +- BUILD/Languages/spanish.lng | 48 +- BUILD/Languages/swedish.lng | 48 +- BUILD/Languages/turkish.lng | 46 +- BUILD/Resources.dat | Bin 296154 -> 296186 bytes Cleanup.cmd | 2 + FreeFileSync - wxWidgets v2.9.1 Beta.vcxproj | 310 ++ FreeFileSync.cbp | 206 +- FreeFileSync.vcxproj | 121 +- Makefile | 82 +- RealtimeSync/RealtimeSync.cbp | 84 +- RealtimeSync/RealtimeSync.vcxproj | 81 +- RealtimeSync/application.cpp | 16 +- RealtimeSync/functions.cpp | 10 +- RealtimeSync/functions.h | 2 +- RealtimeSync/guiGenerated.cpp | 246 -- RealtimeSync/guiGenerated.h | 110 - RealtimeSync/gui_generated.cpp | 246 ++ RealtimeSync/gui_generated.h | 110 + RealtimeSync/mainDialog.cpp | 459 --- RealtimeSync/mainDialog.h | 75 - RealtimeSync/main_dlg.cpp | 459 +++ RealtimeSync/main_dlg.h | 75 + RealtimeSync/makefile | 43 +- RealtimeSync/notify.cpp | 268 ++ RealtimeSync/notify.h | 40 + RealtimeSync/pch.h | 6 +- RealtimeSync/resources.cpp | 8 +- RealtimeSync/trayMenu.cpp | 282 -- RealtimeSync/trayMenu.h | 26 - RealtimeSync/tray_menu.cpp | 282 ++ RealtimeSync/tray_menu.h | 26 + RealtimeSync/watcher.cpp | 372 +- RealtimeSync/watcher.h | 4 +- RealtimeSync/xmlFreeFileSync.cpp | 106 - RealtimeSync/xmlFreeFileSync.h | 22 - RealtimeSync/xmlProcessing.cpp | 91 - RealtimeSync/xmlProcessing.h | 29 - RealtimeSync/xml_ffs.cpp | 104 + RealtimeSync/xml_ffs.h | 22 + RealtimeSync/xml_proc.cpp | 91 + RealtimeSync/xml_proc.h | 29 + algorithm.cpp | 107 +- algorithm.h | 4 +- comparison.cpp | 296 +- comparison.h | 15 +- fileHierarchy.cpp | 205 -- fileHierarchy.h | 1490 -------- file_hierarchy.cpp | 205 ++ file_hierarchy.h | 1500 ++++++++ library/CustomGrid.cpp | 2104 ----------- library/CustomGrid.h | 356 -- library/binary.cpp | 8 +- library/binary.h | 4 +- library/custom_grid.cpp | 2104 +++++++++++ library/custom_grid.h | 356 ++ library/dbFile.cpp | 462 --- library/dbFile.h | 26 - library/db_file.cpp | 486 +++ library/db_file.h | 26 + library/detectRenaming.cpp | 285 -- library/detectRenaming.h | 26 - library/detect_renaming.cpp | 285 ++ library/detect_renaming.h | 26 + library/dir_lock.cpp | 448 +++ library/dir_lock.h | 35 + library/errorLogging.cpp | 63 - library/errorLogging.h | 46 - library/error_log.cpp | 63 + library/error_log.h | 46 + library/filter.cpp | 38 +- library/filter.h | 2 +- library/iconBuffer.cpp | 484 --- library/iconBuffer.h | 63 - library/icon_buffer.cpp | 451 +++ library/icon_buffer.h | 62 + library/pch.h | 9 +- library/processXml.cpp | 1037 ------ library/processXml.h | 245 -- library/process_xml.cpp | 1137 ++++++ library/process_xml.h | 267 ++ library/resources.cpp | 10 +- library/softFilter.cpp | 10 - library/softFilter.h | 83 - library/soft_filter.cpp | 10 + library/soft_filter.h | 83 + library/statistics.cpp | 42 +- library/statistics.h | 2 + library/statusHandler.cpp | 33 - library/statusHandler.h | 105 - library/status_handler.cpp | 33 + library/status_handler.h | 105 + resource.rc | 2 +- shared/IFileOperation/FileOperation_Vista.vcxproj | 6 +- shared/IFileOperation/dll_main.cpp | 25 + shared/IFileOperation/dllmain.cpp | 27 - shared/IFileOperation/fileOp.cpp | 266 -- shared/IFileOperation/fileOp.h | 47 - shared/IFileOperation/file_op.cpp | 229 ++ shared/IFileOperation/file_op.h | 47 + shared/ShadowCopy/Shadow_2003.vcxproj | 2 +- shared/ShadowCopy/Shadow_XP.vcxproj | 2 +- shared/ShadowCopy/dll_main.cpp | 25 + shared/ShadowCopy/dllmain.cpp | 27 - shared/ShadowCopy/shadow.cpp | 139 +- shared/ShadowCopy/shadow.h | 2 +- shared/Taskbar_Seven/Taskbar_Seven.vcxproj | 2 +- shared/Taskbar_Seven/dll_main.cpp | 25 + shared/Taskbar_Seven/dllmain.cpp | 27 - shared/Taskbar_Seven/taskbar.cpp | 30 +- shared/appMain.cpp | 29 - shared/appMain.h | 27 - shared/app_main.cpp | 29 + shared/app_main.h | 27 + shared/assert_static.h | 37 + shared/buildInfo.h | 18 - shared/build_info.h | 18 + shared/checkExist.cpp | 54 - shared/checkExist.h | 19 - shared/check_exist.cpp | 83 + shared/check_exist.h | 25 + shared/com_error.h | 77 + shared/com_ptr.h | 186 + shared/com_util.h | 155 + shared/customButton.cpp | 308 -- shared/customButton.h | 42 - shared/customComboBox.cpp | 82 - shared/customComboBox.h | 35 - shared/customTooltip.cpp | 101 - shared/customTooltip.h | 27 - shared/custom_button.cpp | 308 ++ shared/custom_button.h | 42 + shared/custom_combo_box.cpp | 82 + shared/custom_combo_box.h | 35 + shared/custom_tooltip.cpp | 101 + shared/custom_tooltip.h | 27 + shared/debugNew.cpp | 59 - shared/debugNew.h | 95 - shared/debug_new.cpp | 59 + shared/debug_new.h | 95 + shared/dllLoader.cpp | 61 - shared/dllLoader.h | 47 - shared/dll_loader.cpp | 61 + shared/dll_loader.h | 47 + shared/dragAndDrop.cpp | 215 -- shared/dragAndDrop.h | 69 - shared/drag_n_drop.cpp | 219 ++ shared/drag_n_drop.h | 70 + shared/fileError.h | 33 - shared/fileHandling.cpp | 1584 --------- shared/fileHandling.h | 101 - shared/fileID.cpp | 74 - shared/fileID.h | 200 -- shared/fileIO.cpp | 181 - shared/fileIO.h | 98 - shared/fileTraverser.cpp | 421 --- shared/fileTraverser.h | 67 - shared/file_error.h | 40 + shared/file_handling.cpp | 1855 ++++++++++ shared/file_handling.h | 105 + shared/file_id.cpp | 74 + shared/file_id.h | 200 ++ shared/file_io.cpp | 195 ++ shared/file_io.h | 98 + shared/file_traverser.cpp | 421 +++ shared/file_traverser.h | 67 + shared/globalFunctions.cpp | 93 - shared/globalFunctions.h | 239 -- shared/global_func.cpp | 93 + shared/global_func.h | 239 ++ shared/guid.cpp | 18 +- shared/guid.h | 3 +- shared/helpProvider.cpp | 46 - shared/helpProvider.h | 17 - shared/help_provider.cpp | 46 + shared/help_provider.h | 17 + shared/localization.cpp | 24 +- shared/localization.h | 2 +- shared/lock.cpp | 8 +- shared/longPathPrefix.cpp | 61 - shared/longPathPrefix.h | 30 - shared/long_path_prefix.cpp | 61 + shared/long_path_prefix.h | 30 + shared/parallelCall.cpp | 159 - shared/parallelCall.h | 34 - shared/perf.h | 42 + shared/recycler.cpp | 42 +- shared/recycler.h | 4 +- shared/serialize.cpp | 6 +- shared/serialize.h | 4 +- shared/shadow.cpp | 204 +- shared/shadow.h | 22 +- shared/signal_processing.h | 166 + shared/standardPaths.cpp | 86 - shared/standardPaths.h | 26 - shared/standard_paths.cpp | 86 + shared/standard_paths.h | 26 + shared/staticAssert.h | 24 - shared/stringConv.h | 110 - shared/string_conv.h | 110 + shared/systemConstants.h | 28 - shared/systemFunctions.cpp | 45 - shared/systemFunctions.h | 24 - shared/system_constants.h | 28 + shared/system_func.cpp | 49 + shared/system_func.h | 24 + shared/taskbar.cpp | 28 +- shared/taskbar.h | 2 +- shared/toggleButton.cpp | 50 - shared/toggleButton.h | 49 - shared/toggle_button.cpp | 50 + shared/toggle_button.h | 49 + shared/util.cpp | 42 +- shared/util.h | 12 +- shared/xmlBase.cpp | 400 --- shared/xmlBase.h | 210 -- shared/xmlError.h | 41 - shared/xml_base.cpp | 400 +++ shared/xml_base.h | 210 ++ shared/xml_error.h | 41 + shared/zstring.cpp | 36 +- shared/zstring.h | 55 +- structures.cpp | 72 +- structures.h | 40 +- synchronization.cpp | 285 +- synchronization.h | 10 +- ui/MainDialog.cpp | 3804 -------------------- ui/MainDialog.h | 337 -- ui/SmallDialogs.cpp | 1026 ------ ui/SmallDialogs.h | 59 - ui/batchConfig.cpp | 801 ----- ui/batchConfig.h | 96 - ui/batchStatusHandler.cpp | 390 --- ui/batchStatusHandler.h | 57 - ui/batch_config.cpp | 840 +++++ ui/batch_config.h | 96 + ui/batch_status_handler.cpp | 390 +++ ui/batch_status_handler.h | 57 + ui/checkVersion.cpp | 162 - ui/checkVersion.h | 18 - ui/check_version.cpp | 174 + ui/check_version.h | 18 + ui/folderPair.h | 206 -- ui/folder_pair.h | 206 ++ ui/gridView.cpp | 570 --- ui/gridView.h | 237 -- ui/grid_view.cpp | 570 +++ ui/grid_view.h | 237 ++ ui/guiGenerated.cpp | 3768 -------------------- ui/guiGenerated.h | 1443 -------- ui/guiStatusHandler.cpp | 397 --- ui/guiStatusHandler.h | 73 - ui/gui_generated.cpp | 3782 ++++++++++++++++++++ ui/gui_generated.h | 1042 ++++++ ui/gui_status_handler.cpp | 397 +++ ui/gui_status_handler.h | 73 + ui/isNullFilter.h | 24 - ui/is_null_filter.h | 24 + ui/main_dlg.cpp | 3852 +++++++++++++++++++++ ui/main_dlg.h | 337 ++ ui/messagePopup.cpp | 188 - ui/messagePopup.h | 78 - ui/mouseMoveWindow.cpp | 26 - ui/mouseMoveWindow.h | 36 - ui/mouse_move_dlg.cpp | 26 + ui/mouse_move_dlg.h | 36 + ui/msg_popup.cpp | 188 + ui/msg_popup.h | 78 + ui/progressIndicator.cpp | 970 ------ ui/progressIndicator.h | 77 - ui/progress_indicator.cpp | 970 ++++++ ui/progress_indicator.h | 77 + ui/search.cpp | 6 +- ui/search.h | 2 +- ui/small_dlgs.cpp | 1028 ++++++ ui/small_dlgs.h | 59 + ui/sorting.h | 48 +- ui/switchToGui.cpp | 27 - ui/switchToGui.h | 29 - ui/switch_to_gui.cpp | 27 + ui/switch_to_gui.h | 29 + ui/syncConfig.cpp | 477 --- ui/syncConfig.h | 99 - ui/sync_cfg.cpp | 477 +++ ui/sync_cfg.h | 99 + ui/trayIcon.cpp | 213 -- ui/trayIcon.h | 34 - ui/tray_icon.cpp | 213 ++ ui/tray_icon.h | 34 + version/version.h | 4 +- version/version.rc | 4 +- 319 files changed, 34338 insertions(+), 32546 deletions(-) create mode 100644 BUILD/Help/html/Unbenannt 1.odf create mode 100644 FreeFileSync - wxWidgets v2.9.1 Beta.vcxproj delete mode 100644 RealtimeSync/guiGenerated.cpp delete mode 100644 RealtimeSync/guiGenerated.h create mode 100644 RealtimeSync/gui_generated.cpp create mode 100644 RealtimeSync/gui_generated.h delete mode 100644 RealtimeSync/mainDialog.cpp delete mode 100644 RealtimeSync/mainDialog.h create mode 100644 RealtimeSync/main_dlg.cpp create mode 100644 RealtimeSync/main_dlg.h create mode 100644 RealtimeSync/notify.cpp create mode 100644 RealtimeSync/notify.h delete mode 100644 RealtimeSync/trayMenu.cpp delete mode 100644 RealtimeSync/trayMenu.h create mode 100644 RealtimeSync/tray_menu.cpp create mode 100644 RealtimeSync/tray_menu.h delete mode 100644 RealtimeSync/xmlFreeFileSync.cpp delete mode 100644 RealtimeSync/xmlFreeFileSync.h delete mode 100644 RealtimeSync/xmlProcessing.cpp delete mode 100644 RealtimeSync/xmlProcessing.h create mode 100644 RealtimeSync/xml_ffs.cpp create mode 100644 RealtimeSync/xml_ffs.h create mode 100644 RealtimeSync/xml_proc.cpp create mode 100644 RealtimeSync/xml_proc.h delete mode 100644 fileHierarchy.cpp delete mode 100644 fileHierarchy.h create mode 100644 file_hierarchy.cpp create mode 100644 file_hierarchy.h delete mode 100644 library/CustomGrid.cpp delete mode 100644 library/CustomGrid.h create mode 100644 library/custom_grid.cpp create mode 100644 library/custom_grid.h delete mode 100644 library/dbFile.cpp delete mode 100644 library/dbFile.h create mode 100644 library/db_file.cpp create mode 100644 library/db_file.h delete mode 100644 library/detectRenaming.cpp delete mode 100644 library/detectRenaming.h create mode 100644 library/detect_renaming.cpp create mode 100644 library/detect_renaming.h create mode 100644 library/dir_lock.cpp create mode 100644 library/dir_lock.h delete mode 100644 library/errorLogging.cpp delete mode 100644 library/errorLogging.h create mode 100644 library/error_log.cpp create mode 100644 library/error_log.h delete mode 100644 library/iconBuffer.cpp delete mode 100644 library/iconBuffer.h create mode 100644 library/icon_buffer.cpp create mode 100644 library/icon_buffer.h delete mode 100644 library/processXml.cpp delete mode 100644 library/processXml.h create mode 100644 library/process_xml.cpp create mode 100644 library/process_xml.h delete mode 100644 library/softFilter.cpp delete mode 100644 library/softFilter.h create mode 100644 library/soft_filter.cpp create mode 100644 library/soft_filter.h delete mode 100644 library/statusHandler.cpp delete mode 100644 library/statusHandler.h create mode 100644 library/status_handler.cpp create mode 100644 library/status_handler.h create mode 100644 shared/IFileOperation/dll_main.cpp delete mode 100644 shared/IFileOperation/dllmain.cpp delete mode 100644 shared/IFileOperation/fileOp.cpp delete mode 100644 shared/IFileOperation/fileOp.h create mode 100644 shared/IFileOperation/file_op.cpp create mode 100644 shared/IFileOperation/file_op.h create mode 100644 shared/ShadowCopy/dll_main.cpp delete mode 100644 shared/ShadowCopy/dllmain.cpp create mode 100644 shared/Taskbar_Seven/dll_main.cpp delete mode 100644 shared/Taskbar_Seven/dllmain.cpp delete mode 100644 shared/appMain.cpp delete mode 100644 shared/appMain.h create mode 100644 shared/app_main.cpp create mode 100644 shared/app_main.h create mode 100644 shared/assert_static.h delete mode 100644 shared/buildInfo.h create mode 100644 shared/build_info.h delete mode 100644 shared/checkExist.cpp delete mode 100644 shared/checkExist.h create mode 100644 shared/check_exist.cpp create mode 100644 shared/check_exist.h create mode 100644 shared/com_error.h create mode 100644 shared/com_ptr.h create mode 100644 shared/com_util.h delete mode 100644 shared/customButton.cpp delete mode 100644 shared/customButton.h delete mode 100644 shared/customComboBox.cpp delete mode 100644 shared/customComboBox.h delete mode 100644 shared/customTooltip.cpp delete mode 100644 shared/customTooltip.h create mode 100644 shared/custom_button.cpp create mode 100644 shared/custom_button.h create mode 100644 shared/custom_combo_box.cpp create mode 100644 shared/custom_combo_box.h create mode 100644 shared/custom_tooltip.cpp create mode 100644 shared/custom_tooltip.h delete mode 100644 shared/debugNew.cpp delete mode 100644 shared/debugNew.h create mode 100644 shared/debug_new.cpp create mode 100644 shared/debug_new.h delete mode 100644 shared/dllLoader.cpp delete mode 100644 shared/dllLoader.h create mode 100644 shared/dll_loader.cpp create mode 100644 shared/dll_loader.h delete mode 100644 shared/dragAndDrop.cpp delete mode 100644 shared/dragAndDrop.h create mode 100644 shared/drag_n_drop.cpp create mode 100644 shared/drag_n_drop.h delete mode 100644 shared/fileError.h delete mode 100644 shared/fileHandling.cpp delete mode 100644 shared/fileHandling.h delete mode 100644 shared/fileID.cpp delete mode 100644 shared/fileID.h delete mode 100644 shared/fileIO.cpp delete mode 100644 shared/fileIO.h delete mode 100644 shared/fileTraverser.cpp delete mode 100644 shared/fileTraverser.h create mode 100644 shared/file_error.h create mode 100644 shared/file_handling.cpp create mode 100644 shared/file_handling.h create mode 100644 shared/file_id.cpp create mode 100644 shared/file_id.h create mode 100644 shared/file_io.cpp create mode 100644 shared/file_io.h create mode 100644 shared/file_traverser.cpp create mode 100644 shared/file_traverser.h delete mode 100644 shared/globalFunctions.cpp delete mode 100644 shared/globalFunctions.h create mode 100644 shared/global_func.cpp create mode 100644 shared/global_func.h delete mode 100644 shared/helpProvider.cpp delete mode 100644 shared/helpProvider.h create mode 100644 shared/help_provider.cpp create mode 100644 shared/help_provider.h delete mode 100644 shared/longPathPrefix.cpp delete mode 100644 shared/longPathPrefix.h create mode 100644 shared/long_path_prefix.cpp create mode 100644 shared/long_path_prefix.h delete mode 100644 shared/parallelCall.cpp delete mode 100644 shared/parallelCall.h create mode 100644 shared/perf.h create mode 100644 shared/signal_processing.h delete mode 100644 shared/standardPaths.cpp delete mode 100644 shared/standardPaths.h create mode 100644 shared/standard_paths.cpp create mode 100644 shared/standard_paths.h delete mode 100644 shared/staticAssert.h delete mode 100644 shared/stringConv.h create mode 100644 shared/string_conv.h delete mode 100644 shared/systemConstants.h delete mode 100644 shared/systemFunctions.cpp delete mode 100644 shared/systemFunctions.h create mode 100644 shared/system_constants.h create mode 100644 shared/system_func.cpp create mode 100644 shared/system_func.h delete mode 100644 shared/toggleButton.cpp delete mode 100644 shared/toggleButton.h create mode 100644 shared/toggle_button.cpp create mode 100644 shared/toggle_button.h delete mode 100644 shared/xmlBase.cpp delete mode 100644 shared/xmlBase.h delete mode 100644 shared/xmlError.h create mode 100644 shared/xml_base.cpp create mode 100644 shared/xml_base.h create mode 100644 shared/xml_error.h delete mode 100644 ui/MainDialog.cpp delete mode 100644 ui/MainDialog.h delete mode 100644 ui/SmallDialogs.cpp delete mode 100644 ui/SmallDialogs.h delete mode 100644 ui/batchConfig.cpp delete mode 100644 ui/batchConfig.h delete mode 100644 ui/batchStatusHandler.cpp delete mode 100644 ui/batchStatusHandler.h create mode 100644 ui/batch_config.cpp create mode 100644 ui/batch_config.h create mode 100644 ui/batch_status_handler.cpp create mode 100644 ui/batch_status_handler.h delete mode 100644 ui/checkVersion.cpp delete mode 100644 ui/checkVersion.h create mode 100644 ui/check_version.cpp create mode 100644 ui/check_version.h delete mode 100644 ui/folderPair.h create mode 100644 ui/folder_pair.h delete mode 100644 ui/gridView.cpp delete mode 100644 ui/gridView.h create mode 100644 ui/grid_view.cpp create mode 100644 ui/grid_view.h delete mode 100644 ui/guiGenerated.cpp delete mode 100644 ui/guiGenerated.h delete mode 100644 ui/guiStatusHandler.cpp delete mode 100644 ui/guiStatusHandler.h create mode 100644 ui/gui_generated.cpp create mode 100644 ui/gui_generated.h create mode 100644 ui/gui_status_handler.cpp create mode 100644 ui/gui_status_handler.h delete mode 100644 ui/isNullFilter.h create mode 100644 ui/is_null_filter.h create mode 100644 ui/main_dlg.cpp create mode 100644 ui/main_dlg.h delete mode 100644 ui/messagePopup.cpp delete mode 100644 ui/messagePopup.h delete mode 100644 ui/mouseMoveWindow.cpp delete mode 100644 ui/mouseMoveWindow.h create mode 100644 ui/mouse_move_dlg.cpp create mode 100644 ui/mouse_move_dlg.h create mode 100644 ui/msg_popup.cpp create mode 100644 ui/msg_popup.h delete mode 100644 ui/progressIndicator.cpp delete mode 100644 ui/progressIndicator.h create mode 100644 ui/progress_indicator.cpp create mode 100644 ui/progress_indicator.h create mode 100644 ui/small_dlgs.cpp create mode 100644 ui/small_dlgs.h delete mode 100644 ui/switchToGui.cpp delete mode 100644 ui/switchToGui.h create mode 100644 ui/switch_to_gui.cpp create mode 100644 ui/switch_to_gui.h delete mode 100644 ui/syncConfig.cpp delete mode 100644 ui/syncConfig.h create mode 100644 ui/sync_cfg.cpp create mode 100644 ui/sync_cfg.h delete mode 100644 ui/trayIcon.cpp delete mode 100644 ui/trayIcon.h create mode 100644 ui/tray_icon.cpp create mode 100644 ui/tray_icon.h diff --git a/Application.cpp b/Application.cpp index d0a05124..120bd567 100644 --- a/Application.cpp +++ b/Application.cpp @@ -5,36 +5,37 @@ // ************************************************************************** // #include "application.h" -#include "ui/mainDialog.h" +#include "ui/main_dlg.h" #include #include "comparison.h" #include "algorithm.h" #include "synchronization.h" #include -#include "ui/batchStatusHandler.h" -#include "ui/checkVersion.h" +#include "ui/batch_status_handler.h" +#include "ui/check_version.h" #include "library/filter.h" #include -#include "shared/xmlBase.h" +#include "shared/xml_base.h" #include "library/resources.h" -#include "ui/switchToGui.h" -#include "shared/standardPaths.h" +#include "ui/switch_to_gui.h" +#include "shared/standard_paths.h" #include "shared/localization.h" -#include "shared/appMain.h" +#include "shared/app_main.h" #include -#include "shared/fileHandling.h" -#include "shared/stringConv.h" +#include "shared/file_handling.h" +#include "shared/string_conv.h" #ifdef FFS_LINUX #include #endif -using FreeFileSync::CustomLocale; -using FreeFileSync::SwitchToGui; +using ffs3::CustomLocale; +using ffs3::SwitchToGui; IMPLEMENT_APP(Application) + bool Application::OnInit() { returnValue = 0; @@ -50,7 +51,7 @@ bool Application::OnInit() void Application::OnStartApplication(wxIdleEvent&) { - using namespace FreeFileSync; + using namespace ffs3; Disconnect(wxEVT_IDLE, wxIdleEventHandler(Application::OnStartApplication), NULL, this); @@ -63,7 +64,7 @@ void Application::OnStartApplication(wxIdleEvent&) ~HandleAppExit() { - if (!FreeFileSync::AppMainWindow::mainWindowWasSet()) + if (!ffs3::AppMainWindow::mainWindowWasSet()) wxTheApp->ExitMainLoop(); //quit application, if no main window was set (batch silent mode) } @@ -74,7 +75,7 @@ void Application::OnStartApplication(wxIdleEvent&) SetAppName(wxT("FreeFileSync")); #ifdef FFS_LINUX - ::gtk_rc_parse(FreeFileSync::wxToZ(FreeFileSync::getResourceDir()) + "styles.rc"); //remove inner border from bitmap buttons + ::gtk_rc_parse(ffs3::wxToZ(ffs3::getResourceDir()) + "styles.rc"); //remove inner border from bitmap buttons #endif @@ -104,16 +105,16 @@ void Application::OnStartApplication(wxIdleEvent&) try //load global settings from XML { if (fileExists(wxToZ(xmlAccess::getGlobalConfigFile()))) - xmlAccess::readGlobalSettings(globalSettings); + xmlAccess::readConfig(globalSettings); //else: globalSettings already has default values } catch (const xmlAccess::XmlError& error) { //show messagebox and continue if (error.getSeverity() == xmlAccess::XmlError::WARNING) - ; //wxMessageBox(error.show(), _("Warning"), wxOK | wxICON_WARNING); -> ignore parsing errors: should be migration problems only *cross-fingers* + ; //wxMessageBox(error.msg(), _("Warning"), wxOK | wxICON_WARNING); -> ignore parsing errors: should be migration problems only *cross-fingers* else - wxMessageBox(error.show(), _("Error"), wxOK | wxICON_ERROR); + wxMessageBox(error.msg(), _("Error"), wxOK | wxICON_ERROR); } //set program language @@ -161,10 +162,10 @@ int Application::OnRun() catch (const std::exception& e) //catch all STL exceptions { //unfortunately it's not always possible to display a message box in this erroneous situation, however (non-stream) file output always works! - wxFile safeOutput(FreeFileSync::getConfigDir() + wxT("LastError.txt"), wxFile::write); + wxFile safeOutput(ffs3::getConfigDir() + wxT("LastError.txt"), wxFile::write); safeOutput.Write(wxString::FromAscii(e.what())); - wxMessageBox(wxString::FromAscii(e.what()), _("An exception occured!"), wxOK | wxICON_ERROR); + wxMessageBox(wxString::FromAscii(e.what()), _("An exception occurred!"), wxOK | wxICON_ERROR); return -9; } @@ -179,11 +180,11 @@ int Application::OnExit() try //save global settings to XML { - xmlAccess::writeGlobalSettings(globalSettings); + xmlAccess::writeConfig(globalSettings); } catch (const xmlAccess::XmlError& error) { - wxMessageBox(error.show(), _("Error"), wxOK | wxICON_ERROR); + wxMessageBox(error.msg(), _("Error"), wxOK | wxICON_ERROR); } return 0; @@ -205,18 +206,18 @@ void Application::runBatchMode(const wxString& filename, xmlAccess::XmlGlobalSet xmlAccess::XmlBatchConfig batchCfg; //structure to receive gui settings try { - xmlAccess::readBatchConfig(filename, batchCfg); + xmlAccess::readConfig(filename, batchCfg); } catch (const xmlAccess::XmlError& error) { - wxMessageBox(error.show(), _("Error"), wxOK | wxICON_ERROR); + wxMessageBox(error.msg(), _("Error"), wxOK | wxICON_ERROR); return; } //all settings have been read successfully... //regular check for program updates -> disabled for batch //if (!batchCfg.silent) - // FreeFileSync::checkForUpdatePeriodically(globSettings.lastUpdateCheck); + // ffs3::checkForUpdatePeriodically(globSettings.lastUpdateCheck); try //begin of synchronization process (all in one try-catch block) { @@ -230,14 +231,14 @@ void Application::runBatchMode(const wxString& filename, xmlAccess::XmlGlobalSet statusHandler.reset(new BatchStatusHandler(false, filename, NULL, batchCfg.handleError, switchBatchToGui, returnValue)); //COMPARE DIRECTORIES - FreeFileSync::FolderComparison folderCmp; - FreeFileSync::CompareProcess comparison(batchCfg.mainCfg.handleSymlinks, - batchCfg.mainCfg.hidden.fileTimeTolerance, + ffs3::FolderComparison folderCmp; + ffs3::CompareProcess comparison(batchCfg.mainCfg.handleSymlinks, + globSettings.fileTimeTolerance, globSettings.ignoreOneHourDiff, globSettings.optDialogs, statusHandler.get()); - comparison.startCompareProcess(FreeFileSync::extractCompareCfg(batchCfg.mainCfg), + comparison.startCompareProcess(ffs3::extractCompareCfg(batchCfg.mainCfg), batchCfg.mainCfg.compareVar, folderCmp); @@ -249,23 +250,24 @@ void Application::runBatchMode(const wxString& filename, xmlAccess::XmlGlobalSet } //START SYNCHRONIZATION - FreeFileSync::SyncProcess synchronization( + ffs3::SyncProcess synchronization( globSettings.optDialogs, - batchCfg.mainCfg.hidden.verifyFileCopy, + globSettings.verifyFileCopy, globSettings.copyLockedFiles, + globSettings.copyFilePermissions, *statusHandler); - const std::vector syncProcessCfg = FreeFileSync::extractSyncCfg(batchCfg.mainCfg); + const std::vector syncProcessCfg = ffs3::extractSyncCfg(batchCfg.mainCfg); assert(syncProcessCfg.size() == folderCmp.size()); synchronization.startSynchronizationProcess(syncProcessCfg, folderCmp); //play (optional) sound notification after sync has completed (GUI and batch mode) - const wxString soundFile = FreeFileSync::getResourceDir() + wxT("Sync_Complete.wav"); - if (FreeFileSync::fileExists(FreeFileSync::wxToZ(soundFile))) + const wxString soundFile = ffs3::getResourceDir() + wxT("Sync_Complete.wav"); + if (ffs3::fileExists(ffs3::wxToZ(soundFile))) wxSound::Play(soundFile, wxSOUND_ASYNC); } - catch (FreeFileSync::AbortThisProcess&) //exit used by statusHandler + catch (ffs3::AbortThisProcess&) //exit used by statusHandler { if (returnValue >= 0) returnValue = -12; diff --git a/Application.h b/Application.h index cf69890d..bfc4a45f 100644 --- a/Application.h +++ b/Application.h @@ -8,7 +8,7 @@ #define FREEFILESYNCAPP_H #include -#include "library/processXml.h" +#include "library/process_xml.h" class Application : public wxApp diff --git a/BUILD/Changelog.txt b/BUILD/Changelog.txt index a896ab4a..693d96fc 100644 --- a/BUILD/Changelog.txt +++ b/BUILD/Changelog.txt @@ -2,6 +2,25 @@ |FreeFileSync| -------------- +Changelog v3.9 +-------------- +Advanced locking strategy to allow multiple processes synchronize the same directories (e.g. via network share) +Merge multiple *.ffs_batch, *.ffs_gui files or combinations of both via drag & drop +Copy file and folder permissions (requires admin rights): + - Windows: owner, group, DACL, SACL + - Linux: owner, group, permissions + - correctly handle Symbolic Links + - new option in global settings +Compare by content evaluates Symbolic Links +32-Bit build compiled with MinGW/GCC to preserve Windows 2000 compatibility +RealtimeSync: Handle requests for device removal (USB stick) while monitoring +Sort by filesize: group symlinks before directories +Added macros %week%, %month%, %year% for creating time-stamped directories +Touch database file when changes occured only +Moved settings "file time tolerance" and "verify copied files" to GlobalSettings.xml +Updated translation files + + Changelog v3.8 -------------- New options handling Symlinks: ignore/direct/follow => warning: new database format for mode diff --git a/BUILD/FreeFileSync.chm b/BUILD/FreeFileSync.chm index 0772a6ac..cfcf6752 100644 Binary files a/BUILD/FreeFileSync.chm and b/BUILD/FreeFileSync.chm differ diff --git a/BUILD/Help/Table of Contents.hhc b/BUILD/Help/Table of Contents.hhc index e57b8399..35ad8d46 100644 --- a/BUILD/Help/Table of Contents.hhc +++ b/BUILD/Help/Table of Contents.hhc @@ -53,7 +53,7 @@
  • - +
  • diff --git a/BUILD/Help/html/Features.html b/BUILD/Help/html/Features.html index 195794b2..0bf33088 100644 --- a/BUILD/Help/html/Features.html +++ b/BUILD/Help/html/Features.html @@ -3,9 +3,9 @@ - + - + @@ -110,6 +111,9 @@ regular backups with macros %time%, %date% within directory names

  • Copy file and folder create/access/modification times when synchronizing

    +

  • Advanced + locking strategy to allow multiple synchronization processes (e.g. + multiple writers, same network share)

    \ No newline at end of file diff --git a/BUILD/Help/html/Unbenannt 1.odf b/BUILD/Help/html/Unbenannt 1.odf new file mode 100644 index 00000000..e51231f5 Binary files /dev/null and b/BUILD/Help/html/Unbenannt 1.odf differ diff --git a/BUILD/Help/html/advanced/Batch Scripting.html b/BUILD/Help/html/advanced/Batch Scripting.html index 3629edf3..c7436792 100644 --- a/BUILD/Help/html/advanced/Batch Scripting.html +++ b/BUILD/Help/html/advanced/Batch Scripting.html @@ -5,7 +5,7 @@ - + @@ -17,6 +17,7 @@ H3 { margin-bottom: 0.21cm } H3.western { font-family: "Arial", sans-serif } H3.cjk { font-family: "MS Mincho" } + H3.ctl { font-family: "Mangal" } A:link { so-language: zxx } --> @@ -34,8 +35,9 @@ some general hints for custom *.cmd and *.bat files.


    Example: -(A simple locking facility when sync'ing with multiple computers in -parallel)

    +A simple locking facility – (Note: +FreeFileSync already has a more powerful directory locking mechanism +implemented that allows multiple writers in parallel)

      @@ -68,7 +70,7 @@ parallel)

      wscript C:\Program files\FreeFileSync\Invisible.vbs C:\MyBatchFile.cmd

      -
        +
       

        @@ -80,8 +82,8 @@ parallel)

        Files\FreeFileSync\FreeFileSync.exe" "H:\Silent_Config.ffs_batch"
        if not errorlevel 0 (
          ::if - something went wrong, add special treatment here
          echo - Errors occurred during synchronization...
          pause
        )

        + something went wrong, add special treatment here
          echo + Errors occurred during synchronization...
          pause
        )


      diff --git a/BUILD/Help/html/advanced/DragDrop.html b/BUILD/Help/html/advanced/DragDrop.html index e9e580ca..1f08a07a 100644 --- a/BUILD/Help/html/advanced/DragDrop.html +++ b/BUILD/Help/html/advanced/DragDrop.html @@ -3,9 +3,9 @@ - + - + @@ -45,6 +46,9 @@ supported in various situations:

    • drag & drop *.ffs_batch files onto the batch dialog to display and edit the batch configuration

      +

    • merge + multiple *.ffs_batch, *.ffs_gui files or combinations of both via + drag & drop

    diff --git a/BUILD/Help/html/advanced/ExcludeSubfolder.html b/BUILD/Help/html/advanced/ExcludeSubfolder.html index 550ba633..239d88b9 100644 --- a/BUILD/Help/html/advanced/ExcludeSubfolder.html +++ b/BUILD/Help/html/advanced/ExcludeSubfolder.html @@ -3,9 +3,9 @@ - + - + @@ -17,18 +17,68 @@ H3 { margin-bottom: 0.21cm } H3.western { font-family: "Arial", sans-serif } H3.cjk { font-family: "MS Mincho" } + H3.ctl { font-family: "Mangal" } A:link { so-language: zxx } --> - -

    Exclude -subfolders from synchronization

    + +

    Exclude via +filter

    +

    Excluding +files and directories woks by specifying a phrase that is compared +against a file or directory path. Only if the file/directory matches +at least one entry in the include list and none of the entries in the +exclude list it passes filtering. The phrase is also a file or +directory name, but it must be relative to the base sync-directory +and may additionally include wildcards like '*' or '?'.


    -

    In -order to synchronize all files from base synchronization directories -excluding all subfolders, simply set up a filter like this:

    +

    Example: +(Mirror-Sync from C:\Source +to D:\Target)

    +

    +

    Exclude + single file C:\Source\file.txt:
         Filter: + \file.txt

    +

    Exclude + single folder C:\Source\sample\subfolder:
        Filter: + \sample\subfolder

    +

    Exclude + all *.tmp + files + beyond subfolder:
        Filter: + \sample\subfolder\*.tmp

    +

    Exclude + all files and folders named CVS + within + arbitrary sub directories:
        Filter: + *\CVS

    +

    Exclude + all files and folders that have test + as + part of their name:
        Filter: + *test*

    +

    +

    +


    +

    +

    +

    + Note:
    A filter phrase + „\fileOrDir” + matches both a file or a directory named „fileOrDir”. + In most cases there is no need to distinguish between a phrase to be + used for files or directories. In cases where it is clear you want + to process directories only, you can give a hint by adding a + backslash: „\fileOrDir\”. + Now this filter will be matched against directories only.

    +

    +

    +


    +

    +

    Example: +(Exclude all sub folders)

    Include: *
    Exclude: @@ -37,7 +87,17 @@ excluding all subfolders, simply set up a filter like this:

    This will exclude all objects within the two directories that end with a -'\' character, which is -interpreted as the end of a directory name.

    +'\' +character, which is interpreted as the end of a directory name.

    +


    +

    +

    +

    + Note:
    In most cases + specifying a filter phrase manually is not necessary! You can + exclude files, directories and even whole lists of both directly on + main dialog via right-click context menu.

    +

    +

    \ No newline at end of file diff --git a/BUILD/Help/html/advanced/TimeStamped.html b/BUILD/Help/html/advanced/TimeStamped.html index 6428243c..392efea2 100644 --- a/BUILD/Help/html/advanced/TimeStamped.html +++ b/BUILD/Help/html/advanced/TimeStamped.html @@ -3,9 +3,9 @@ - + - + @@ -17,6 +17,7 @@ H3 { margin-bottom: 0.21cm } H3.western { font-family: "Arial", sans-serif } H3.cjk { font-family: "MS Mincho" } + H3.ctl { font-family: "Mangal" } A:link { so-language: zxx } --> @@ -27,8 +28,8 @@ backups with time-stamped directory names


    You can -use macros %time%, %date% -within directory names you want to synchronize.

    +use special macros within directory names that are expanded during +synchronization.


    Example:

    @@ -38,7 +39,7 @@ which you want to backup each day into a time-stamped target directory like "C:\Target_2009-10-08". All that needs to be done is setting up base directories like these:

      -

      +

        Source folder: "C:\Source"
        Target @@ -55,5 +56,23 @@ synchronization. In order to further automate this process, you can create a *.ffs_batch file with this configuration and choose "ignore errors" to avoid the warning that target directory is not (yet) existing.

        +


        +

        +

        Overview:

        +
          +

          +

            +

            %time%  - + current time, format [hhmmss], e.g. "201340"
            %date%  - + current date, e.g. "2010-07-13"
            %week%  - + calendar week, e.g. "28"
            %month% - + current month, e.g. "July"
            %year%  - + current year, e.g. "2010"

            +
          +
          +

          +
        +


        +

        \ No newline at end of file diff --git a/BUILD/Languages/chinese_simple.lng b/BUILD/Languages/chinese_simple.lng index 1b9d610a..6d621a2f 100644 --- a/BUILD/Languages/chinese_simple.lng +++ b/BUILD/Languages/chinese_simple.lng @@ -1,45 +1,35 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE - Byte - 字节 - GB - GB - MB - MB - day(s) - 日 - hour(s) - 时 - kB - kB - min - 分 - sec - 秒 %x / %y objects deleted successfully %x / %y 个对象被成功删除 %x Byte - +%x 字节 %x GB - +%x GB +%x MB %x MB - %x PB - +%x PB %x TB - +%x TB +%x day(s) +%x 天 %x directories %x 目录 %x files %x 个文件 -%x is not a valid FreeFileSync batch file! -%x 不是有效的 FreeFileSync 批处理文件 +%x hour(s) +%x 小时 %x kB - +%x KB +%x min +%x 分 %x of %y rows in view -%x of %y 横向视图 +%y 行中的 %x 行可见 %x of 1 row in view -%x of 1 行视图 +%x of 1 行可见 +%x sec +%x 秒 %x% %x% &Abort @@ -99,7 +89,7 @@ &Yes 是(&Y) (Build: %x) - +(Build: %x) (Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".) (请注意只有FAT/FAT32分区受此问题影响!\n在所有其他情况下你可禁用\"忽略一小时差异\"这一选项.) (Requires an Internet connection!) @@ -161,7 +151,7 @@ <最后会话> - +<符号连接> <多选> A newer version of FreeFileSync is available: @@ -182,7 +172,7 @@ Add folder pair 添加成对文件夹 All directories in sync! 所有目录同步! -An exception occured! +An exception occurred! 发生异常! As a result the files are separated into the following categories: 其结果是文件分为以下几类: @@ -233,7 +223,7 @@ Compare by \"File size and date\" Compare by... 比较选项... Comparing content of files %x -正在比较文件内容的百分比 %x +正在比较文件 %x 的内容 Comparing content... 正在比较文件内容... Comparing files by content failed. @@ -266,6 +256,8 @@ Continue 继续 Conversion error: 转换错误: +Copy filesystem permissions +复制文件系统的权限 Copy from left to right 从左侧复制到右侧 Copy from left to right overwriting @@ -278,16 +270,16 @@ Copy locked files 复制被锁定的文件 Copy new or updated files to right folder. 复制新的或修改过的文件到右侧文件夹 -Copy shared or locked files using Volume Shadow Copy Service -使用卷影复制服务来复制共享或锁定的文件 +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) +通过卷影复制服务复制共享或锁定的文件\n(需要管理员权限) Copy to clipboard\tCTRL+C 复制到剪贴板\tCTRL+C Copying Symbolic Link %x overwriting %y - +正在复制符号连接 %x 覆盖 %y Copying Symbolic Link %x to %y - +正在复制符号连接 %x 到 %y Copying file %x overwriting %y - +正在复制文件 %x 覆盖 %y Copying file %x to %y 正复制文件 %x 到 %y Could not determine volume name for file: @@ -335,7 +327,7 @@ Delete or overwrite files permanently Delete permanently 永久性删除 Deleting Symbolic Link %x - +正在删除符号连接 %x Deleting file %x 正删除文件 %x Deleting folder %x @@ -345,7 +337,7 @@ Deletion handling Description 描述 Direct - +直接 Directories are dependent! Be careful when setting up synchronization rules: 目录有依赖性！在设立同步规则时请小心: Directories to watch @@ -384,6 +376,8 @@ Error 错误 Error changing modification time: 改变修改时间时出错: +Error copying file permissions: +复制文件权限时出错: Error copying file: 复制文件出错: Error copying locked file %x! @@ -418,14 +412,14 @@ Error reading from synchronization database: 从同步数据库中读取时出错: Error resolving symbolic link: 解决符号链接出错: +Error setting privilege: +设置权限时出错: Error starting Volume Shadow Copy Service! 启动卷影复制服务时出错! Error traversing directory: 遍历目录出错: Error when monitoring directories. 监视目录时出错. -Error writing file attributes: -写文件属性出错: Error writing file: 写入文件出错: Error writing to synchronization database: @@ -503,13 +497,13 @@ Find what: Folder Comparison and Synchronization 文件夹比较与同步 Follow - +跟随 Free disk space available: 可用磁盘空间: FreeFileSync Batch Job FreeFileSync 批处理作业 FreeFileSync at Sourceforge -FreeFileSync at Sourceforge +Sourceforge上的FreeFileSync FreeFileSync batch file FreeFileSync 批处理文件 FreeFileSync configuration @@ -573,7 +567,7 @@ Identify and propagate changes on both sides using a database. Deletions and con If you like FFS 如果你喜欢 FFS Ignore - +忽略 Ignore 1-hour file time difference 忽略1小时文件时间差异 Ignore errors @@ -598,6 +592,8 @@ Initial synchronization: 初始化同步: Integrate external applications into context menu. The following macros are available: 集成外部应用程序到右键菜单. 如下宏可用: +Invalid FreeFileSync config file! +无效的 FreeFileSync 配置文件! Leave as unresolved conflict 遗留为未解决的冲突 Left @@ -633,7 +629,7 @@ Move files into a time-stamped subdirectory Moving %x to Recycle Bin 移动 %x 到回收站 Moving Symbolic Link %x to user-defined directory %y - +正在移动符号连接 %x 到用户定义目录 %y Moving file %x to user-defined directory %y 移动文件 %x 到用户定义目录 %y Moving folder %x to user-defined directory %y @@ -678,7 +674,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! 计划的目录删除与其子目录和文件有冲突! Please run a Compare first before synchronizing! 同步之前请先进行对比 -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. 按\"切换\"可打开FreeFileSync图形用户界面模块. Processing folder pair: 正在处理成对文件夹: @@ -794,12 +790,12 @@ Stop 停止 Swap sides 两侧互换 -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... 切换至FreeFileSync图形用户界面模块... Symbolic Link handling - +正在处理符号连接 Symlinks %x have the same date but a different target! - +符号连接 %x 有相同的日期但目标不同! Synchronization Preview 同步预览 Synchronization aborted! @@ -825,7 +821,7 @@ Target directory already existing! Target file already existing! 目标文件已经存在! The command line is executed each time:\n- all directories become available (e.g. USB stick insert)\n- files within these directories or subdirectories are modified - +每次有如下情况时执行这个命令行:\n- 所有目录转为可用状态(例如插入U盘)\n- 目录或子目录里的文件被修改 The file does not contain a valid configuration: 该文件不包含有效的配置: The file was not processed by last synchronization! @@ -844,6 +840,8 @@ Total required free disk space: 所需可用磁盘空间总量: Total time: 总共时间: +Transfer file and directory permissions\n(Requires Administrator rights) +转移文件和目录的权限\n(需要管理员权限) Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes 对文件时间差异在精确的+/-1小时的文件认为是相同的,小于1小时的认为是冲突以此来处理夏令时的变化 Unable to connect to sourceforge.net! diff --git a/BUILD/Languages/chinese_traditional.lng b/BUILD/Languages/chinese_traditional.lng index 56658a93..57b5e5aa 100644 --- a/BUILD/Languages/chinese_traditional.lng +++ b/BUILD/Languages/chinese_traditional.lng @@ -1,21 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE - Byte - 位元組 - GB - GB - MB - MB - day(s) - 日 - hour(s) - 時 - kB - kB - min - 分 - sec - 秒 %x / %y objects deleted successfully %x / %y 個物件已删除成功 %x Byte @@ -28,18 +12,24 @@ %x PB %x TB %x TB +%x day(s) +%x 天 %x directories %x 目錄 %x files %x 檔案 -%x is not a valid FreeFileSync batch file! -%x 不是一個有效的 FreeFileSync 批次檔！ +%x hour(s) +%x 小時 %x kB %x kB +%x min +%x 分 %x of %y rows in view 顯示 %y 之 %x 行 %x of 1 row in view 顯示 1 之 %x 行 +%x sec +%x 秒 %x% %x% &Abort @@ -182,7 +172,7 @@ Add folder pair 新增一對資料夾 All directories in sync! 同步所有目錄！ -An exception occured! +An exception occurred! 發生異常！ As a result the files are separated into the following categories: 結果是檔案分為以下幾類： @@ -266,6 +256,8 @@ Continue 繼續 Conversion error: 轉換錯誤： +Copy filesystem permissions +複製檔案系統權限 Copy from left to right 從左邊複製到右邊 Copy from left to right overwriting @@ -278,8 +270,8 @@ Copy locked files 複製被鎖定的檔案 Copy new or updated files to right folder. 將新的或更新過的檔案複製到右邊的資料夾中。 -Copy shared or locked files using Volume Shadow Copy Service -使用卷影複製服務來複製共享或鎖定的檔案 +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) +複製共用或鎖定檔案使用使用卷影複製服務\n(需要管理員權限) Copy to clipboard\tCTRL+C 複製到剪貼簿\tCTRL+C Copying Symbolic Link %x overwriting %y @@ -384,6 +376,8 @@ Error 錯誤 Error changing modification time: 變更修改時間錯誤： +Error copying file permissions: +複製檔案權限錯誤： Error copying file: 複製檔案錯誤： Error copying locked file %x! @@ -418,14 +412,16 @@ Error reading from synchronization database: 讀取同步資料庫錯誤： Error resolving symbolic link: 解决符號連結錯誤： +Error setting directory lock: + +Error setting privilege: +設定權限錯誤： Error starting Volume Shadow Copy Service! 啟動卷影複製服務錯誤！ Error traversing directory: 遍歷目錄錯誤： Error when monitoring directories. 監測目錄錯誤。 -Error writing file attributes: -寫入檔案屬性錯誤： Error writing file: 寫入檔案錯誤： Error writing to synchronization database: @@ -598,6 +594,8 @@ Initial synchronization: 初始化同步： Integrate external applications into context menu. The following macros are available: 整合上下文功能表中的外部應用程式。可以使用下面的巨集： +Invalid FreeFileSync config file! +無效的 FreeFileSync 配置檔案！ Leave as unresolved conflict 保留給未解決的衝突 Left @@ -655,7 +653,7 @@ Number of files and directories that will be deleted Number of files that will be overwritten 一些檔案和目錄將被覆蓋 One of the FreeFileSync database entries within the following file is not yet existing: -以下數據庫條目的其中一個 FreeFileSync 檔案不存在： +以下資料庫條目的其中一個 FreeFileSync 檔案不存在： One of the FreeFileSync database files is not yet existing: 其中一個 FreeFileSync 資料庫檔案不存在： Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories. @@ -678,7 +676,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! 計劃要刪除的目錄與其子目錄和檔案是衝突的！ Please run a Compare first before synchronizing! 請執行同步前先比對！ -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. 按下 \"切換\" 開啟 FreeFileSync 圖形介面操作方式。 Processing folder pair: 處理一對資料夾： @@ -704,6 +702,8 @@ Remove folder 移除資料夾 Remove folder pair 移除一對資料夾 +Removing abandoned directory lock (%x)... + Report translation error 回報翻譯錯誤 Reset @@ -794,7 +794,7 @@ Stop 停止 Swap sides 兩邊交換 -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... 切換 FreeFileSync 圖形介面操作方式... Symbolic Link handling 符號連結處理 @@ -825,7 +825,7 @@ Target directory already existing! Target file already existing! 目標檔案已存在！ The command line is executed each time:\n- all directories become available (e.g. USB stick insert)\n- files within these directories or subdirectories are modified -命令列每次執行：\n- 可用的目錄（例如插入USB隨身碟）\n- 檔案在這些目錄或子目錄會被修改 +命令列每次執行：\n- 可用的目錄(例如插入USB隨身碟)\n- 檔案在這些目錄或子目錄會被修改 The file does not contain a valid configuration: 該檔案不包含有效的配置： The file was not processed by last synchronization! @@ -844,6 +844,8 @@ Total required free disk space: 全部所需要的可用磁碟空間： Total time: 全部時間： +Transfer file and directory permissions\n(Requires Administrator rights) +傳輸檔案和目錄權限\n(需要管理員權限) Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes 對檔案時差在精確的+/-1小時的檔案判斷視為相同的，以小於1小時作為衝突，是為了處理日光節約時間的變化 Unable to connect to sourceforge.net! @@ -872,6 +874,8 @@ Volume name %x not part of filename %y! 卷名 %x 並非檔名 %y 的一部份！ Waiting for all directories to become available... 等待所有目錄變為可用... +Waiting while directory is locked (%x)... + Warning 警告 Warning: Synchronization failed for %x item(s): diff --git a/BUILD/Languages/czech.lng b/BUILD/Languages/czech.lng index 6cc29511..c7e486a5 100644 --- a/BUILD/Languages/czech.lng +++ b/BUILD/Languages/czech.lng @@ -1,21 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE - Byte - Byte - GB - GB - MB - MB - day(s) - d - hour(s) - hod - kB - kB - min - min - sec - s %x / %y objects deleted successfully %x / %y objektů úspěšně smazáno %x Byte @@ -28,18 +12,24 @@ %x PB %x TB %x TB +%x day(s) +%x d %x directories adresářů: %x %x files souborů: %x -%x is not a valid FreeFileSync batch file! -%x není platným dávkovým souborem programu FreeFileSync! +%x hour(s) +%x h %x kB %x kB +%x min +%x min %x of %y rows in view %x z %y řádků %x of 1 row in view %x z 1 řádku +%x sec +%x s %x% %x% &Abort @@ -182,7 +172,7 @@ Add folder pair Přidat adresář pro porovnání All directories in sync! Všechny adresáře jsou synchronizovány! -An exception occured! +An exception occurred! Vyskytla se chyba! As a result the files are separated into the following categories: Jako výsledek jsou soubory rozděleny do následujících kategorií: @@ -266,6 +256,8 @@ Continue Pokračovat Conversion error: Chyba konverze: +Copy filesystem permissions +Kopírovat oprávnění k souborům Copy from left to right Kopírovat z leva do prava Copy from left to right overwriting @@ -278,8 +270,8 @@ Copy locked files Kopírovat zamčené soubory Copy new or updated files to right folder. Kopírovat nové nebo aktualizované soubory do adresáře vpravo. -Copy shared or locked files using Volume Shadow Copy Service -Kopírovat sdílené nebo zamčené soubory pomocí Volume Shadow Copy Service +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) +Kopírovat sdílené nebo zamčené soubory pomocí Volume Shadow Copy Service\n(Vyžaduje administrátorské oprávnění) Copy to clipboard\tCTRL+C Vložit do schránky\tCTRL+C Copying Symbolic Link %x overwriting %y @@ -384,6 +376,8 @@ Error Chyba Error changing modification time: Chyba nastavení času změny: +Error copying file permissions: +Chyba kopírování oprávnění souborů: Error copying file: Chyba kopírování souboru: Error copying locked file %x! @@ -418,14 +412,16 @@ Error reading from synchronization database: Chyba čtení synchronizační databáze: Error resolving symbolic link: Chyba odkazu zástupce: +Error setting directory lock: + +Error setting privilege: +Chyba nastavení práv: Error starting Volume Shadow Copy Service! Chyba spuštění služby Volume Shadow Copy Service! Error traversing directory: Chyba procházení adresáře: Error when monitoring directories. Chyba při sledování adresářů. -Error writing file attributes: -Chyba zápisu atributů souboru: Error writing file: Chyba zápisu souboru: Error writing to synchronization database: @@ -598,6 +594,8 @@ Initial synchronization: Prvotní synchronizace: Integrate external applications into context menu. The following macros are available: Integrace externí aplikace do kontextového menu. K dispozici jsou následující makra: +Invalid FreeFileSync config file! +Chybný konfigurační soubor FreeFileSync! Leave as unresolved conflict Ponechat jako nevyřešený konflikt Left @@ -613,7 +611,7 @@ Záznamy: Logging Zaznamenávání Making shadow copies on WOW64 is not supported. Please use FreeFileSync 64-bit version. -Vytváření stínových kopíí na WOW64 není podporováno. Prosím použijte 64 bitovou verzi FreeFileSync. +Vytváření stínových kopií na WOW64 není podporováno. Prosím použijte 64 bitovou verzi FreeFileSync. Match case Rozlišovat malá a velká písmena Mirror ->> @@ -678,12 +676,12 @@ Planned directory deletion is in conflict with its subdirectories and -files! Naplánované smazání adresáře je v konfliktu s podadresáři a/nebo soubory! Please run a Compare first before synchronizing! Prosím proveďte nejdřív porovnání před synchronizací! -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. Talčítkem \"Přepnout\" otevřete okno FreeFileSync. Processing folder pair: Zpracovávání adresářové páru: Published under the GNU General Public License: -Vydáno podl GNU General Public License (GPL): +Vydáno podle GNU General Public License (GPL): Question Otázky Quit @@ -704,6 +702,8 @@ Remove folder Odstranit adresář Remove folder pair Odstranit dvojici adresářů +Removing abandoned directory lock (%x)... + Report translation error Hlásit chyby překladu Reset @@ -733,7 +733,7 @@ Vyberte adresář pro záznamy: Select variant: Vyberte variantu: Set direction: -Nastavit asresář: +Nastavit adresář: Setting default synchronization directions: Old files will be overwritten with newer files. Nastaven výchozí způsob synchronizace: Staré soubory budou nahrazeny novými. Show conflicts @@ -794,7 +794,7 @@ Stop Stop Swap sides Změna stran -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... Otevírání okna FreeFileSync... Symbolic Link handling Zpracování symbolických odkazů @@ -844,6 +844,8 @@ Total required free disk space: Požadované volné místo na disku: Total time: Celkový čas: +Transfer file and directory permissions\n(Requires Administrator rights) +Přenést přístupová oprávnění souborů a adresářů\n(Vyžaduje administrátorké oprávnění) Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes Považovat čas souboru lišící se přesně o +/- 1 hodinu jako shodný, méně než 1 hodinu jako konflikt, kvůli zpracování a přechodům na Letní čas Unable to connect to sourceforge.net! @@ -872,6 +874,8 @@ Volume name %x not part of filename %y! Disk %x není součástí jména souboru %y! Waiting for all directories to become available... Čekání na zpřístupnění všech adresářů... +Waiting while directory is locked (%x)... + Warning Varování Warning: Synchronization failed for %x item(s): diff --git a/BUILD/Languages/dutch.lng b/BUILD/Languages/dutch.lng index 0c771872..054db99d 100644 --- a/BUILD/Languages/dutch.lng +++ b/BUILD/Languages/dutch.lng @@ -1,21 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE - Byte - Byte - GB - GB - MB - MB - day(s) - dag(en) - hour(s) - u(u)r(en) - kB - kB - min - min - sec - sec %x / %y objects deleted successfully %x / %y objecten succesvol verwijderd %x Byte @@ -28,18 +12,24 @@ %x TB +%x day(s) + %x directories %x paden %x files %x bestanden -%x is not a valid FreeFileSync batch file! -%x is geen geldig FreeFileSync batch-bestand! +%x hour(s) + %x kB +%x min + %x of %y rows in view %x van de %y rijen in zicht %x of 1 row in view %x van 1 rij in zicht +%x sec + %x% &Abort @@ -182,7 +172,7 @@ Add folder pair Voeg 1 paar gekoppelde mappen toe All directories in sync! Alle paden zijn gesynchroniseerd! -An exception occured! +An exception occurred! Er heeft een uitzondering plaatsgevonden! As a result the files are separated into the following categories: Hierdoor worden de bestanden gescheiden in de volgende categorieën: @@ -266,6 +256,8 @@ Continue Doorgaan Conversion error: Fout bij het converteren: +Copy filesystem permissions + Copy from left to right Kopieer van links naar rechts Copy from left to right overwriting @@ -278,8 +270,8 @@ Copy locked files Kopieer 'alleen lezen' bestanden Copy new or updated files to right folder. Kopieer nieuwe of geupdate bestanden naar de rechter map. -Copy shared or locked files using Volume Shadow Copy Service -Kopieer gedeelde of alleen-lezen bestanden met Volume Shadow Copy Service +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) + Copy to clipboard\tCTRL+C Kopieer naar het klembord\tCTRL+C Copying Symbolic Link %x overwriting %y @@ -384,6 +376,8 @@ Error Fout Error changing modification time: Er is een fout opgetreden bij het aanpassen van de bestandstijd: +Error copying file permissions: + Error copying file: Er is een fout opgetreden bij het kopiëren van bestand: Error copying locked file %x! @@ -418,14 +412,14 @@ Error reading from synchronization database: Er is een fout opgetreden bij het lezen van de synchronisatie-database: Error resolving symbolic link: Er is een fout opgetreden bij het ophalen van een symbolische koppeling: +Error setting privilege: + Error starting Volume Shadow Copy Service! Er is een fout opgetreden bij het starten van de Volume Schadow Copy Service! Error traversing directory: Er is een fout opgetreden bij het doorzoeken van map: Error when monitoring directories. Er is een fout opgetreden bij het observeren van locaties. -Error writing file attributes: -Er is een fout opgetreden bij het schrijven van de bestands-eigenschappen: Error writing file: Er is een fout opgetreden bij het schrijven naar bestand: Error writing to synchronization database: @@ -598,6 +592,8 @@ Initial synchronization: Initiële synchronisatie: Integrate external applications into context menu. The following macros are available: Integreer externe applicaties in het context menu. De volgende macros zijn beschikbaar: +Invalid FreeFileSync config file! + Leave as unresolved conflict Beschouwen als onopgelost conflict Left @@ -678,7 +674,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! Please run a Compare first before synchronizing! Voer eerst een Vergelijking uit voordat u synchroniseerd. -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. Processing folder pair: Verwerken van gekoppelde folder: @@ -794,7 +790,7 @@ Stop Stop Swap sides Wissel zijdes -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... Symbolic Link handling @@ -844,6 +840,8 @@ Total required free disk space: Benodigde hoeveelheid vrije schijfruimte: Total time: Totale tijd: +Transfer file and directory permissions\n(Requires Administrator rights) + Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes Behandel bestandstijden die verschillen met precies +/- 1 uur als gelijk en minder als 1 uur als conflict om zomertijd veranderingen te verwerken Unable to connect to sourceforge.net! diff --git a/BUILD/Languages/english_uk.lng b/BUILD/Languages/english_uk.lng index b5d0923a..a020bd25 100644 --- a/BUILD/Languages/english_uk.lng +++ b/BUILD/Languages/english_uk.lng @@ -1,21 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE - Byte - Byte - GB - GB - MB - MB - day(s) - day(s) - hour(s) - hour(s) - kB - kB - min - min - sec - sec %x / %y objects deleted successfully %x / %y objects deleted successfully %x Byte @@ -28,18 +12,24 @@ %x PB %x TB %x TB +%x day(s) +%x day(s) %x directories %x directories %x files %x files -%x is not a valid FreeFileSync batch file! -%x is not a valid FreeFileSync batch file! +%x hour(s) +%x hour(s) %x kB %x kB +%x min +%x min %x of %y rows in view %x of %y rows in view %x of 1 row in view %x of 1 row in view +%x sec +%x sec %x% %x% &Abort @@ -182,8 +172,8 @@ Add folder pair Add folder pair All directories in sync! All directories in sync! -An exception occured! -An exception occured! +An exception occurred! +An exception occurred! As a result the files are separated into the following categories: As a result the files are separated into the following categories: As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.\n\nWith this option enabled the decision tree is smaller: @@ -266,6 +256,8 @@ Continue Continue Conversion error: Conversion error: +Copy filesystem permissions +Copy filesystem permissions Copy from left to right Copy from left to right Copy from left to right overwriting @@ -278,8 +270,8 @@ Copy locked files Copy locked files Copy new or updated files to right folder. Copy new or updated files to right folder. -Copy shared or locked files using Volume Shadow Copy Service -Copy shared or locked files using Volume Shadow Copy Service +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) Copy to clipboard\tCTRL+C Copy to clipboard\tCTRL+C Copying Symbolic Link %x overwriting %y @@ -384,6 +376,8 @@ Error Error Error changing modification time: Error changing modification time: +Error copying file permissions: +Error copying file permissions: Error copying file: Error copying file: Error copying locked file %x! @@ -418,14 +412,14 @@ Error reading from synchronization database: Error reading from synchronisation database: Error resolving symbolic link: Error resolving symbolic link: +Error setting privilege: +Error setting privilege: Error starting Volume Shadow Copy Service! Error starting Volume Shadow Copy Service! Error traversing directory: Error traversing directory: Error when monitoring directories. Error when monitoring directories. -Error writing file attributes: -Error writing file attributes: Error writing file: Error writing file: Error writing to synchronization database: @@ -598,6 +592,8 @@ Initial synchronization: Initial synchronisation: Integrate external applications into context menu. The following macros are available: Integrate external applications into context menu. The following macros are available: +Invalid FreeFileSync config file! +Invalid FreeFileSync config file! Leave as unresolved conflict Leave as unresolved conflict Left @@ -678,8 +674,8 @@ Planned directory deletion is in conflict with its subdirectories and -files! Planned directory deletion is in conflict with its subdirectories and -files! Please run a Compare first before synchronizing! Please run a Compare first before synchronising! -Press \"Switch\" to open FreeFileSync GUI modus. -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. +Press \"Switch\" to open FreeFileSync GUI mode. Processing folder pair: Processing folder pair: Published under the GNU General Public License: @@ -794,8 +790,8 @@ Stop Stop Swap sides Swap sides -Switching to FreeFileSync GUI modus... -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... +Switching to FreeFileSync GUI mode... Symbolic Link handling Symbolic Link handling Symlinks %x have the same date but a different target! @@ -844,6 +840,8 @@ Total required free disk space: Total required free disk space: Total time: Total time: +Transfer file and directory permissions\n(Requires Administrator rights) +Transfer file and directory permissions\n(Requires Administrator rights) Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes Unable to connect to sourceforge.net! diff --git a/BUILD/Languages/finnish.lng b/BUILD/Languages/finnish.lng index 6648f921..6ca7cda8 100644 --- a/BUILD/Languages/finnish.lng +++ b/BUILD/Languages/finnish.lng @@ -1,21 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI Framework\n wxFormBuilder\t- wxWidgets GUI-Builder\n CodeBlocks \t- Open-Source IDE - Byte - tavua - GB - GB - MB - MB - day(s) - päivää(e) - hour(s) - tunti(n) - kB - kB - min - Min. - sec - Sek. %x / %y objects deleted successfully %x / %y Kohteiden poisto onnistui %x Byte @@ -28,18 +12,24 @@ %x PB %x TB %x TB +%x day(s) + %x directories %x hakemistoa %x files %x tiedostoista -%x is not a valid FreeFileSync batch file! -%x ei kelvollinen FreeFileSync eräajotiedosto! +%x hour(s) + %x kB %x kB +%x min + %x of %y rows in view %x riviä %y rivistä näytössä %x of 1 row in view %x 1 rivistä näytössä +%x sec + %x% %x% &Abort @@ -182,7 +172,7 @@ Add folder pair Lisää hakemistopari All directories in sync! Kaikki hakemistot täsmäävät! -An exception occured! +An exception occurred! Virhe havaittu! As a result the files are separated into the following categories: Tiedoston on avattu seuraaviin luokkiin: @@ -266,6 +256,8 @@ Continue Jatka Conversion error: Konversio virhe: +Copy filesystem permissions + Copy from left to right Kopioidaan vasen -> oikea Copy from left to right overwriting @@ -278,8 +270,8 @@ Copy locked files Kopioi lukitut tiedostot Copy new or updated files to right folder. Kopioidaan uudet tai muuttuneet tiedostot oikeaan hakemistoon. -Copy shared or locked files using Volume Shadow Copy Service -Kopioi jaetut ja lukitut tiedostot käyttäen Volume Shadow Copy Service +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) + Copy to clipboard\tCTRL+C Kopioi Leikepöydälle\tCTRL+C Copying Symbolic Link %x overwriting %y @@ -384,6 +376,8 @@ Error Virhe Error changing modification time: Virhe muuttaessa tiedoston aikaa: +Error copying file permissions: + Error copying file: Virhe kopioitaessa tiedostoa: Error copying locked file %x! @@ -418,14 +412,14 @@ Error reading from synchronization database: Virhe lukiessa täsmäytyksen tietokantaa: Error resolving symbolic link: Virhe selvittäessä symbolista linkkiä: +Error setting privilege: + Error starting Volume Shadow Copy Service! Virhe käynnistäessä Volume Shadow Copy Service! Error traversing directory: Virhe hakemistoa läpikäydessä: Error when monitoring directories. Virhe seuratessa hakemistoa. -Error writing file attributes: -Virhe kirjottaessa tiedosto ominaisuuksia: Error writing file: Virhe kirjottaessa tiedosto: Error writing to synchronization database: @@ -598,6 +592,8 @@ Initial synchronization: Ensi täsmäytys: Integrate external applications into context menu. The following macros are available: Liitä ulkoinen sovellus viitekehysvalikkoon. Seuraavat makrot ovat valittavissa: +Invalid FreeFileSync config file! + Leave as unresolved conflict Jätä ratkaisemattomana virheenä Left @@ -678,7 +674,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! Suunniteltu hakemiston poistaminen on ristiriidassa alihakemiston ja tiedostojen kanssa! Please run a Compare first before synchronizing! Aja tarkistus ennen täsmäytystä. -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. Paina \"Vaihda\" Avaa FreeFileSync GUI toimintoa. Processing folder pair: Käsitellään hakemistoparia: @@ -794,7 +790,7 @@ Stop Stop Swap sides Puolten vaihto -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... Siirtyminen FreeFileSync GUI toimintoon... Symbolic Link handling Symlinkkien hallinta @@ -844,6 +840,8 @@ Total required free disk space: Vaadittu vapaa levytila: Total time: Kokonaisaika: +Transfer file and directory permissions\n(Requires Administrator rights) + Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes Kohtele tiedostoja jolla aikaleima on tasan +/- tunti samoina, korjaa kesäajan siirtoa Unable to connect to sourceforge.net! diff --git a/BUILD/Languages/french.lng b/BUILD/Languages/french.lng index b390f956..51e2adaa 100644 --- a/BUILD/Languages/french.lng +++ b/BUILD/Languages/french.lng @@ -1,21 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port de la GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE - Byte - Octet - GB - Go - MB - Mo - day(s) - jour(s) - hour(s) - heure(s) - kB - Ko - min - min - sec - sec %x / %y objects deleted successfully %x / %y objets supprimés avec succès %x Byte @@ -28,18 +12,24 @@ %x Po %x TB %x To +%x day(s) +%x jour(s) %x directories %x répertoires %x files %x fichiers -%x is not a valid FreeFileSync batch file! -%x n'est pas un fichier batch FreeFileSync valide ! +%x hour(s) +%x heure(s) %x kB %x Ko +%x min +%x min %x of %y rows in view %x sur %y lignes affichées %x of 1 row in view %x sur 1 ligne affichée +%x sec +%x sec %x% %x % &Abort @@ -182,7 +172,7 @@ Add folder pair Ajout d'un couple de dossiers All directories in sync! Tous les répertoires sont synchronisés ! -An exception occured! +An exception occurred! Une erreur s'est produite ! As a result the files are separated into the following categories: En conclusion, les fichiers sont répartis dans les catégories suivantes : @@ -266,6 +256,8 @@ Continue Continuer Conversion error: Erreur de conversion : +Copy filesystem permissions +Copie des attributs de fichiers Copy from left to right Copie de gauche à droite Copy from left to right overwriting @@ -278,8 +270,8 @@ Copy locked files Copier les fichiers verrouillés Copy new or updated files to right folder. Copie les fichiers nouveaux ou modifiés dans le dossier de droite. -Copy shared or locked files using Volume Shadow Copy Service -Copier les fichiers partagés ou verrouilés en utilisant le service Volume Shadow Copy +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) +La copie des fichiers partagés ou verrouillés nécessite le Service Volume Shadow Copy\n(avec les droits administrateur) Copy to clipboard\tCTRL+C Copier dans le presse-papiers\tCTRL+C Copying Symbolic Link %x overwriting %y @@ -384,6 +376,8 @@ Error Erreur Error changing modification time: Erreur lors du changement de la date de modification : +Error copying file permissions: +Erreur lors de la copie des attributs système Error copying file: Erreur lors de la copie du fichier : Error copying locked file %x! @@ -418,14 +412,14 @@ Error reading from synchronization database: Erreur lors de la lecture de la base de données de synchro : Error resolving symbolic link: Erreur lors de la résolution du lien symbolique : +Error setting privilege: +Erreur de paramétrage de privilège Error starting Volume Shadow Copy Service! Erreur lors du démarrage du service 'Volume Shadow Copy' ! Error traversing directory: Erreur lors du parcours du répertoire : Error when monitoring directories. Erreur lors de la surveillance des répertoires. -Error writing file attributes: -Erreur lors de l'écriture des attributs du fichier : Error writing file: Erreur lors de l'écriture du fichier : Error writing to synchronization database: @@ -598,6 +592,8 @@ Initial synchronization: Première synchronisation : Integrate external applications into context menu. The following macros are available: Inclure les applications externes dans le menu contextuel. Les macros suivantes sont disponibles : +Invalid FreeFileSync config file! +Fichier de configuration FreeFileSync invalide ! Leave as unresolved conflict Abandonner en tant que conflit non résolu Left @@ -678,7 +674,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! Le répertoire de suppression choisi est en conflit avec ses sous-répertoires et -fichiers ! Please run a Compare first before synchronizing! Veuillez lancer une Comparaison avant de lancer la synchronisation ! -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. Appuyer sur \"Changer \" pour ouvrir le mode FreeFileSync GUI Processing folder pair: Traitement de la paire de dossiers : @@ -794,7 +790,7 @@ Stop Arrêt Swap sides Permuter les côtés -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... Changement en mode FreeFileSync GUI... Symbolic Link handling Gestion des Liens Symboliques @@ -844,6 +840,8 @@ Total required free disk space: Espace disque nécessaire : Total time: Durée totale : +Transfer file and directory permissions\n(Requires Administrator rights) +Transfert des attributs système des fichiers et des répertoires\n(avec les droits administrateur) Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes Traiter les heures qui diffèrent exactement de +/- 1 heure comme égales, et celles qui diffèrent de moins d'une heure comme conflit sur la gestion de l'heure d'été Unable to connect to sourceforge.net! diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng index 9adac7a6..c7a23e4a 100644 --- a/BUILD/Languages/german.lng +++ b/BUILD/Languages/german.lng @@ -1,13 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI Framework\n wxFormBuilder\t- wxWidgets GUI-Builder\n CodeBlocks \t- Open-Source IDE - day(s) - Tag(e) - hour(s) - Stunde(n) - min - Min. - sec - Sek. %x / %y objects deleted successfully %x von %y Objekten erfolgreich gelöscht %x Byte @@ -20,18 +12,24 @@ %x PB %x TB %x TB +%x day(s) +%x Tag(e) %x directories %x Verzeichnisse %x files %x Dateien -%x is not a valid FreeFileSync batch file! -%x ist keine gültige FreeFileSync-Batchdatei! +%x hour(s) +%x Stunde(n) %x kB %x kB +%x min +%x Min. %x of %y rows in view %x von %y Zeilen zur Ansicht %x of 1 row in view %x von 1 Zeile zur Ansicht +%x sec +%x Sek. %x% %x% &Abort @@ -174,7 +172,7 @@ Add folder pair Verzeichnispaar hinzufügen All directories in sync! Alle Verzeichnisse sind synchron! -An exception occured! +An exception occurred! Eine Ausnahme ist aufgetreten! As a result the files are separated into the following categories: Das Ergebnis ist eine Aufteilung in folgende Kategorien: @@ -258,6 +256,8 @@ Continue Fortfahren Conversion error: Fehler bei Konvertierung: +Copy filesystem permissions +Dateisystemberechtigungen kopieren Copy from left to right Von links nach rechts kopieren Copy from left to right overwriting @@ -270,8 +270,8 @@ Copy locked files Gesperrte Dateien kopieren Copy new or updated files to right folder. Neue oder aktualisierte Dateien vom linken in das rechte Verzeichnis kopieren. -Copy shared or locked files using Volume Shadow Copy Service -Gesperrte oder gemeinsam verwendete Dateien mit Hilfe des Volume Shadow Copy Service kopieren +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) +Kopiere gesperrte Dateien mit Hilfe des Volume Shadow Copy Service\n(Benötigt Administratorrechte) Copy to clipboard\tCTRL+C In die Zwischenablage kopieren\tCTRL+C Copying Symbolic Link %x overwriting %y @@ -376,6 +376,8 @@ Error Fehler Error changing modification time: Fehler beim Setzen der Dateiänderungszeit: +Error copying file permissions: +Fehler beim Kopieren der Dateiberechtigungen: Error copying file: Fehler beim Kopieren der Datei: Error copying locked file %x! @@ -410,14 +412,14 @@ Error reading from synchronization database: Fehler beim Lesen der Synchronisationsdatenbank: Error resolving symbolic link: Fehler beim Auflösen des Symbolischen Links: +Error setting privilege: +Fehler beim Setzen des Privilegs: Error starting Volume Shadow Copy Service! Fehler beim Starten des Volume Shadow Copy Service! Error traversing directory: Fehler beim Durchsuchen des Verzeichnisses: Error when monitoring directories. Fehler beim Überwachen der Verzeichnisse. -Error writing file attributes: -Fehler beim Schreiben der Dateiattribute: Error writing file: Fehler beim Schreiben der Datei: Error writing to synchronization database: @@ -590,6 +592,8 @@ Initial synchronization: Erstmalige Synchronisation: Integrate external applications into context menu. The following macros are available: Integriert externe Anwendungen in das Kontextmenu. Die folgenden Makros stehen zur Verfügung: +Invalid FreeFileSync config file! +Ungültige FreeFileSync Konfigurationsdatei! Leave as unresolved conflict Als unbehandelten Konflikt belassen Left @@ -670,7 +674,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! Das geplante Löschen des Verzeichnisses steht in Konflikt mit seinen Unterverzeichnissen und -dateien Please run a Compare first before synchronizing! Vor der Synchronisation bitte zuerst einen Vergleich ausführen! -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. \"Wechseln\" öffnet FreeFileSync in der graphischen Ansicht. Processing folder pair: Bearbeite Verzeichnispaar: @@ -786,7 +790,7 @@ Stop Stop Swap sides Seiten vertauschen -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... Wechsle in die graphische Ansicht... Symbolic Link handling Verwendung Symbolischer Links @@ -836,6 +840,8 @@ Total required free disk space: Insgesamt benötigter freier Speicherplatz: Total time: Gesamtzeit: +Transfer file and directory permissions\n(Requires Administrator rights) +Übertrage Datei- und Verzeichnisberechtigungen\n(Benötigt Administratorrechte) Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes Betrachte Dateizeiten mit einer Differenz von genau +/- einer Stunde als gleich, mit weniger als einer Stunde als Konflikt, um Zeitumstellungen richtig zu behandeln Unable to connect to sourceforge.net! diff --git a/BUILD/Languages/hebrew.lng b/BUILD/Languages/hebrew.lng index 5ca0b934..69b53a86 100644 --- a/BUILD/Languages/hebrew.lng +++ b/BUILD/Languages/hebrew.lng @@ -1,21 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- מהדר גנו של חלונות\n wxWidgets \t- ממשק גרפי של תוכנת קוד פתוח\n wxFormBuilder\t- wxWidgets מנוע ממשג גרפי\n CodeBlocks \t- IDE תוכנת קוד פתוח - Byte - ביית - GB - גב - MB - מב - day(s) - יום - hour(s) - שעות - kB - קב - min - דקה - sec - שניה %x / %y objects deleted successfully אוביקטים נמחקו בהצלחה %y מ %x %x Byte @@ -28,18 +12,24 @@ %x פיקו ביט %x TB %x טרה ביט +%x day(s) + %x directories מחיצות %x %x files %x קבצים -%x is not a valid FreeFileSync batch file! -!קובץ אצווה לא מתאים %x +%x hour(s) + %x kB %x קב +%x min + %x of %y rows in view שורות בתצוגה %y מ %x %x of 1 row in view שורות בתצוגה %x מ 1 +%x sec + %x% %x% &Abort @@ -182,7 +172,7 @@ Add folder pair הוסף מחיצה זוגית All directories in sync! כל המחיצות מסונכרנות! -An exception occured! +An exception occurred! אירוע חריג! As a result the files are separated into the following categories: :כתוצאה הקבצים הופרדו לקטגוריות הבאות @@ -266,6 +256,8 @@ Continue המשך Conversion error: טעות בהסבה: +Copy filesystem permissions + Copy from left to right העתק משמאל לימין Copy from left to right overwriting @@ -278,8 +270,8 @@ Copy locked files העתק קבצים נעולים Copy new or updated files to right folder. העתק קבצים חדשים או מעודכנים למחיצה הימנית. -Copy shared or locked files using Volume Shadow Copy Service -העתק קבצים משותבים או נעולים בעזרת שרות העתקה מוצל +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) + Copy to clipboard\tCTRL+C העתק למכתבה \tCTRL+C Copying Symbolic Link %x overwriting %y @@ -384,6 +376,8 @@ Error טעות Error changing modification time: טעות בשינוי זמן: +Error copying file permissions: + Error copying file: טעות בהעתקת קובץ: Error copying locked file %x! @@ -418,14 +412,14 @@ Error reading from synchronization database: טעות בקריאה מבסיס הנתונים של הסנכרון: Error resolving symbolic link: טעות בפענוח מראה מקום סימלי (Symbolic Link) +Error setting privilege: + Error starting Volume Shadow Copy Service! טעות בטעינת מעתיק צללים (Shadow Copy Service)! Error traversing directory: טעות בהצלבת מחיצות Error when monitoring directories. טעות בניתור מחיצות. -Error writing file attributes: -טעות בכתיבת תכונות קובץ: Error writing file: טעות בכתיבת קובת: Error writing to synchronization database: @@ -598,6 +592,8 @@ Initial synchronization: סנכרון ראשוני: Integrate external applications into context menu. The following macros are available: :הטמע תוכנות חיצוניות לתפריט המקרו הבאים מוכנים +Invalid FreeFileSync config file! + Leave as unresolved conflict השאר כקונפליקט לא מטופל Left @@ -678,7 +674,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! מחיצה המיועדת למחיקה מצויה בסתירה לתקיות המשנה ולקבצים Please run a Compare first before synchronizing! הרץ השוואה לפני סנכרון! -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. \"לחץ\" לפתיחת FreeFileSync בממשק גרפי. Processing folder pair: מבצע זיווז מחיצות: @@ -794,7 +790,7 @@ Stop עצור Swap sides החלף צדדים -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... החלף לתצורת ממשק חזותי... Symbolic Link handling @@ -844,6 +840,8 @@ Total required free disk space: זכרון פנוי כללי נדרש Total time: זמן מקומי: +Transfer file and directory permissions\n(Requires Administrator rights) + Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes התיחס לזמני הקובץ כאשר הם שונים בדיוק ב +/- שעה כשווים לצורך פתרון בעית שעון קיץ Unable to connect to sourceforge.net! diff --git a/BUILD/Languages/hungarian.lng b/BUILD/Languages/hungarian.lng index faffa5ad..51f228f3 100644 --- a/BUILD/Languages/hungarian.lng +++ b/BUILD/Languages/hungarian.lng @@ -1,21 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- A GNU fordítócsomag Windows portja\n wxWidgets \t- Nyílt forráskódú GUI keretrendszer\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Nyílt forráskódú IDE - Byte - Bájt - GB - GB - MB - MB - day(s) - nap - hour(s) - óra - kB - kB - min - perc - sec - másodperc %x / %y objects deleted successfully %X / %Y objektum sikeresen törölve %x Byte @@ -28,18 +12,24 @@ %x PB %x TB %x TB +%x day(s) +%x nap %x directories %x mappa %x files %x fájl -%x is not a valid FreeFileSync batch file! -A(z) %x nem megfelelő FreeFileSync kötegelt feladat fájl! +%x hour(s) +%x óra %x kB %x kB +%x min +%x perc %x of %y rows in view %x sor látható a(z) %y sorból %x of 1 row in view %x sor látható az 1 sorból +%x sec +%x másodperc %x% %x% &Abort @@ -182,7 +172,7 @@ Add folder pair Mappa pár megadása All directories in sync! Minden mappa szinkronban! -An exception occured! +An exception occurred! Kivétel keletkezett! As a result the files are separated into the following categories: Eredményképpen a fájlok a következő kategóriákra bomlanak: @@ -266,6 +256,8 @@ Continue Folytatás Conversion error: Konverziós hiba: +Copy filesystem permissions +Fájlrendszer jogosultságok másolása Copy from left to right Másolás a bal oldalról a jobb oldalra Copy from left to right overwriting @@ -278,8 +270,8 @@ Copy locked files Zárolt fájlok másolása Copy new or updated files to right folder. Új vagy frissített fájlok másolása a jobb oldali mappába. -Copy shared or locked files using Volume Shadow Copy Service -Megosztott vagy zárolt fájlok másolása a Volume Shadow Copy Service segítségével +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) +A megosztott vagy zárolt fájlok másolása a Volume Shadow Copy szolgáltatással\n(Adminisztrátori jogok szükségesek) Copy to clipboard\tCTRL+C Másolás a vágólapra\tCTRL+C Copying Symbolic Link %x overwriting %y @@ -384,6 +376,8 @@ Error Hiba Error changing modification time: Az utolsó változtatás dátumának módosítása sikertelen: +Error copying file permissions: +Hiba történt a fájl jogosultságainak másolása közben: Error copying file: A fájl másolása sikertelen: Error copying locked file %x! @@ -418,14 +412,16 @@ Error reading from synchronization database: Hiba történt a szinkronizációs adatbázis olvasása közben: Error resolving symbolic link: A szimbolikus link feloldása sikertelen: +Error setting directory lock: + +Error setting privilege: +Hiba történt a jogok beállítása közben: Error starting Volume Shadow Copy Service! Hiba történt a Volume Shadow Copy szolgáltatás indítása közben! Error traversing directory: A mappa átnézése sikertelen: Error when monitoring directories. Hiba történt a mappák figyelése közben. -Error writing file attributes: -A fájl attribútumainak írása sikertelen: Error writing file: A fájl írása sikertelen: Error writing to synchronization database: @@ -598,6 +594,8 @@ Initial synchronization: Első szinkronizáció: Integrate external applications into context menu. The following macros are available: Külső alkalmazás integrálása a helyi menübe. Az elérhető makrók a következők: +Invalid FreeFileSync config file! +Érvénytelen a FreeFileSync beállításait tartalmazó fájl! Leave as unresolved conflict Feloldatlan ütközésként hagyni Left @@ -678,7 +676,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! A tervezett mappának a törlése ütközik az almappáival és fájljaival. Please run a Compare first before synchronizing! Kérjük, futtass le egy összehasonlítást mielőtt szinkronizálnál! -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. Kérjük, nyomja meg a \"Váltás\" gombot a GUI mód megnyitásához. Processing folder pair: Mappapár feldolgozása: @@ -704,6 +702,8 @@ Remove folder Mappa eltávolítása Remove folder pair Mappa párok eltávolítása +Removing abandoned directory lock (%x)... + Report translation error Fordítói hiba bejelentése Reset @@ -794,7 +794,7 @@ Stop Megállítás Swap sides Oldalak felcserélése -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... Váltás a FreeFileSync GUI módjára... Symbolic Link handling Symlink kezelés @@ -844,6 +844,8 @@ Total required free disk space: Összes igényelt szabad lemezterület: Total time: Becsült idő: +Transfer file and directory permissions\n(Requires Administrator rights) +Fájlok és mappák jogosultságainak átvitele\n(Adminisztrátori jogok szükségesek) Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes A fájlok dátumának pontosan +/- 1 órával való eltérése esetén a fájlok egyeznek, a kevesebb mint 1 órával való eltérés esetén pedig ütköznek, a Nyári Időszámítás kezeléséhez Unable to connect to sourceforge.net! @@ -872,6 +874,8 @@ Volume name %x not part of filename %y! A(z) %x kötetnevet nem tartalmazza a(z) %y fájlnév! Waiting for all directories to become available... Várakozás az összes mappa elérhetővé válására... +Waiting while directory is locked (%x)... + Warning Figyelem Warning: Synchronization failed for %x item(s): diff --git a/BUILD/Languages/italian.lng b/BUILD/Languages/italian.lng index 79104c4f..b81c7aa7 100644 --- a/BUILD/Languages/italian.lng +++ b/BUILD/Languages/italian.lng @@ -1,45 +1,35 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port della GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE - Byte - Byte - GB - GB - MB - MB - day(s) - giorno(i) - hour(s) - ora(e) - kB - kB - min - min - sec - sec %x / %y objects deleted successfully %x / %y oggetti cancellati con successo %x Byte - +%x Byte +%x GB %x GB - %x MB - +%x MB +%x PB %x PB - %x TB - +%x TB +%x day(s) +%x giorno(i) %x directories %x cartelle %x files %x files -%x is not a valid FreeFileSync batch file! -%x non è un batch file valido per FreeFileSync! +%x hour(s) +%x ora(e) %x kB - +%x kB +%x min +%x min %x of %y rows in view %x di %y righe visualizzate %x of 1 row in view %x di 1 riga visualizzata +%x sec +%x sec %x% %x% &Abort @@ -99,7 +89,7 @@ &Yes &Si (Build: %x) - +(Build: %x) (Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".) (Solo volumi con file-system FAT/FAT32 risentono di questo problema!\nIn tutti gli altri casi puoi disabilitare l'impostazione \"ignora differenze di 1 ora\".) (Requires an Internet connection!) @@ -161,7 +151,7 @@ - + A newer version of FreeFileSync is available: @@ -182,7 +172,7 @@ Add folder pair Aggiungi una coppia di cartelle All directories in sync! Tutte le directory in sync! -An exception occured! +An exception occurred! Si è verificato un problema! As a result the files are separated into the following categories: I file risultano infine ripartiti nelle seguenti categorie: @@ -266,6 +256,8 @@ Continue Continua Conversion error: Errore di conversione: +Copy filesystem permissions +Copia permessi del filesystem Copy from left to right Copia da sinistra a destra Copy from left to right overwriting @@ -278,16 +270,16 @@ Copy locked files Copia file bloccati Copy new or updated files to right folder. Copia file nuovi o aggiornati nella cartella di destra. -Copy shared or locked files using Volume Shadow Copy Service -Copia file condivisi o bloccati usando il servizio Volume Shadow Copy +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) +Copia file condivisi o bloccati usando il Servizio Volume Shadow Copy\n(Richiede diritti di Administrator) Copy to clipboard\tCTRL+C Copia nella clipboard\tCTRL+C Copying Symbolic Link %x overwriting %y - +Copia Link Simbolico %x sovrascrivendo %y Copying Symbolic Link %x to %y - +Copia Link Simbolico %x su %y Copying file %x overwriting %y - +Copia file %x sovrascrivendo %y Copying file %x to %y Copia di file da %x a %y Could not determine volume name for file: @@ -335,7 +327,7 @@ Cancella o sovrascrivi file definitivamente Delete permanently Cancella definitivamente Deleting Symbolic Link %x - +Eliminazione Link Simbolico %x Deleting file %x Eliminazione file %x Deleting folder %x @@ -345,7 +337,7 @@ Gestione cancellazione Description Descrizione Direct - +Diretto Directories are dependent! Be careful when setting up synchronization rules: Le directory sono dipendenti! Fai attenzione quando configuri le regole di sincronizzazione: Directories to watch @@ -384,6 +376,8 @@ Error Errore Error changing modification time: Errore durante la modifica della data: +Error copying file permissions: +Errore durante la copia dei permessi su file: Error copying file: Errore durante la copia del file: Error copying locked file %x! @@ -418,14 +412,16 @@ Error reading from synchronization database: Errore in lettura dal database di sincronizzione: Error resolving symbolic link: Errore nella risoluzione di collegamento simbolico: +Error setting directory lock: + +Error setting privilege: +Errore nel settaggio dei privilegi: Error starting Volume Shadow Copy Service! Errore in avvio del Servizio Volume Shadow Copy! Error traversing directory: Errore nel percorso della directory: Error when monitoring directories. Errore durante il monitoraggio directory. -Error writing file attributes: -Errore nella scrittura degli attributi file: Error writing file: Errore durante la scrittura del file: Error writing to synchronization database: @@ -503,7 +499,7 @@ Trova cosa: Folder Comparison and Synchronization Comparazione di Cartelle e Sincronizzazione Follow - +Segui Free disk space available: Spazio libero su disco disponibile: FreeFileSync Batch Job @@ -573,7 +569,7 @@ Identifica e propaga cambiamenti su entrambi i lati usando un database. Cancella If you like FFS Se ti piace FFS Ignore - +Ignora Ignore 1-hour file time difference Ignora la differenza di file time di 1 ora Ignore errors @@ -598,6 +594,8 @@ Initial synchronization: Prima sincronizzazione: Integrate external applications into context menu. The following macros are available: Integra applicazioni esterne nel menu contestuale. Sono disponibili le seguenti macro: +Invalid FreeFileSync config file! +File di configurazione FreeFileSync non valido! Leave as unresolved conflict Lascia come conflitti irrisolti Left @@ -633,7 +631,7 @@ Sposta file in una sotto-cartella datata Moving %x to Recycle Bin Spostamento di %x nel Cestino Moving Symbolic Link %x to user-defined directory %y - +Spostamento Link Simbolico %x su directory definita dall'utente %y Moving file %x to user-defined directory %y Spostamento del file %x nella directory personalizzata %y Moving folder %x to user-defined directory %y @@ -678,7 +676,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! La cancellazione della directory pianificata e' in conflitto con queste sottodirectory e files! Please run a Compare first before synchronizing! Prima di sincronizzare effettua una Comparazione! -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. Premi \"Switch\" per aprire modalità GUI di FreeFileSync Processing folder pair: Elaborazione coppia di cartelle: @@ -704,6 +702,8 @@ Remove folder Rimuovi cartella Remove folder pair Elimina la coppia di cartelle +Removing abandoned directory lock (%x)... + Report translation error Segnala errori di traduzione Reset @@ -794,12 +794,12 @@ Stop Stop Swap sides Inverti i lati -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... Switch alla modalità GUI di FreeFileSync... Symbolic Link handling - +Gestione Link Simbolico Symlinks %x have the same date but a different target! - +Symlinks %x hanno stessa data ma differente target! Synchronization Preview Anteprima Sincronizzazione Synchronization aborted! @@ -825,7 +825,7 @@ Directory di destinazione già esistente! Target file already existing! File destinazione già esistente! The command line is executed each time:\n- all directories become available (e.g. USB stick insert)\n- files within these directories or subdirectories are modified - +La linea di comando è eseguita ogni volta che:\n- tutte le cartelle diventano disponibili (es: inserimento memoria USB)\n- file in queste cartelle o sottocartelle vengono modificati The file does not contain a valid configuration: Il file non contiene una configurazione valida The file was not processed by last synchronization! @@ -844,6 +844,8 @@ Total required free disk space: Spazio libero su disco richiesto: Total time: Tempo totale: +Transfer file and directory permissions\n(Requires Administrator rights) +Trasferisci file e permessi sulle cartelle\n(Richiede diritti di Administrator) Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes Tratta file time che differiscono di esattamente +/- 1 ora come uguali, meno di 1 ora come conflitto per gestire i cambiamenti di Daylight Saving Time Unable to connect to sourceforge.net! @@ -872,6 +874,8 @@ Volume name %x not part of filename %y! Il nome volume %x non è parte del nome file %y! Waiting for all directories to become available... In attesa che tutte le directory siano disponibili... +Waiting while directory is locked (%x)... + Warning Attenzione Warning: Synchronization failed for %x item(s): diff --git a/BUILD/Languages/japanese.lng b/BUILD/Languages/japanese.lng index 73b9e0f4..54b13d37 100644 --- a/BUILD/Languages/japanese.lng +++ b/BUILD/Languages/japanese.lng @@ -1,21 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE - Byte - バイト - GB - GB - MB - MB - day(s) - 日(間) - hour(s) - 時(間) - kB - kB - min - 分 - sec - 秒 %x / %y objects deleted successfully %x / %y のオブジェクトを削除しました %x Byte @@ -28,18 +12,24 @@ %x PB %x TB %x TB +%x day(s) +%x 日 %x directories %x ディレクトリ %x files %x 個のファイル -%x is not a valid FreeFileSync batch file! -%x は有効なバッチファイルではありません! +%x hour(s) +%x 時間 %x kB %x kB +%x min +%x 分 %x of %y rows in view %x / %y 行を表示 %x of 1 row in view %x / 1 行を表示 +%x sec +%x 秒 %x% %x% &Abort @@ -182,7 +172,7 @@ Add folder pair フォルダのペアを追加 All directories in sync! すべてのディレクトリを同期! -An exception occured! +An exception occurred! 例外が発生しました! As a result the files are separated into the following categories: ファイルは以下のカテゴリに分類されます: @@ -266,6 +256,8 @@ Continue 続行 Conversion error: 変換エラー: +Copy filesystem permissions +ファイルシステム・パーミッションをコピー Copy from left to right 左から右にコピー Copy from left to right overwriting @@ -278,8 +270,8 @@ Copy locked files ロックされたファイルをコピー Copy new or updated files to right folder. 新しい(更新)ファイルを右フォルダにコピー -Copy shared or locked files using Volume Shadow Copy Service -共有、またはボリュームシャドウコピーでロックされたファイルをコピー +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) +ボリュームシャドーコピーを使用して共有/ロックされたファイルをコピー\n(管理者権限が必要) Copy to clipboard\tCTRL+C クリップボードにコピー\tCTRL+C Copying Symbolic Link %x overwriting %y @@ -384,6 +376,8 @@ Error エラー Error changing modification time: 時間の修正中のエラー: +Error copying file permissions: +パーミッションコピー中のエラー Error copying file: ファイルのコピーに失敗: Error copying locked file %x! @@ -418,14 +412,14 @@ Error reading from synchronization database: 同期データベースからの読み込みエラー: Error resolving symbolic link: シンボリックリンクの解決に失敗: +Error setting privilege: +特権の設定エラー: Error starting Volume Shadow Copy Service! ボリュームシャドウコピーの開始に失敗! Error traversing directory: ディレクトリの移動エラー: Error when monitoring directories. ディレクトリの監視エラー -Error writing file attributes: -ファイル属性の書き込みエラー: Error writing file: ファイル書き込みエラー: Error writing to synchronization database: @@ -598,6 +592,8 @@ Initial synchronization: 同期処理の初期化: Integrate external applications into context menu. The following macros are available: 外部のアプリケーションをコンテキストメニューに統合、以下のマクロが利用できます: +Invalid FreeFileSync config file! +無効な FreeFileSync 構成ファイルです! Leave as unresolved conflict 未解決の競合はそのまま残す Left @@ -678,7 +674,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! ディレクトリを削除すると、サブディレクトリ、ファイルの競合が起こる可能姓があります! Please run a Compare first before synchronizing! 同期処理を実行する前に比較を行ってください! -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. \"切り替え\" を押すと FreeFileSync GUI モードで開きます Processing folder pair: フォルダペアを処理中: @@ -794,7 +790,7 @@ Stop 停止 Swap sides パネルを入れ替え -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... FreeFileSync GUI モードの切り替え中... Symbolic Link handling シンボリックリンク・リンクの取り扱い @@ -844,6 +840,8 @@ Total required free disk space: 必要な合計ディスク空き容量: Total time: 合計時間: +Transfer file and directory permissions\n(Requires Administrator rights) +ファイルとディレクトリのパーミッション転送\n(管理者権限が必要) Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes ファイルの時間の +/- を正確に 1 時間以上の差異は不一致、1 時間未満の差異は同様ファイルとして取り扱います(夏時間は変換されます) Unable to connect to sourceforge.net! diff --git a/BUILD/Languages/polish.lng b/BUILD/Languages/polish.lng index 4d486a48..d656ea3e 100644 --- a/BUILD/Languages/polish.lng +++ b/BUILD/Languages/polish.lng @@ -1,21 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE - Byte - Bajt - GB - GB - MB - MB - day(s) - dni - hour(s) - godziny - kB - kB - min - minuty - sec - sekundy %x / %y objects deleted successfully %x / %y usuniętych obiektów %x Byte @@ -28,18 +12,24 @@ %x PB %x TB %x TB +%x day(s) +%x dni %x directories %x katalogi %x files %x pliki -%x is not a valid FreeFileSync batch file! -%x nie jest poprawnym plikiem batch programu FreeFileSync! +%x hour(s) +%x godzin %x kB %x kB +%x min +%x minut %x of %y rows in view %x z %y wierszy w widoku %x of 1 row in view %x z 1 wiersza w widoku +%x sec +%x sekund %x% %x% &Abort @@ -182,7 +172,7 @@ Add folder pair Dodaj foldery do porównania All directories in sync! Wszystkie katalogi zsynchronizowane! -An exception occured! +An exception occurred! Wystąpił wyjątek! As a result the files are separated into the following categories: W rezultacie pliki zostały podzielone na następujące kategorie: @@ -266,6 +256,8 @@ Continue Kontynuuj Conversion error: Błąd konwersji: +Copy filesystem permissions +Kopiuj uprawnienia plików Copy from left to right Kopiuj z lewej do prawej Copy from left to right overwriting @@ -278,8 +270,8 @@ Copy locked files Kopiuj zablokowane pliki Copy new or updated files to right folder. Kopiuj nowe lub aktualniejsze pliki na prawą stronę. -Copy shared or locked files using Volume Shadow Copy Service -Kopiuj współdzielone lub zablokowane pliki używając Volume Shadow Copy Service +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) +Kopiuj pliki udostępnione i zablokowane używając usługi Volume Shadow Copy\n (Wymaga uprawnień administratora) Copy to clipboard\tCTRL+C Kopiuj do pamięci\tCTRL+C Copying Symbolic Link %x overwriting %y @@ -384,6 +376,8 @@ Error Błąd Error changing modification time: Błąd zmiany godziny modyfikacji: +Error copying file permissions: +Błąd podczas kopiowania uprawnień pliku: Error copying file: Błąd podczas kopiowania pliku: Error copying locked file %x! @@ -409,7 +403,7 @@ Błąd podczas przenoszenia do kosza: Error opening file: Błąd odczytu pliku: Error parsing configuration file: -Błąd podczas parsowania pliku konfiguracyjnego: +Błąd parsowania pliku konfiguracyjnego: Error reading file attributes: Błąd odczytu atrybutów pliku: Error reading file: @@ -418,14 +412,16 @@ Error reading from synchronization database: Błąd odczytu z bazy danych synchronizacji: Error resolving symbolic link: Błąd odczytu dowiązania symbolicznego: +Error setting directory lock: + +Error setting privilege: +Błąd ustawiania uprawnień: Error starting Volume Shadow Copy Service! Błąd podczas uruchamianiu usługi Shadow Copy! Error traversing directory: Błąd podczas odczytywania katalogu: Error when monitoring directories. Błąd podczas monitorowania katalogów. -Error writing file attributes: -Błąd zapisu atrybutów pliku: Error writing file: Błąd zapisu pliku: Error writing to synchronization database: @@ -598,6 +594,8 @@ Initial synchronization: Wstępna synchronizacja: Integrate external applications into context menu. The following macros are available: Dołącz zewnętrzną aplikację do menu kontekstowego. Dostępne macra: +Invalid FreeFileSync config file! +Nieprawidłowy plik konfiguracyjny! Leave as unresolved conflict Zostaw jako nierozwiązany konflikt Left @@ -678,7 +676,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! Usunięcie katalogów jest w konflikcie podkatalogami oraz plikami! Please run a Compare first before synchronizing! Przed synchronizacją należy uruchomić Porównaj! -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. Naciśnij \"Przełącz\" aby otworzyć moduł GUI. Processing folder pair: Przetwarzanie folderów: @@ -704,6 +702,8 @@ Remove folder Usuń folder Remove folder pair Usuń parę folderów +Removing abandoned directory lock (%x)... + Report translation error Zgłoś błąd w tłumaczeniu Reset @@ -794,7 +794,7 @@ Stop Zatrzymaj Swap sides Zamień stronami -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... Przełączanie do trybu GUI FreeFileSync Symbolic Link handling Obsługa dowiązań symbolicznych @@ -844,6 +844,8 @@ Total required free disk space: Całkowita wymagana przestrzeń dyskowa: Total time: Całkowity czas: +Transfer file and directory permissions\n(Requires Administrator rights) +Transfer uprawnień plików i katalogów\n(Wymaga uprawnień Administratora) Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes Traktuj pliki różniące się dokładnie +/- 1 godzinę jako równe, mniej niż 1 godzinę jako konflikt by uwzględnić zmiane czasu letniego Unable to connect to sourceforge.net! @@ -872,6 +874,8 @@ Volume name %x not part of filename %y! Dysk %x nie jest częścią pliku %y! Waiting for all directories to become available... Oczekiwanie aż katalogi staną się dostępne... +Waiting while directory is locked (%x)... + Warning Uwaga Warning: Synchronization failed for %x item(s): diff --git a/BUILD/Languages/portuguese.lng b/BUILD/Languages/portuguese.lng index 3f320f91..1f376257 100644 --- a/BUILD/Languages/portuguese.lng +++ b/BUILD/Languages/portuguese.lng @@ -1,21 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE - Byte - Byte - GB - GB - MB - MB - day(s) - dia(s) - hour(s) - hora(s) - kB - kB - min - min - sec - seg %x / %y objects deleted successfully %x / %y objectos eliminados com sucesso %x Byte @@ -28,18 +12,24 @@ %x TB +%x day(s) + %x directories %x pastas %x files %x ficheiros -%x is not a valid FreeFileSync batch file! -%x não é um batch válido do FreeFileSync! +%x hour(s) + %x kB +%x min + %x of %y rows in view %x de %y ficheiros %x of 1 row in view %x de 1 linha +%x sec + %x% &Abort @@ -182,7 +172,7 @@ Add folder pair Adicionar um par de pastas All directories in sync! Todas as pastas sincronizadas! -An exception occured! +An exception occurred! Ocorreu uma excepção! As a result the files are separated into the following categories: Como resultado, os ficheiros foram separados nas seguintes categorias: @@ -266,6 +256,8 @@ Continue Continuar Conversion error: Erro de conversão: +Copy filesystem permissions + Copy from left to right Copiar da esquerda para a direita Copy from left to right overwriting @@ -278,8 +270,8 @@ Copy locked files Copiar ficheiros bloqueados Copy new or updated files to right folder. Copiar ficheiros novos ou actualizados para a direita -Copy shared or locked files using Volume Shadow Copy Service -Copiar ficheiros partilhados ou bloqueados usando o serviço Volume Shadow Copy +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) + Copy to clipboard\tCTRL+C Copiar para a Área de transferência\tCTRL+C Copying Symbolic Link %x overwriting %y @@ -384,6 +376,8 @@ Error Erro Error changing modification time: Erro ao mudar a hora de modificação: +Error copying file permissions: + Error copying file: Erro ao copiar ficheiro: Error copying locked file %x! @@ -418,14 +412,14 @@ Error reading from synchronization database: Erro ao ler a base de dados de sincronização: Error resolving symbolic link: Erro na resolução do link simbólico: +Error setting privilege: + Error starting Volume Shadow Copy Service! Erro ao iniciar o serviço Volume Shadow Copy! Error traversing directory: Erro ao percorrer a pasta: Error when monitoring directories. Erro ao monitorizar os directórios. -Error writing file attributes: -Erro na escrita dos atributos do ficheiro: Error writing file: Erro de escrita no ficheiro: Error writing to synchronization database: @@ -598,6 +592,8 @@ Initial synchronization: Sincronização inicial: Integrate external applications into context menu. The following macros are available: Integrar aplicações externas no menu de contexto. As seguintes macros estão disponíveis: +Invalid FreeFileSync config file! + Leave as unresolved conflict Deixar como conflito Left @@ -678,7 +674,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! Please run a Compare first before synchronizing! Use Comparar antes da primeira sincronização! -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. Processing folder pair: A processar o par do directorio: @@ -794,7 +790,7 @@ Stop Parar Swap sides Trocar lados -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... Symbolic Link handling @@ -844,6 +840,8 @@ Total required free disk space: Espaço livre necessário: Total time: Tempo total: +Transfer file and directory permissions\n(Requires Administrator rights) + Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes Tratar ficheiros com exactamente +/- 1 hora como iguais, e menos de 1 hora como conflito, para salvaguardar a alteração da Hora de Verão Unable to connect to sourceforge.net! diff --git a/BUILD/Languages/portuguese_br.lng b/BUILD/Languages/portuguese_br.lng index 9a8669b9..1a84c512 100644 --- a/BUILD/Languages/portuguese_br.lng +++ b/BUILD/Languages/portuguese_br.lng @@ -1,21 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE - Byte - Byte - GB - GB - MB - MB - day(s) - dia(s) - hour(s) - hora(s) - kB - kB - min - min - sec - seg %x / %y objects deleted successfully %x / %y objetos apagados com sucesso %x Byte @@ -28,18 +12,24 @@ %x PB %x TB %x TB +%x day(s) +%x dia(s) %x directories %x diretórios %x files %x arquivos -%x is not a valid FreeFileSync batch file! -%x não é um arquivo batch válido do FreeFileSync! +%x hour(s) +%x hora(s) %x kB %x kB +%x min +%x min %x of %y rows in view %x de %y arquivos %x of 1 row in view %x de 1 linha +%x sec +%x seg %x% %x% &Abort @@ -182,7 +172,7 @@ Add folder pair Adicionar par de pastas All directories in sync! Todos os diretórios em sincronismo! -An exception occured! +An exception occurred! Ocorreu uma exceção! As a result the files are separated into the following categories: Como resultado, os arquivos são separados nas seguintes categorias: @@ -266,6 +256,8 @@ Continue Continuar Conversion error: Erro de conversão: +Copy filesystem permissions +Copiar permissões de arquivos e diretórios Copy from left to right Copiar da esquerda para a direita Copy from left to right overwriting @@ -278,8 +270,8 @@ Copy locked files Copiar arquivos bloqueados (em uso) Copy new or updated files to right folder. Copiar arquivos novos ou atualizados para a pasta da direita -Copy shared or locked files using Volume Shadow Copy Service -Copiar arquivos compartilhados ou bloqueados usando o Serviço de Cópias de Sombra de Volume +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) +Copiar arquivos compartilhados ou bloqueados (em uso) usando o Serviço de Cópias de Sombra de Volume\n(Requer direitos de Administrador) Copy to clipboard\tCTRL+C Copiar para a Área de transferência\tCTRL+C Copying Symbolic Link %x overwriting %y @@ -384,6 +376,8 @@ Error Erro Error changing modification time: Erro ao mudar a hora de modificação: +Error copying file permissions: +Erro ao copiar permissões do arquivo: Error copying file: Erro ao copiar arquivo: Error copying locked file %x! @@ -418,14 +412,16 @@ Error reading from synchronization database: Erro ao ler do banco de dados de sincronização: Error resolving symbolic link: Erro na resolução de link simbólico: +Error setting directory lock: + +Error setting privilege: +Erro ao definir privilégio: Error starting Volume Shadow Copy Service! Erro ao inicializar o Serviço de Cópias de Sombra de Volume! Error traversing directory: Erro ao percorrer diretório: Error when monitoring directories. Erro monitorando diretórios. -Error writing file attributes: -Erro ao escrever atributos do arquivo: Error writing file: Erro ao escrever arquivo: Error writing to synchronization database: @@ -598,6 +594,8 @@ Initial synchronization: Sincronização inicial: Integrate external applications into context menu. The following macros are available: Integrar aplicações externas no menu de contexto. As seguintes macros estão disponíveis: +Invalid FreeFileSync config file! +Arquivo de configuração do FreeFileSync inválido! Leave as unresolved conflict Deixar como conflito não resolvido Left @@ -678,7 +676,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! O diretório a ser apagado está em conflito com seus subdiretórios e -arquivos! Please run a Compare first before synchronizing! Por favor execute primeiro a Comparação antes de sincronizar! -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. Pressione \"Alterar\" para abrir o modo GUI do FreeFileSync. Processing folder pair: Processando par de pastas: @@ -704,6 +702,8 @@ Remove folder Remover pasta Remove folder pair Remover par de pastas +Removing abandoned directory lock (%x)... + Report translation error Reportar erro de tradução Reset @@ -794,7 +794,7 @@ Stop Parar Swap sides Inverter lados -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... Alterando para o modo GUI do FreeFileSync... Symbolic Link handling Tratamento de Links Simbólicos @@ -844,8 +844,10 @@ Total required free disk space: Espaço livre total requerido: Total time: Tempo total: +Transfer file and directory permissions\n(Requires Administrator rights) +Transferir permissões de arquivos e diretórios\n(Requer direitos de Administrador) Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes -Tratar tempo dos arquivos que diferem exatamente por +/- 1 hora como igual, menor que 1 hora como conflito para lidar com mudanças de Horário de Verão +Tratar tempo dos arquivos que diferem exatamente por mais ou menos 1 hora como igual e menor que 1 hora como conflito para lidar com mudanças de Horário de Verão Unable to connect to sourceforge.net! Não foi possível conectar a sourceforge.net! Unable to create logfile! @@ -872,6 +874,8 @@ Volume name %x not part of filename %y! Nome do volume %x não é parte do arquivo %y! Waiting for all directories to become available... Esperando que todos os diretóricos fiquem disponíveis... +Waiting while directory is locked (%x)... + Warning Atenção Warning: Synchronization failed for %x item(s): diff --git a/BUILD/Languages/romanian.lng b/BUILD/Languages/romanian.lng index aaab97ce..7bb1bb92 100644 --- a/BUILD/Languages/romanian.lng +++ b/BUILD/Languages/romanian.lng @@ -1,21 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port din GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE - Byte - Baiți - GB - GB - MB - MB - day(s) - zile - hour(s) - ore - kB - KB - min - min - sec - sec %x / %y objects deleted successfully %x / %y obiecte șterse cu succes %x Byte @@ -28,18 +12,24 @@ %x PB %x TB %x TB +%x day(s) +%x zile %x directories %x dosare %x files %x file -%x is not a valid FreeFileSync batch file! -%x nu este o filă lot FreeFileSync validă ! +%x hour(s) +%x ore %x kB %x KB +%x min +%x min %x of %y rows in view %x din %y rînduri afișate %x of 1 row in view %x din 1 rînd afișat +%x sec +%x sec %x% %x% &Abort @@ -85,7 +75,7 @@ &OK &OK &Pause -&Pauză +&Pauzează &Quit &Ieși &Restore @@ -182,7 +172,7 @@ Add folder pair Adaugă Pereche Nouă de Dosare All directories in sync! Toate dosarele au fost sincronizate! -An exception occured! +An exception occurred! A apărut o excepție ! As a result the files are separated into the following categories: În concluzie, filele sînt repartizate în categoriile următoare: @@ -266,6 +256,8 @@ Continue Continuă Conversion error: Eroare de convertire: +Copy filesystem permissions +Copiază permisiunile sistemului de file Copy from left to right Copiază de la Stînga la Dreapta Copy from left to right overwriting @@ -278,8 +270,8 @@ Copy locked files Copiază filele zăvorîte [locked] Copy new or updated files to right folder. Copiază în dosarul din dreapta filele actualizate sau noi. -Copy shared or locked files using Volume Shadow Copy Service -Copiază filele partajate sau zăvorîte folosind serviciul de salvgardare din Windows +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) +Copiază filele partajate sau zăvorîte folosind Serviciul de Salvgardare a Volumelor [Volume Shadow Copy]\n(Necesită drepturi de Administrator) Copy to clipboard\tCTRL+C Copiază în Cliplanșetă\tCTRL+C Copying Symbolic Link %x overwriting %y @@ -384,6 +376,8 @@ Error Eroare Error changing modification time: Eroare la schimbarea datei de modificare: +Error copying file permissions: +Eroare la copierea permisiunilor filei: Error copying file: Eroare la copierea filei: Error copying locked file %x! @@ -418,14 +412,16 @@ Error reading from synchronization database: Eroare la citirea din baza de date a sincronizării: Error resolving symbolic link: Eroare la rezolvarea legăturii simbolice: +Error setting directory lock: + +Error setting privilege: +Eroare la setarea privilegiului: Error starting Volume Shadow Copy Service! Eroare la pornirea serviciului Volume Shadow Copy! Error traversing directory: Eroare la parcurgerea dosarului: Error when monitoring directories. Eroare la monitorizarea dosarelor. -Error writing file attributes: -Eroare la scrierea atributelor filei: Error writing file: Eroare la scrierea filei: Error writing to synchronization database: @@ -598,6 +594,8 @@ Initial synchronization: Sincronizare inițială: Integrate external applications into context menu. The following macros are available: Include aplicațiile externe în meniul contextual. Sînt disponibile următoarele macrocomenzi: +Invalid FreeFileSync config file! +Filă de configurare FreeFileSync nevalidă! Leave as unresolved conflict Lasă ca Conflict Nerezolvat Left @@ -678,7 +676,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! Ștergerea plănuită a dosarului intră în conflict cu subdosarele și filele sale! Please run a Compare first before synchronizing! Rulează compararea înainte de a sincroniza! -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. Apasă \"Comută\" pentru a deschide modul grafic al FreeFileSync Processing folder pair: Procesez perechea de dosare: @@ -704,6 +702,8 @@ Remove folder Înlătură Dosarul Remove folder pair Înlătură Perechea de Dosare +Removing abandoned directory lock (%x)... + Report translation error Raportarea erorilor de traducere Reset @@ -794,7 +794,7 @@ Stop Oprește Swap sides Schimbă părțile între ele -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... Comut la modul grafic al FreeFileSync... Symbolic Link handling Prelucrarea Legăturilor Simbolice (Simlegături) @@ -844,6 +844,8 @@ Total required free disk space: Spațiu de stocare necesar: Total time: Timp Total: +Transfer file and directory permissions\n(Requires Administrator rights) +Transferă permisiunile filelor și dosarelor\n(Necesită drepturi de Administrator) Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes Tratează ca egale timpurile filelor care diferă exact cu +/- 1 oră, iar cele care diferă cu mai puțin de 1 oră, ca niște conflicte generate de gestionarea orei de vară Unable to connect to sourceforge.net! @@ -872,6 +874,8 @@ Volume name %x not part of filename %y! Numele volumului %x nu face parte din numele filei %y ! Waiting for all directories to become available... Aștept ca toate dosarele să devină disponibile... +Waiting while directory is locked (%x)... + Warning Avertisment Warning: Synchronization failed for %x item(s): diff --git a/BUILD/Languages/russian.lng b/BUILD/Languages/russian.lng index 030df988..5e588273 100644 --- a/BUILD/Languages/russian.lng +++ b/BUILD/Languages/russian.lng @@ -1,47 +1,37 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI Framework\n wxFormBuilder\t- wxWidgets GUI-Builder\n CodeBlocks \t- Open-Source IDE - Byte - Байт - GB - ГБ - MB - МБ - day(s) - день(ей) - hour(s) - час(ов) - kB - кБ - min - мин. - sec - сек. %x / %y objects deleted successfully %x / %y объектов удалено удачно %x Byte - +%x Байт %x GB - +%x ГБ %x MB - +%x МБ %x PB - +%x ПБ %x TB +%x ТБ +%x day(s) %x directories %x папки %x files %x файл(ов) -%x is not a valid FreeFileSync batch file! -%x не корректный файл пакетного задания FreeFileSync! +%x hour(s) + %x kB +%x кБ +%x min %x of %y rows in view %x из %y строк(и) показано %x of 1 row in view %x из 1 строка показана -%x% +%x sec +%x% +%x% &Abort &Отмена &About... @@ -95,11 +85,11 @@ &Save &Сохранить &Switch - +&Переключить &Yes &Да (Build: %x) - +(Сборка %x) (Note that only FAT/FAT32 drives are affected by this problem!\nIn all other cases you can disable the setting \"ignore 1-hour difference\".) (Помните, что только диски FAT/FAT32 страдают от этой проблемы!\nВо всех остальных случаях вы можете отключить параметр \"игнорировать 1-часовую разницу\".) (Requires an Internet connection!) @@ -161,7 +151,7 @@ <Последняя сессия> - +<Символьная ссылка> <групповое выделение> A newer version of FreeFileSync is available: @@ -182,7 +172,7 @@ Add folder pair Добавить пару папок All directories in sync! Все папки синхронизированы! -An exception occured! +An exception occurred! Исключение произошло! As a result the files are separated into the following categories: Как результат файлы разделяются на следующие категории: @@ -207,7 +197,7 @@ Both sides have changed since last synchronization! Browse Обзор Browse directory - +Обзор папок Cannot determine sync-direction: Невозможно определить направление синхронизации: Cannot find %x @@ -215,7 +205,7 @@ Cannot find %x Category Категория Clear filter settings - +Очистить настройки фильтра Comma separated list Список, разделяемый запятыми Command line @@ -266,6 +256,8 @@ Continue Продолжить Conversion error: Ошибка преобразования: +Copy filesystem permissions + Copy from left to right Скопировать слева направо Copy from left to right overwriting @@ -278,16 +270,16 @@ Copy locked files Копировать заблокированные файлы Copy new or updated files to right folder. Копировать новые или обновлять файлы на правой стороне. -Copy shared or locked files using Volume Shadow Copy Service -Копировать общие или заблокированные файлы с помощью Службы Теневого Копирования Тома +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) + Copy to clipboard\tCTRL+C Копировать в буфер обмена\tCTRL+C Copying Symbolic Link %x overwriting %y - +Копирование символьной ссылки %x с перезаписью %y Copying Symbolic Link %x to %y - +Копирование симовльной ссылки %x в %y Copying file %x overwriting %y - +Копирование файла %x с перезаписью %y Copying file %x to %y Копирование файла %x в %y Could not determine volume name for file: @@ -335,7 +327,7 @@ Delete or overwrite files permanently Delete permanently Удалять, не помещая в "Корзину" Deleting Symbolic Link %x - +Удаление символьной ссылки %x Deleting file %x Удаление файла %x Deleting folder %x @@ -345,7 +337,7 @@ Deletion handling Description Описание Direct - +Прямое Directories are dependent! Be careful when setting up synchronization rules: Зависимые папки! Будьте внимательны при настройке правил синхронизации: Directories to watch @@ -371,11 +363,11 @@ Download now? Drag && drop Drag && drop Elements found: - +Элементов найдено: Elements processed: - +Элементов обработано: Elements remaining: - +Элементов осталось: Email Почта Endless loop when traversing directory: @@ -384,6 +376,8 @@ Error Ошибка Error changing modification time: Ошибка при изменении времени модификации файла: +Error copying file permissions: + Error copying file: Ошибка при копировании файла: Error copying locked file %x! @@ -418,14 +412,14 @@ Error reading from synchronization database: Ошибка при чтении из базы данных синхронизации: Error resolving symbolic link: Ошибка при решении символической ссылки: +Error setting privilege: + Error starting Volume Shadow Copy Service! Ошибка при запуске Службы Теневого Копирования Тома! Error traversing directory: Ошибка при пересечении папок: Error when monitoring directories. Ошибка при мониторинге папок. -Error writing file attributes: -Ошибка при записи параметров файла: Error writing file: Ошибка при записи файла: Error writing to synchronization database: @@ -479,7 +473,7 @@ Files that exist on both sides, left one is newer Files that exist on both sides, right one is newer Файлы, существующие на обоих сторонах, правый новее Files that have different content - +Файлы, имеющие различное содержание Files/folders that exist on left side only Файлы/папки, существующие только на левой стороне Files/folders that exist on right side only @@ -487,15 +481,15 @@ Files/folders that exist on right side only Filter files Фильтр файлов Filter is active - +Фильтр активен Filter settings have changed! Настройки фильтра были изменены! Filter view Вид фильтра Filter: All pairs - +Фильтр: Все пары Filter: Single pair - +Фильтр: Одна пара Find Найти Find what: @@ -503,7 +497,7 @@ Find what: Folder Comparison and Synchronization Сравнение и синхронизация Follow - +Последовательное Free disk space available: Доступно свободного места на диске: FreeFileSync Batch Job @@ -573,7 +567,7 @@ Identify and propagate changes on both sides using a database. Deletions and con If you like FFS Если Вам понравился FFS Ignore - +Игнорировать Ignore 1-hour file time difference Игнорировать 1-часовую разницу во времени Ignore errors @@ -598,6 +592,8 @@ Initial synchronization: Первоначальная синхронизация: Integrate external applications into context menu. The following macros are available: Интегрирует внешние приложения в контекстное меню.\nСледующие команды доступны: +Invalid FreeFileSync config file! + Leave as unresolved conflict Оставить как нерешенный конфликт Left @@ -633,7 +629,7 @@ Move files into a time-stamped subdirectory Moving %x to Recycle Bin Отправка %x в "Корзину" Moving Symbolic Link %x to user-defined directory %y - +Перемещение символьной ссылки %x в заданную пользователем папку %y Moving file %x to user-defined directory %y Перемещение файла %x в заданную пользователем папку %y Moving folder %x to user-defined directory %y @@ -663,7 +659,7 @@ Only files/directories that pass filtering will be selected for synchronization. Open with Explorer Открыть путь в Проводнике Open with default application - +Открыть с помощью приложения по-умолчанию Operation aborted! Операция отменена! Operation: @@ -675,11 +671,11 @@ Pause Paused Пауза Planned directory deletion is in conflict with its subdirectories and -files! - +При удалении папки возник конфликт с вложенными подпапками или файлами! Please run a Compare first before synchronizing! Пожалуйста, запустите сравнение перед синхронизацией! -Press \"Switch\" to open FreeFileSync GUI modus. - +Press \"Switch\" to open FreeFileSync GUI mode. +Нажмите \"Переключить\" для открытия пользовательского графического интерфейса FreeFileSync. Processing folder pair: Обработка пары папок: Published under the GNU General Public License: @@ -695,7 +691,7 @@ RealtimeSync - Автоматическая синхронизация RealtimeSync configuration Настройка RealtimeSync Recycle Bin not yet supported for this system! - +Корзина пока не поддерживается для этой системы! Relative path Относительный путь Remove alternate settings @@ -789,17 +785,17 @@ Start synchronization Statistics Статистика Status feedback - +Статус обратной связи Stop Стоп Swap sides Поменять направление -Switching to FreeFileSync GUI modus... - +Switching to FreeFileSync GUI mode... +Переключение на пользовательский графический интерфейс FreeFileSync... Symbolic Link handling - +Обращение к символьной ссылке Symlinks %x have the same date but a different target! - +Символьная ссылка %x имеет ту же дату, но различное содержание! Synchronization Preview Предпросмотр синхронизации Synchronization aborted! @@ -825,11 +821,11 @@ Target directory already existing! Target file already existing! Конечный файл уже существует! The command line is executed each time:\n- all directories become available (e.g. USB stick insert)\n- files within these directories or subdirectories are modified - +Командная строка выполняется каждый раз, когда:\n- все папки становятся доступны (например, подключение переносного носителя)\n- файлы в папках или подпапках изменены The file does not contain a valid configuration: Файл не содержит действительную конфигурацию: The file was not processed by last synchronization! - +Файл не был обработан при последней синхронизации! This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time. Этот вариант сравнивает два файла с одинаковыми именами и считает их равными, если они имеют одинаковый размер файла и одинаковую дату и время последнего изменения. Time @@ -844,6 +840,8 @@ Total required free disk space: Общее требуемое свободное дисковое пространство: Total time: Общее время: +Transfer file and directory permissions\n(Requires Administrator rights) + Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes Учитывать файлы, которые отличаются по времени на 1 час, как равные, менее чем на 1 час, как конфликтные, чтобы учесть переход на летнее время Unable to connect to sourceforge.net! @@ -871,7 +869,7 @@ Verifying file %x Volume name %x not part of filename %y! Имя тома %x не является частью имени файла %y! Waiting for all directories to become available... - +Ожидание, пока все папки станут доступными... Warning Внимание Warning: Synchronization failed for %x item(s): diff --git a/BUILD/Languages/slovenian.lng b/BUILD/Languages/slovenian.lng index 7dce6bf4..72c1b604 100644 --- a/BUILD/Languages/slovenian.lng +++ b/BUILD/Languages/slovenian.lng @@ -1,21 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port od GNU Compiler Collection\n wxWidgets \t- Open-Source GUI ogrodje\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE - Byte - Bajt - GB - GB - MB - MB - day(s) - dni - hour(s) - ur - kB - kB - min - min - sec - sek %x / %y objects deleted successfully %x / %y objektov uspešno izbrisanih %x Byte @@ -28,18 +12,24 @@ %x PB %x TB %x TB +%x day(s) +%x dan/dni %x directories %x imeniki %x files %x datoteke -%x is not a valid FreeFileSync batch file! -%x ni veljavna FreeFileSync batch datoteka! +%x hour(s) +%x ura/ur %x kB %x kB +%x min +%x min %x of %y rows in view %x od %y vrstic prikazanih %x of 1 row in view %x od 1 vrstice prikazane +%x sec +%x sek %x% %x% &Abort @@ -182,7 +172,7 @@ Add folder pair Dodaj par imenikov All directories in sync! Vsi imeniki so sinhronizirani! -An exception occured! +An exception occurred! Zgodila se je napaka! As a result the files are separated into the following categories: Kot rezultat so datoteke razdeljene v naslednje kategorije: @@ -266,6 +256,8 @@ Continue Nadaljuj Conversion error: Napaka pri pretvorbi: +Copy filesystem permissions +Kopiraj dovoljenja datotečnega sistema Copy from left to right Kopiraj iz leve na desno Copy from left to right overwriting @@ -278,8 +270,8 @@ Copy locked files Kopiraj zaklenjene datoteke Copy new or updated files to right folder. Kopiraj nove ali posodobljene datoteke v desno mapo. -Copy shared or locked files using Volume Shadow Copy Service -Kopiraj deljene ali zaklenjene datoteke z uporabo servisa Volume Shadow Copy +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) +Kopiraj deljene ali zaklenjene datoteke z uporabo servisa Shadow Copy\n(Zahteva pravice skrbnika) Copy to clipboard\tCTRL+C Kopiraj v odložišče\tCTRL+C Copying Symbolic Link %x overwriting %y @@ -384,6 +376,8 @@ Error Napaka Error changing modification time: Napaka pri spreminjanju časa modifikacije: +Error copying file permissions: +Napaka pri kopiranju datotečnih dovoljenj: Error copying file: Napaka pri kopiranju datoteke: Error copying locked file %x! @@ -418,14 +412,16 @@ Error reading from synchronization database: Napaka pri branju iz sinhronizacijske podatkovne baze: Error resolving symbolic link: Napaka pri razreševanju simbolične povezave: +Error setting directory lock: + +Error setting privilege: +Napaka pri nastavljanju privilegija: Error starting Volume Shadow Copy Service! Napaka pri zagonu servisa Volume Shadow Copy! Error traversing directory: Napaka pri prehajanju imenika: Error when monitoring directories. Napaka pri nadzorovanju imenikov. -Error writing file attributes: -Napaka pri pisanju atributov datoteke: Error writing file: Napaka pri pisanju datoteke: Error writing to synchronization database: @@ -598,6 +594,8 @@ Initial synchronization: Začetna sinhronizacija: Integrate external applications into context menu. The following macros are available: Integriraj zunanje aplikacije v kontekstni menu. Na voljo so naslednji makri: +Invalid FreeFileSync config file! +Neveljavna FreeFileSync nastavitvena datoteka! Leave as unresolved conflict Pusti kot nerešeni spor Left @@ -678,7 +676,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! Načrtovano brisanje imenika je v sporu z njegovimi podimeniki in -datotekami! Please run a Compare first before synchronizing! Prosim najprej zaženite Primerjaj preden sinhronizirate! -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. Pritisnite \"Zamenjaj\", da odprete FreeFileSync GUI način. Processing folder pair: Obdelujem par map: @@ -704,6 +702,8 @@ Remove folder Odstrani v mapo Remove folder pair Odstrani par imenikov +Removing abandoned directory lock (%x)... + Report translation error Poročaj o napaki prevoda Reset @@ -794,7 +794,7 @@ Stop Ustavi Swap sides Zamenjaj strani -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... Preklapljam v FreeFileSync GUI način... Symbolic Link handling Rokovanje s simboličnimi povezavami @@ -844,6 +844,8 @@ Total required free disk space: Skupno zahtevani prosti prostor na disku: Total time: Celoten čas: +Transfer file and directory permissions\n(Requires Administrator rights) +Prenesi dovoljenja datotek in imenikov\n(Zahteva pravice skrbnika) Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes Obravnavaj čas spremembe datoteke, ki se razlikuje za točno +/- 1 uro kot enak, če pa je manjši kot 1 ura, pa kot spor, da lahko obravnavamo spremembe Poletnega časa Unable to connect to sourceforge.net! @@ -872,6 +874,8 @@ Volume name %x not part of filename %y! Ime volumna %x ni del imena datoteke %y! Waiting for all directories to become available... Čakam, da bodo vsi imeniki na voljo... +Waiting while directory is locked (%x)... + Warning Pozor Warning: Synchronization failed for %x item(s): diff --git a/BUILD/Languages/spanish.lng b/BUILD/Languages/spanish.lng index 23bd2a59..92792843 100644 --- a/BUILD/Languages/spanish.lng +++ b/BUILD/Languages/spanish.lng @@ -1,21 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE - Byte - Byte - GB - GB - MB - MB - day(s) - dia(s) - hour(s) - hora(s) - kB - kB - min - min - sec - seg %x / %y objects deleted successfully %x / %y objetos borrados satisfactoriamente %x Byte @@ -28,18 +12,24 @@ %x PB %x TB %x TB +%x day(s) + %x directories %x directorios %x files %x archivos -%x is not a valid FreeFileSync batch file! -%x no es un archivo batch de FreeFileSync válido! +%x hour(s) + %x kB %x kB +%x min + %x of %y rows in view %x de %y filas en vista %x of 1 row in view %x de 1 fila en vista +%x sec + %x% %x% &Abort @@ -182,7 +172,7 @@ Add folder pair Añadir un par de carpetas All directories in sync! ¡Todos los directorios en sincronización! -An exception occured! +An exception occurred! ¡Ha ocurrido una excepción! As a result the files are separated into the following categories: Como resultado, los archivos están separados en las siguientes categorías: @@ -266,6 +256,8 @@ Continue Continuar Conversion error: Error de conversión: +Copy filesystem permissions + Copy from left to right Copiar de izquierda a derecha Copy from left to right overwriting @@ -278,8 +270,8 @@ Copy locked files Copiar archivos bloqueados Copy new or updated files to right folder. Copiar archivos nuevos o actualizados a la carpeta de la derecha. -Copy shared or locked files using Volume Shadow Copy Service -Copiar archivos compartidos o bloqueados usando el servicio "Volume Shadow Copy" +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) + Copy to clipboard\tCTRL+C Copiar al Portapapeles\tCTRL+C Copying Symbolic Link %x overwriting %y @@ -384,6 +376,8 @@ Error Error Error changing modification time: Error al cambiar hora de modificación: +Error copying file permissions: + Error copying file: Error al copiar archivo: Error copying locked file %x! @@ -418,14 +412,14 @@ Error reading from synchronization database: Error al leer de la base de datos de sincronización: Error resolving symbolic link: Error al resolver enlace simbólico: +Error setting privilege: + Error starting Volume Shadow Copy Service! ¡Error al iniciar el servicio "Volume Shadow Copy"! Error traversing directory: Error al buscar en el directorio: Error when monitoring directories. Error al visualizar los directorios. -Error writing file attributes: -Error al escribir atributos de archivo: Error writing file: Error al escribir archivo: Error writing to synchronization database: @@ -598,6 +592,8 @@ Initial synchronization: Sincronización inicial: Integrate external applications into context menu. The following macros are available: Integrar aplicaciones externas en el menú de contexto. Los siguientes macros están disponibles: +Invalid FreeFileSync config file! + Leave as unresolved conflict Dejar como conflicto sin resolver Left @@ -678,7 +674,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! ¡La eliminación planeada del directorio se encuentra en conflicto con sus subdirectorios y archivos! Please run a Compare first before synchronizing! ¡Por favor, ejecute la comparación antes de la sincronización! -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. Presionar \"Cambiar\" para abrir el modo GUI de FreeFileSync. Processing folder pair: Procesar un par de carpetas: @@ -794,7 +790,7 @@ Stop Detener Swap sides Intercambiar lados -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... Cambiando al modo GUI de FreeFileSync... Symbolic Link handling Gestión de enlaces simbólicos @@ -844,6 +840,8 @@ Total required free disk space: Espacio total de disco necesario: Total time: Tiempo total: +Transfer file and directory permissions\n(Requires Administrator rights) + Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes El archivo en cuestión tiene una diferencia de tiempo de +/- 1 hora, menos de una hora entra en conflicto para gestionar los cambios referentes al horario de verano Unable to connect to sourceforge.net! diff --git a/BUILD/Languages/swedish.lng b/BUILD/Languages/swedish.lng index e5c5a68c..9e4b4a9e 100644 --- a/BUILD/Languages/swedish.lng +++ b/BUILD/Languages/swedish.lng @@ -1,21 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI Framework\n wxFormBuilder\t- wxWidgets GUI-Builder\n CodeBlocks \t- Open-Source IDE - Byte - Byte - GB - GB - MB - MB - day(s) - dag(ar) - hour(s) - timma(r) - kB - kB - min - min. - sec - sek. %x / %y objects deleted successfully %x / %y objekt borttagna %x Byte @@ -28,18 +12,24 @@ %x PB %x TB %x TB +%x day(s) +%x dag(ar) %x directories %x kataloger %x files %x filer -%x is not a valid FreeFileSync batch file! -%x är ingen giltig FreeFileSync batch-fil! +%x hour(s) +%x timma(r) %x kB %x kB +%x min +%x min %x of %y rows in view %x rader av %y i vyn %x of 1 row in view %x av 1 rad i vyn +%x sec +%x sek %x% %x% &Abort @@ -182,7 +172,7 @@ Add folder pair Lägg till katalogpar All directories in sync! Alla kataloger synkade! -An exception occured! +An exception occurred! Ett undantag inträffade! As a result the files are separated into the following categories: Som ett resultat blir filerna separerade i följande kategorier: @@ -266,6 +256,8 @@ Continue Fortsätt Conversion error: Konversionsfel: +Copy filesystem permissions +Kopiera filsystembehörigheter Copy from left to right Kopiera från vänster till höger Copy from left to right overwriting @@ -278,8 +270,8 @@ Copy locked files Kopiera låsta filer Copy new or updated files to right folder. Kopiera nya och uppdaterade filer till höger katalog. -Copy shared or locked files using Volume Shadow Copy Service -Använd Volume Shadow Copy Service för att kopiera låsta eller delade filer +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) +Kopiera delade eller låsta filer med hjälp av Volume Shadow Copy Service\n(Kräver administratörsrättighet) Copy to clipboard\tCTRL+C Kopiera till urklipp\tCTRL+C Copying Symbolic Link %x overwriting %y @@ -384,6 +376,8 @@ Error Fel Error changing modification time: Kan inte modifiera tidsstämpel: +Error copying file permissions: +Kan inte kopiera filsystembehörighet: Error copying file: Kan inte kopiera fil: Error copying locked file %x! @@ -418,14 +412,14 @@ Error reading from synchronization database: Kan inte läsa från databasen: Error resolving symbolic link: Kan inte tyda symbolisk länk: +Error setting privilege: +Kan inte ange privilegie: Error starting Volume Shadow Copy Service! Kan inte starta 'Volume Shadow Copy Service'! Error traversing directory: Accessfel på katalog: Error when monitoring directories. Fel vid övervakning av kataloger. -Error writing file attributes: -Kan inte skriva filattribut: Error writing file: Kan inte skriva fil: Error writing to synchronization database: @@ -598,6 +592,8 @@ Initial synchronization: Initial synkronisering: Integrate external applications into context menu. The following macros are available: Integrera externa program i högerklicksmeny. Följande variabler finns tillgängliga: +Invalid FreeFileSync config file! +Felaktig FreeFileSync konfigurationsfil! Leave as unresolved conflict Ignorera konflikt Left @@ -678,7 +674,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! Planerad katalogborttagning är i konflikt med sina underkataloger och filer Please run a Compare first before synchronizing! Du måste trycka \"Jämför\" innan du kan synkronisera. -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. Tryck på \"Växla\" för att öppna FreeFileSyncs grafiska läge Processing folder pair: Processar katalogpar: @@ -794,7 +790,7 @@ Stop Stopp Swap sides Byt sida -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... Växlar till FreeFileSyncs grafiska läge Symbolic Link handling Hantering av Symboliska länkar @@ -844,6 +840,8 @@ Total required free disk space: Ledigt diskutrymme som krävs: Total time: Total tid: +Transfer file and directory permissions\n(Requires Administrator rights) +Överför fil- och katalogrättigheter\n(Kräver administratörsrättigheter) Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes Betrakta tidsstämplar som skiljer exakt +/- 1 timme som lika, och mindre än 1 timme som konflikt, för att hantera sommartid Unable to connect to sourceforge.net! diff --git a/BUILD/Languages/turkish.lng b/BUILD/Languages/turkish.lng index 6c7aa151..8971e84c 100644 --- a/BUILD/Languages/turkish.lng +++ b/BUILD/Languages/turkish.lng @@ -1,21 +1,5 @@ MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI framework\n wxFormBuilder\t- wxWidgets GUI-builder\n CodeBlocks \t- Open-Source IDE MinGW \t- Windows port of GNU Compiler Collection\n wxWidgets \t- Open-Source GUI Framework\n wxFormBuilder\t- wxWidgets GUI-Builder\n CodeBlocks \t- Open-Source IDE - Byte - Bit - GB - GB - MB - MB - day(s) - gün(ler) - hour(s) - saat(ler) - kB - kB - min - dak - sec - san %x / %y objects deleted successfully %x / %y obje başarıyla silindi %x Byte @@ -28,18 +12,24 @@ %x TB +%x day(s) + %x directories %x dizin %x files %x dosya -%x is not a valid FreeFileSync batch file! -%x geçerli bir FreeFileSync komut (batch) dosyası değildir! +%x hour(s) + %x kB +%x min + %x of %y rows in view %y satırdan %x'i görüntüleniyor %x of 1 row in view 1 satırdan %x'i görüntüleniyor +%x sec + %x% &Abort @@ -182,7 +172,7 @@ Add folder pair Klasör çifti ekle All directories in sync! -An exception occured! +An exception occurred! Olağan dışı bir durum oluştu! As a result the files are separated into the following categories: Sonuç olarak dosyalar takibeden katagorilere göre ayrıldı: @@ -266,6 +256,8 @@ Continue Devam et Conversion error: Dönüştürme hatası: +Copy filesystem permissions + Copy from left to right Soldan sağa kopyala Copy from left to right overwriting @@ -278,7 +270,7 @@ Copy locked files Copy new or updated files to right folder. Yeni veya güncellenmiş dosyaları sağdaki klasöre kopyala. -Copy shared or locked files using Volume Shadow Copy Service +Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights) Copy to clipboard\tCTRL+C Hafızaya kopyala\tCTRL+C @@ -384,6 +376,8 @@ Error Hata Error changing modification time: Değişiklik tarihini değiştirirken hata: +Error copying file permissions: + Error copying file: Dosya kopyalarken hata: Error copying locked file %x! @@ -418,14 +412,14 @@ Error reading from synchronization database: Senkronizasyon veri tabanýndan okuma hatasý: Error resolving symbolic link: Sembolik bağlantıyı çözümlerken hata: +Error setting privilege: + Error starting Volume Shadow Copy Service! 'Volume shadow copy' servisini başlatırken hata! Error traversing directory: Dizini okurken hata: Error when monitoring directories. Dizinler izlenirken hata. -Error writing file attributes: -Dosya özniteliklerini yazarken hata: Error writing file: Dosya yazarken hata: Error writing to synchronization database: @@ -598,6 +592,8 @@ Initial synchronization: Baþlangýç senkronizasyonu: Integrate external applications into context menu. The following macros are available: Harici uygulamaları içerik menüsüne ekle. Şu makro’lar temin edilebilir: +Invalid FreeFileSync config file! + Leave as unresolved conflict Çözülmemiş tutarsızlık olarak bırak Left @@ -678,7 +674,7 @@ Planned directory deletion is in conflict with its subdirectories and -files! Please run a Compare first before synchronizing! -Press \"Switch\" to open FreeFileSync GUI modus. +Press \"Switch\" to open FreeFileSync GUI mode. Processing folder pair: @@ -794,7 +790,7 @@ Stop Durdur Swap sides Tarafları ters çevir -Switching to FreeFileSync GUI modus... +Switching to FreeFileSync GUI mode... Symbolic Link handling @@ -844,6 +840,8 @@ Total required free disk space: Toplam gerekli boş disk alanı: Total time: Toplam zaman: +Transfer file and directory permissions\n(Requires Administrator rights) + Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes Dosya tarihleri tam olarak +/- 1 saat farklı olduğunda dosyaları eşit olarak algıla. 1 saatten az tarih farklılıklarını ise tutarsızlık olarak belirt (Gün ışığından yararlanma durumu) Unable to connect to sourceforge.net! diff --git a/BUILD/Resources.dat b/BUILD/Resources.dat index 57450b8d..42cbfb40 100644 Binary files a/BUILD/Resources.dat and b/BUILD/Resources.dat differ diff --git a/Cleanup.cmd b/Cleanup.cmd index ebed029e..c224ad0b 100644 --- a/Cleanup.cmd +++ b/Cleanup.cmd @@ -29,9 +29,11 @@ del BUILD\RealtimeSync*.lib del BUILD\RealtimeSync*.exp del BUILD\FreeFileSync.exe +del BUILD\FreeFileSync_Debug.exe del BUILD\FreeFileSync_Win32.exe del BUILD\FreeFileSync_x64.exe del BUILD\RealtimeSync.exe +del BUILD\RealtimeSync_Debug.exe del BUILD\RealtimeSync_Win32.exe del BUILD\RealtimeSync_x64.exe del BUILD\gmon.out diff --git a/FreeFileSync - wxWidgets v2.9.1 Beta.vcxproj b/FreeFileSync - wxWidgets v2.9.1 Beta.vcxproj new file mode 100644 index 00000000..6fe2a80e --- /dev/null +++ b/FreeFileSync - wxWidgets v2.9.1 Beta.vcxproj @@ -0,0 +1,310 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {86C36CC7-9418-4253-9929-829486F59A00} + Win32Proj + FreeFileSync + + + + Application + true + Unicode + v100 + + + Application + true + Unicode + Windows7.1SDK + + + Application + false + true + Unicode + v100 + + + Application + false + true + Unicode + Windows7.1SDK + + + + + + + + + + + + + + + + + + + true + BUILD\ + OBJ\$(ProjectName)_$(Configuration)_$(PlatformName)_VCPP\ + $(ProjectName)_$(PlatformName)_beta + false + true + + + true + BUILD\ + OBJ\$(ProjectName)_$(Configuration)_$(PlatformName)_VCPP\ + $(ProjectName)_$(PlatformName) + false + + + false + BUILD\ + OBJ\$(ProjectName)_$(Configuration)_$(PlatformName)_VCPP\ + false + $(ProjectName)_$(PlatformName)_beta + + + false + BUILD\ + OBJ\$(ProjectName)_$(Configuration)_$(PlatformName)_VCPP\ + false + $(ProjectName)_$(PlatformName) + + + + Use + Level4 + Disabled + wxUSE_UNICODE;__WXMSW__;FFS_WIN;__WXDEBUG__;TIXML_USE_STL;ZSTRING_WIDE_CHAR;%(PreprocessorDefinitions) + C:\Programme\C++\wxWidgets-2.9.1\include;C:\Programme\C++\wxWidgets-2.9.1\lib\vc_lib\mswud;C:\Program Files\C++\Boost + $(ProjectDir)library\pch.h + 4100 + false + false + $(IntDir)pch.obj + $(ProjectDir)library/pch.h + EditAndContinue + MultiThreadedDebugDLL + + + Windows + true + true + $(OutDir)$(TargetName)$(TargetExt) + wxmsw29ud_adv.lib;wxmsw29ud_core.lib;wxbase29ud.lib;wxpngd.lib;wxzlibd.lib;wxbase29ud_net.lib;comctl32.lib;ws2_32.lib;Rpcrt4.lib;winmm.lib;%(AdditionalDependencies) + C:\Programme\C++\wxWidgets-2.9.1\lib\vc_lib;C:\Program Files\C++\Boost\stage\lib + + + + + C:\Programme\C++\wxWidgets-2.9.1\include;C:\Programme\C++\wxWidgets-2.9.1\lib\vc_lib\mswud + %(PreprocessorDefinitions); + + + + + + + + + Use + Level4 + Disabled + wxUSE_UNICODE;__WXMSW__;FFS_WIN;__WXDEBUG__;TIXML_USE_STL;ZSTRING_WIDE_CHAR;%(PreprocessorDefinitions) + C:\Programme\C++\wxWidgets-x64\include;C:\Programme\C++\wxWidgets-x64\lib\vc_lib\mswud;C:\Program Files\C++\Boost + $(ProjectDir)library\pch.h + 4100 + false + false + $(IntDir)pch.obj + $(ProjectDir)library/pch.h + ProgramDatabase + true + + + Windows + true + true + $(OutDir)$(TargetName)$(TargetExt) + wxmsw29ud_adv.lib;wxmsw29ud_core.lib;wxbase29ud.lib;wxpngd.lib;wxzlibd.lib;wxbase29ud_net.lib;comctl32.lib;ws2_32.lib;Rpcrt4.lib;winmm.lib;%(AdditionalDependencies) + C:\Programme\C++\wxWidgets-x64\lib\vc_lib;C:\Program Files\C++\Boost\stage64\lib + + + + + C:\Programme\C++\wxWidgets-2.9.1\include;C:\Programme\C++\wxWidgets-2.9.1\lib\vc_lib\mswud + %(PreprocessorDefinitions);WX_CPU_AMD64 + + + + + + + + + Level4 + NotUsing + MaxSpeed + true + true + wxUSE_UNICODE;__WXMSW__;FFS_WIN;NDEBUG;TIXML_USE_STL;ZSTRING_WIDE_CHAR;%(PreprocessorDefinitions) + C:\Programme\C++\wxWidgets-2.9.1\include;C:\Programme\C++\wxWidgets-2.9.1\lib\vc_lib\mswu;C:\Program Files\C++\Boost + Speed + 4100;4996 + MultiThreaded + true + false + + + Windows + false + true + true + true + wxmsw29u_adv.lib;wxmsw29u_core.lib;wxbase29u.lib;wxpng.lib;wxzlib.lib;wxbase29u_net.lib;comctl32.lib;ws2_32.lib;winmm.lib;Rpcrt4.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + C:\Programme\C++\wxWidgets-2.9.1\lib\vc_lib;C:\Program Files\C++\Boost\stage\lib + + + + + C:\Programme\C++\wxWidgets-2.9.1\include;C:\Programme\C++\wxWidgets-2.9.1\lib\vc_lib\mswu + %(PreprocessorDefinitions); + + + + + + + Level4 + NotUsing + MaxSpeed + true + true + wxUSE_UNICODE;__WXMSW__;FFS_WIN;NDEBUG;TIXML_USE_STL;ZSTRING_WIDE_CHAR;%(PreprocessorDefinitions) + C:\Programme\C++\wxWidgets-x64\include;C:\Programme\C++\wxWidgets-x64\lib\vc_lib\mswu;C:\Program Files\C++\Boost + Speed + 4100 + MultiThreaded + true + false + true + + + Windows + false + true + true + true + wxmsw29u_adv.lib;wxmsw29u_core.lib;wxbase29u.lib;wxpng.lib;wxzlib.lib;wxbase29u_net.lib;comctl32.lib;ws2_32.lib;winmm.lib;Rpcrt4.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + C:\Programme\C++\wxWidgets-x64\lib\vc_lib;C:\Program Files\C++\Boost\stage64\lib + + + + + C:\Programme\C++\wxWidgets-2.9.1\include;C:\Programme\C++\wxWidgets-2.9.1\lib\vc_lib\mswu + %(PreprocessorDefinitions);WX_CPU_AMD64 + + + + + + + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FreeFileSync.cbp b/FreeFileSync.cbp index 750cc527..a8e8709d 100644 --- a/FreeFileSync.cbp +++ b/FreeFileSync.cbp @@ -8,7 +8,7 @@