From 9321c6bdfc559db6cf436d4ea88198983ce59846 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 2 Oct 2015 14:53:55 +0200 Subject: 6.12 --- FreeFileSync/Build/Changelog.txt | 19 +- .../Build/Help/html/Comparison Settings.html | 8 +- FreeFileSync/Build/Help/html/FreeFileSync.html | 2 +- .../Build/Help/img/comparison_settings.png | Bin 37133 -> 37039 bytes FreeFileSync/Build/Help/img/time_shift.png | Bin 26074 -> 26529 bytes FreeFileSync/Build/Languages/arabic.lng | 209 ++- FreeFileSync/Build/Languages/bulgarian.lng | 213 ++- FreeFileSync/Build/Languages/chinese_simple.lng | 209 ++- .../Build/Languages/chinese_traditional.lng | 207 ++- FreeFileSync/Build/Languages/croatian.lng | 209 ++- FreeFileSync/Build/Languages/czech.lng | 203 ++- FreeFileSync/Build/Languages/danish.lng | 209 ++- FreeFileSync/Build/Languages/dutch.lng | 258 +-- FreeFileSync/Build/Languages/english_uk.lng | 205 ++- FreeFileSync/Build/Languages/finnish.lng | 203 ++- FreeFileSync/Build/Languages/french.lng | 207 ++- FreeFileSync/Build/Languages/german.lng | 194 ++- FreeFileSync/Build/Languages/greek.lng | 209 ++- FreeFileSync/Build/Languages/hebrew.lng | 205 ++- FreeFileSync/Build/Languages/hungarian.lng | 207 ++- FreeFileSync/Build/Languages/italian.lng | 209 ++- FreeFileSync/Build/Languages/japanese.lng | 211 ++- FreeFileSync/Build/Languages/korean.lng | 217 ++- FreeFileSync/Build/Languages/lithuanian.lng | 199 ++- FreeFileSync/Build/Languages/norwegian.lng | 213 ++- .../Build/Languages/outdated/scottish_gaelic.lng | 1664 ++++++++++++++++++++ .../Build/Languages/outdated/slovenian.lng | 1664 ++++++++++++++++++++ .../Build/Languages/outdated/ukrainian.lng | 329 ++-- FreeFileSync/Build/Languages/polish.lng | 193 ++- FreeFileSync/Build/Languages/portuguese.lng | 209 ++- FreeFileSync/Build/Languages/portuguese_br.lng | 209 ++- FreeFileSync/Build/Languages/romanian.lng | 213 ++- FreeFileSync/Build/Languages/russian.lng | 213 ++- FreeFileSync/Build/Languages/scottish_gaelic.lng | 1599 ------------------- FreeFileSync/Build/Languages/serbian.lng | 206 ++- FreeFileSync/Build/Languages/slovenian.lng | 1599 ------------------- FreeFileSync/Build/Languages/spanish.lng | 216 ++- FreeFileSync/Build/Languages/swedish.lng | 211 ++- FreeFileSync/Build/Languages/turkish.lng | 191 ++- FreeFileSync/Source/RealtimeSync/app_icon.h | 2 +- FreeFileSync/Source/RealtimeSync/application.cpp | 10 +- FreeFileSync/Source/RealtimeSync/application.h | 2 +- FreeFileSync/Source/RealtimeSync/gui_generated.cpp | 2 +- FreeFileSync/Source/RealtimeSync/main_dlg.cpp | 14 +- FreeFileSync/Source/RealtimeSync/main_dlg.h | 2 +- FreeFileSync/Source/RealtimeSync/monitor.cpp | 2 +- FreeFileSync/Source/RealtimeSync/monitor.h | 2 +- FreeFileSync/Source/RealtimeSync/tray_menu.cpp | 2 +- FreeFileSync/Source/RealtimeSync/tray_menu.h | 2 +- FreeFileSync/Source/RealtimeSync/xml_proc.cpp | 2 +- FreeFileSync/Source/RealtimeSync/xml_proc.h | 2 +- FreeFileSync/Source/algorithm.cpp | 7 +- FreeFileSync/Source/algorithm.h | 2 +- FreeFileSync/Source/application.cpp | 58 +- FreeFileSync/Source/application.h | 2 +- FreeFileSync/Source/comparison.cpp | 8 +- FreeFileSync/Source/comparison.h | 2 +- FreeFileSync/Source/file_hierarchy.cpp | 6 +- FreeFileSync/Source/file_hierarchy.h | 8 +- FreeFileSync/Source/lib/binary.cpp | 2 +- FreeFileSync/Source/lib/binary.h | 2 +- FreeFileSync/Source/lib/db_file.cpp | 6 +- FreeFileSync/Source/lib/db_file.h | 2 +- FreeFileSync/Source/lib/dir_exist_async.h | 2 +- FreeFileSync/Source/lib/dir_lock.cpp | 30 +- FreeFileSync/Source/lib/dir_lock.h | 2 +- FreeFileSync/Source/lib/error_log.h | 2 +- FreeFileSync/Source/lib/ffs_paths.cpp | 18 +- FreeFileSync/Source/lib/ffs_paths.h | 2 +- FreeFileSync/Source/lib/generate_logfile.h | 4 +- FreeFileSync/Source/lib/hard_filter.cpp | 2 +- FreeFileSync/Source/lib/hard_filter.h | 2 +- FreeFileSync/Source/lib/help_provider.h | 8 +- FreeFileSync/Source/lib/icon_buffer.cpp | 26 +- FreeFileSync/Source/lib/icon_buffer.h | 2 +- FreeFileSync/Source/lib/localization.cpp | 12 +- FreeFileSync/Source/lib/localization.h | 2 +- FreeFileSync/Source/lib/norm_filter.h | 2 +- FreeFileSync/Source/lib/parallel_scan.cpp | 2 +- FreeFileSync/Source/lib/parallel_scan.h | 2 +- FreeFileSync/Source/lib/parse_lng.h | 74 +- FreeFileSync/Source/lib/parse_plural.h | 2 +- FreeFileSync/Source/lib/perf_check.cpp | 2 +- FreeFileSync/Source/lib/perf_check.h | 2 +- FreeFileSync/Source/lib/process_xml.cpp | 2 +- FreeFileSync/Source/lib/process_xml.h | 2 +- FreeFileSync/Source/lib/resolve_path.cpp | 20 +- FreeFileSync/Source/lib/resolve_path.h | 6 +- FreeFileSync/Source/lib/return_codes.h | 2 +- FreeFileSync/Source/lib/soft_filter.h | 2 +- FreeFileSync/Source/lib/status_handler.cpp | 2 +- FreeFileSync/Source/lib/status_handler.h | 2 +- FreeFileSync/Source/lib/status_handler_impl.h | 2 +- FreeFileSync/Source/lib/versioning.h | 2 +- FreeFileSync/Source/process_callback.h | 2 +- FreeFileSync/Source/structures.cpp | 4 +- FreeFileSync/Source/structures.h | 2 +- FreeFileSync/Source/synchronization.cpp | 23 +- FreeFileSync/Source/synchronization.h | 2 +- FreeFileSync/Source/ui/app_icon.h | 2 +- FreeFileSync/Source/ui/batch_config.cpp | 4 +- FreeFileSync/Source/ui/batch_config.h | 2 +- FreeFileSync/Source/ui/batch_status_handler.cpp | 8 +- FreeFileSync/Source/ui/batch_status_handler.h | 4 +- FreeFileSync/Source/ui/check_version.cpp | 98 +- FreeFileSync/Source/ui/check_version.h | 2 +- FreeFileSync/Source/ui/column_attr.h | 2 +- FreeFileSync/Source/ui/custom_grid.cpp | 2 +- FreeFileSync/Source/ui/custom_grid.h | 2 +- FreeFileSync/Source/ui/dir_name.cpp | 8 +- FreeFileSync/Source/ui/dir_name.h | 2 +- FreeFileSync/Source/ui/folder_history_box.cpp | 4 +- FreeFileSync/Source/ui/folder_history_box.h | 2 +- FreeFileSync/Source/ui/folder_history_types.h | 2 +- FreeFileSync/Source/ui/folder_pair.h | 2 +- FreeFileSync/Source/ui/grid_view.cpp | 2 +- FreeFileSync/Source/ui/grid_view.h | 2 +- FreeFileSync/Source/ui/gui_generated.cpp | 95 +- FreeFileSync/Source/ui/gui_generated.h | 18 +- FreeFileSync/Source/ui/gui_status_handler.cpp | 4 +- FreeFileSync/Source/ui/gui_status_handler.h | 6 +- FreeFileSync/Source/ui/main_dlg.cpp | 119 +- FreeFileSync/Source/ui/main_dlg.h | 2 +- FreeFileSync/Source/ui/on_completion_box.cpp | 4 +- FreeFileSync/Source/ui/on_completion_box.h | 2 +- FreeFileSync/Source/ui/progress_indicator.cpp | 32 +- FreeFileSync/Source/ui/progress_indicator.h | 2 +- FreeFileSync/Source/ui/search.cpp | 2 +- FreeFileSync/Source/ui/search.h | 2 +- FreeFileSync/Source/ui/small_dlgs.cpp | 4 +- FreeFileSync/Source/ui/small_dlgs.h | 2 +- FreeFileSync/Source/ui/sorting.h | 2 +- FreeFileSync/Source/ui/switch_to_gui.h | 2 +- FreeFileSync/Source/ui/sync_cfg.cpp | 33 +- FreeFileSync/Source/ui/sync_cfg.h | 2 +- FreeFileSync/Source/ui/taskbar.cpp | 18 +- FreeFileSync/Source/ui/taskbar.h | 2 +- FreeFileSync/Source/ui/tray_icon.cpp | 2 +- FreeFileSync/Source/ui/tray_icon.h | 2 +- FreeFileSync/Source/ui/tree_view.cpp | 2 +- FreeFileSync/Source/ui/tree_view.h | 2 +- FreeFileSync/Source/ui/triple_splitter.cpp | 2 +- FreeFileSync/Source/ui/triple_splitter.h | 2 +- .../Source/ui/wx_form_build_hide_warnings.h | 12 +- FreeFileSync/Source/version/version.h | 2 +- FreeFileSync/Source/version/version.iss | 1 + wx+/app_main.h | 2 +- wx+/bitmap_button.h | 2 +- wx+/choice_enum.h | 2 +- wx+/context_menu.h | 2 +- wx+/dc.h | 4 +- wx+/file_drop.h | 2 +- wx+/font_size.h | 10 +- wx+/graph.cpp | 2 +- wx+/graph.h | 2 +- wx+/grid.cpp | 4 +- wx+/grid.h | 2 +- wx+/image_resources.cpp | 2 +- wx+/image_resources.h | 2 +- wx+/image_tools.cpp | 2 +- wx+/image_tools.h | 2 +- wx+/key_event.h | 118 -- wx+/no_flicker.h | 2 +- wx+/popup_dlg.cpp | 4 +- wx+/popup_dlg.h | 2 +- wx+/rtl.h | 2 +- wx+/std_button_layout.h | 2 +- wx+/string_conv.h | 2 +- wx+/timespan.h | 2 +- wx+/toggle_button.h | 2 +- wx+/tooltip.cpp | 2 +- wx+/tooltip.h | 2 +- wx+/zlib_wrap.cpp | 6 +- wx+/zlib_wrap.h | 2 +- zen/async_task.h | 2 +- zen/basic_math.h | 18 +- zen/build_info.h | 2 +- zen/deprecate.h | 8 +- zen/dir_watcher.cpp | 18 +- zen/dir_watcher.h | 2 +- zen/dll.h | 121 -- zen/error_log.h | 2 +- zen/file_access.cpp | 70 +- zen/file_access.h | 2 +- zen/file_error.h | 2 +- zen/file_id_def.h | 6 +- zen/file_io.cpp | 14 +- zen/file_io.h | 16 +- zen/file_io_base.h | 2 +- zen/file_traverser.cpp | 22 +- zen/file_traverser.h | 2 +- zen/fixed_list.h | 10 +- zen/format_unit.cpp | 10 +- zen/format_unit.h | 2 +- zen/guid.h | 10 +- zen/i18n.h | 10 +- zen/int64.h | 4 +- zen/long_path_prefix.h | 2 +- zen/notify_removal.cpp | 2 +- zen/notify_removal.h | 2 +- zen/optional.h | 2 +- zen/perf.h | 6 +- zen/process_priority.cpp | 8 +- zen/process_priority.h | 2 +- zen/recycler.cpp | 20 +- zen/recycler.h | 2 +- zen/scope_guard.h | 2 +- zen/serialize.h | 42 +- zen/shell_execute.h | 10 +- zen/stl_tools.h | 6 +- zen/string_base.h | 20 +- zen/string_tools.h | 2 +- zen/string_traits.h | 10 +- zen/symlink_target.h | 18 +- zen/sys_error.h | 14 +- zen/thread.h | 28 +- zen/tick_count.h | 8 +- zen/time.h | 2 +- zen/type_tools.h | 2 +- zen/type_traits.h | 2 +- zen/utf.h | 2 +- zen/warn_static.h | 2 +- zen/win.h | 22 +- zen/win_ver.h | 31 +- zen/xml_io.cpp | 2 +- zen/xml_io.h | 2 +- zen/zstring.cpp | 23 +- zen/zstring.h | 18 +- 228 files changed, 8430 insertions(+), 6324 deletions(-) create mode 100644 FreeFileSync/Build/Languages/outdated/scottish_gaelic.lng create mode 100644 FreeFileSync/Build/Languages/outdated/slovenian.lng delete mode 100644 FreeFileSync/Build/Languages/scottish_gaelic.lng delete mode 100644 FreeFileSync/Build/Languages/slovenian.lng create mode 100644 FreeFileSync/Source/version/version.iss delete mode 100644 wx+/key_event.h delete mode 100644 zen/dll.h diff --git a/FreeFileSync/Build/Changelog.txt b/FreeFileSync/Build/Changelog.txt index 497ce39f..b6a748c5 100644 --- a/FreeFileSync/Build/Changelog.txt +++ b/FreeFileSync/Build/Changelog.txt @@ -1,3 +1,20 @@ +FreeFileSync 6.12 [2014-12-01] +------------------------------ +New "Actions" menu bar entry with basic operations +Fixed crash after comparison while needlessly copying traveral results +Support auto-updater URL redirection (Linux, OS X) +Merged installer translations into .lng files +Fully translated FreeFileSync context menu options and file types in Windows Explorer +More structured symlink handling options +Scroll to active selection in config list box on startup +Fixed delete key to remove items in config history panel (OS X) +Fixed language file parser showing incorrect row on error +Fixed crash during sync due to unsupported SSE instructions (Server 2003, XP 64-bit) +Fixed startup error due to invalid handle type +Always log folder pair paths even if there is nothing to sync +Updated translation files + + FreeFileSync 6.11 [2014-11-03] ------------------------------ Updated Recycle Bin access for Windows 10 @@ -16,7 +33,7 @@ Fixed async error evaluation when creating volume shadow copies Keep user interface responsive while creating a volume shadow copy Fixed error when starting asynchronously from a batch script Show progress of writing log files -Fixed updated file being left deleted when copying permission failed +Fixed updated file being left deleted when copying permissions failed New Project website: http://www.freefilesync.org/ diff --git a/FreeFileSync/Build/Help/html/Comparison Settings.html b/FreeFileSync/Build/Help/html/Comparison Settings.html index 49e137a2..4b1a44d3 100644 --- a/FreeFileSync/Build/Help/html/Comparison Settings.html +++ b/FreeFileSync/Build/Help/html/Comparison Settings.html @@ -15,12 +15,9 @@

Symbolic Link Handling

-

FreeFileSync offers three options to configure handling of symbolic links (also called symlinks or soft links):

+

FreeFileSync let's you choose to include symbolic links (also called symlinks or soft links) when scanning directories rather than skipping over them. When included, you can select between two ways to handle them:

    -
  1. Exclude: - Skip symbolic links while scanning directories.
      -
  2. Direct: Evaluate the symbolic link object directly. Symbolic links will be shown as separate entities. @@ -83,8 +80,7 @@ time and file size match. The following categories are distinguished:

    Two files with the same name are marked as equal if and only if they have the same content. This option is more useful for consistency checks -rather than backup operations since it is naturally slower. The file -modification time is not taken into account at all. +rather than backup operations since a bitwise comparison can be slow.

      diff --git a/FreeFileSync/Build/Help/html/FreeFileSync.html b/FreeFileSync/Build/Help/html/FreeFileSync.html index ad176beb..c88f9d90 100644 --- a/FreeFileSync/Build/Help/html/FreeFileSync.html +++ b/FreeFileSync/Build/Help/html/FreeFileSync.html @@ -61,7 +61,7 @@
      Homepage:
      - http://www.freefilesync.org/ - feedback, suggestions, bug-reports, official download mirrors
      + http://www.freefilesync.org - feedback, suggestions, bug-reports, official download mirrors

      diff --git a/FreeFileSync/Build/Help/img/comparison_settings.png b/FreeFileSync/Build/Help/img/comparison_settings.png index 06fd2f91..8fb95a7f 100644 Binary files a/FreeFileSync/Build/Help/img/comparison_settings.png and b/FreeFileSync/Build/Help/img/comparison_settings.png differ diff --git a/FreeFileSync/Build/Help/img/time_shift.png b/FreeFileSync/Build/Help/img/time_shift.png index 1f5ec846..2970cdaf 100644 Binary files a/FreeFileSync/Build/Help/img/time_shift.png and b/FreeFileSync/Build/Help/img/time_shift.png differ diff --git a/FreeFileSync/Build/Languages/arabic.lng b/FreeFileSync/Build/Languages/arabic.lng index ceb27cba..8e654b06 100644 --- a/FreeFileSync/Build/Languages/arabic.lng +++ b/FreeFileSync/Build/Languages/arabic.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. أي عدد من أزواج المسارات البديلة من أجل ملف خيارات واحد +Open configuration for edit without executing. +فتح التضبيطات من أجل التعديل من دون تنفيذ الملف. + Cannot find the following folders: تعذر العثور على المجلدات التالية: @@ -184,11 +187,11 @@ Move file on right نقل ملف على اليسار -Overwrite left item -الكتابة فوق العنصر الأيمن +Update left item +تحديث العنصر اليميني -Overwrite right item -الكتابة فوق العنصر الأيسر +Update right item +تحديث العنصر اليساري Do nothing لا تفعل شيئا @@ -221,6 +224,9 @@ %x GB %x GB +Cannot load file %x. +لا يمكن فتح الملف %x. + Database file %x is incompatible. ملف قاعدة البيانات %x غير متوافق. @@ -276,6 +282,9 @@ Creating file %x إنشاء الملف %x +Saving file %x... +جاري حفظ الملف %x... + Items processed: معالجة العناصر: @@ -307,9 +316,6 @@ %x بند -Encoding extended time information: %x -ترميز المعلومات الموسعة للوقت: %x - /sec \ثانية @@ -331,9 +337,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. الرجاء استخدام إصدار الـ 64-bit للبرنامج لإنشاء ملفات الظل الاحتياطية على هذا النظام. -Cannot load file %x. -لا يمكن فتح الملف %x. - Cannot determine volume name for %x. تعذر تحديد اسم الوسط %x @@ -352,8 +355,8 @@ Save &as... &حفظ باسم... -&Quit -إ&نهاء +E&xit +&إغلاق &File &ملف @@ -447,6 +450,9 @@ The command is triggered if: &Show error إ&ظهار الخطأ +&Quit +إ&نهاء + Incorrect command line: سطر أوامر خاطئ: @@ -492,11 +498,11 @@ The command is triggered if: Creating folder %x إنشاء مجلد %x -Overwriting file %x -الكتابة فوق الملف %x +Updating file %x +جاري تحديث الملف %x -Overwriting symbolic link %x -الكتابة فوق الارتباط الرمزي %x +Updating symbolic link %x +جاري تحديث المسار الرمزي %x Verifying file %x التحقق من الملف %x @@ -510,21 +516,21 @@ The command is triggered if: Data verification error: %x and %y have different content. خطأ في التحقق من البيانات: يحتوي %x و %y بيانات مختلفة. -Cannot find folder %x. -تعذر العثور على المجلد %x. - Target folder %x already existing. المجلد الهدف %x موجود سابقاً. +Cannot find folder %x. +تعذر العثور على المجلد %x. + Target folder input field must not be empty. يجب أن لا يكون حقل إدخال المجلد الهدف فارغاً. -Please enter a target folder for versioning. -الرجاء تحديد مجلد هدف من أجل الوسم حسب الإصدار. - Source folder %x not found. لم يتم العثور على المجلد المصدر %x. +Please enter a target folder for versioning. +الرجاء تحديد مجلد هدف من أجل الوسم حسب الإصدار. + The following items have unresolved conflicts and will not be synchronized: العناصر التالية لم تحل اختلافاتها، و لن يتم مزامنتها: @@ -567,8 +573,8 @@ The command is triggered if: Synchronization completed successfully تمت المزامنة بنجاح -Saving log file %x... -حفظ ملف السجل %x... +Cleaning up old log files... +جاري تنظيف ملفات المتابعة القديمة... Stopped توقف @@ -625,8 +631,8 @@ The command is triggered if: FreeFileSync is up to date. البرنامج هو الأحدث حتى الآن. -Unable to connect to sourceforge.net. -تعذر الاتصال بـ sourceforge.net. +Unable to connect to FreeFileSync.org. +تعذر الاتصال بـ FreeFileSync.org Cannot find current FreeFileSync version number online. Do you want to check manually? لم نستطع العثور على على رقم إصدار FreeFileSync على الشبكة. هل تريد التحقق يدوياً؟ @@ -712,9 +718,21 @@ The command is triggered if: Start &comparison بدأ الم&قارنة +C&omparison settings +&مقارنة + +&Filter settings +إعدادات ال&فلتر + +S&ynchronization settings +إ&عدادات + Start &synchronization بدأ الم&زامنة +&Actions +&مهام + &Options &خيارات @@ -793,8 +811,8 @@ The command is triggered if: Number of files and folders that will be deleted عدد الملفات و المجلدات التي سيتم حذفها -Number of files that will be overwritten -عدد الملفات التي سيتم استبدالها +Number of files that will be updated +عدد الملفات التي سيتم تحديثها Number of files and folders that will be created عدد الملفات و المجلدات التي سيتم إنشاؤها @@ -823,8 +841,14 @@ The command is triggered if: Handle daylight saving time تعامل مع التوقيت الصيفي -Symbolic links: -ارتباطات رمزية: +Include symbolic links: +تضمن السارات الرمزية: + +Direct +مباشر + +Follow +اتبع More information المزيد من المعلومات @@ -853,24 +877,24 @@ The command is triggered if: Maximum: الحد الأقصى: -C&lear -إ&زالة - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. اختيار قوانين فلترة لاستثناء ملفات معينة من المزامنة. أدخل مسارات الملفات منسوبة إلى زوج المجلدات المقابل. +C&lear +إ&زالة + Detect moved files اكتشاف الملفات المنقولة -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- بحاجة لإنشاء قواعد بيانات لجميع الملفات -- يبدأ التعرف على التغيرات بعد المزامنة الأولية -- غير مدعوم من قبل جميع أنطمة الملفات (file systems) +- تفعيل التحقق بعد المزامنة +- يحتاج و ينشئ ملفات قواعد معطيات +- غير مدعوم لجميع أنظمة الملفات Detect synchronization directions with the help of database files @@ -1083,27 +1107,15 @@ This guarantees a consistent state even in case of a serious error. View Settings عرض الإعدادات -Overview -نظرة عامة - Configuration التكوين +Overview +نظرة عامة + Main Bar الشريط الرئيسي -Start comparison -بدأ المقارنة - -Comparison settings -إعدادات المقارنة - -Synchronization settings -إعدادات المزامنة - -Start synchronization -بدء المزامنة - Confirm تأكيد @@ -1270,11 +1282,11 @@ This guarantees a consistent state even in case of a serious error. Show files that will be deleted on the right side إظهار الملفات التي سيتم حذفها من الجانب الأيسر -Show files that will be overwritten on left side -إظهار الملفات التي سيتم الكتابة فوقها في الجانب الأيمن +Show files that will be updated on the left side +إظهار الملفات التي سيتم تحديثها في الجانب الأيسر -Show files that will be overwritten on right side -إظهار الملفات التي سيتم الكتابة فوقها في الجانب الأيسر +Show files that will be updated on the right side +إظهار الملفات التي سيتم تحديثها في الجانب الأيمن Show files that won't be copied إظهار الملفات التي لن يتم نسخها @@ -1419,15 +1431,6 @@ This guarantees a consistent state even in case of a serious error. Configure your own synchronization rules. تحديد قواعد المزامنة الخاصة بك. -Exclude -استبعاد - -Direct -مباشر - -Follow -اتبع - Today اليوم @@ -1491,9 +1494,6 @@ This guarantees a consistent state even in case of a serious error. Cannot monitor directory %x. لا يمكن مراقبة المسار %x. -Conversion error: -خطأ في تحويل: - Cannot delete file %x. لا يمكن حذف الملف %x. @@ -1527,8 +1527,8 @@ This guarantees a consistent state even in case of a serious error. Cannot create directory %x. لا يمكن إنشاء المسار %x. -Cannot create symbolic link %x. -تعذر إنشاء رابط رمزي %x +Cannot copy symbolic link %x to %y. +لا يمكن نسخ الرابط الرمزي من %x إلى %y Cannot find system function %x. لا يمكن العثور على وظيفة نظام %x. @@ -1623,3 +1623,72 @@ This guarantees a consistent state even in case of a serious error. Configuration file %x loaded partially only. تم تحميل ملف التكوين %x بشكلٍ جزئي فقط. +Prepare installation +الاستعداد للتثبيت + +Choose which components you want to install. +اختر المكونات التي تريد تنصيبها + +Select installation type: +اختيار نوع التنصيب: + +Local +محلي + +Portable +متنقل + +recommended +‏منصوح به‏ + +Save settings to "%APPDATA%\FreeFileSync" +حفظ الإعدادات إلى ‏‪"%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +تسجيل لاحقةالملفات + +Create Explorer context menu entries +إنشاء مدخلات القوائم المحلية في متصفح الملفات + +Save settings in installation directory +احفظ إعدادات التثبيت في مسار التثبيت + +Do not write to Registry +لا تسجل في ملفات الرجيستري + +Just copy the files +انسخ الملفات فقط + +Choose a directory for installation: +اختيار مسار التثبيت + +Create shortcuts: +إنشاء اختصار + +Desktop +سطح المكتب + +Start menu +قائمة إبدأ + +Registering FreeFileSync file extensions +تسجيل لاحقة الملفات + +Unregistering FreeFileSync file extensions +إلغاء تسجيل لاحقةالملفات + +FreeFileSync Configuration +تضبيطات FreeFileSync + +FreeFileSync Batch File +الملف الدفعي الخاص بـ FreeFileSync + +FreeFileSync Synchronization Database +قاعدة بيانات المزامنة الخاصة بـ FreeFileSync + +RealtimeSync Configuration +تضبيطات RealtimeSync + +Edit with FreeFileSync +تعديل بواسطة FreeFileSync + diff --git a/FreeFileSync/Build/Languages/bulgarian.lng b/FreeFileSync/Build/Languages/bulgarian.lng index 3d61b75a..e4f8263e 100644 --- a/FreeFileSync/Build/Languages/bulgarian.lng +++ b/FreeFileSync/Build/Languages/bulgarian.lng @@ -23,7 +23,7 @@ Задават се подразбиращи се посоки на синхронизация: старите файлове ще се заменят с по-нови. Checking recycle bin availability for folder %x... -Проверява се достъпността на кошчето за папка %x... +Проверява достъпността на кошчето за папка %x... Moving file %x to the recycle bin Файл %x се премества в кошчето @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Произволен брой алтернативни двойки директории за най-много един конфигурационен файл. +Open configuration for edit without executing. +Отвори конфигурацията за редактиране без изпълнение. + Cannot find the following folders: Не са намерени следните папки: @@ -184,11 +187,11 @@ Move file on right Премести десния файл -Overwrite left item -Презапиши левия елемент +Update left item +Актуализирай левия елемент -Overwrite right item -Презапиши десния елемент +Update right item +Актуализирай десния елемент Do nothing Не прави нищо @@ -217,6 +220,9 @@ %x GB %x ГБ +Cannot load file %x. +Файл %x не може да се зареди. + Database file %x is incompatible. Файлът на базата данни %x е несъвместим. @@ -268,6 +274,9 @@ Creating file %x Създава файл %x +Saving file %x... +Запазва файл %x... + Items processed: Обработени елементи: @@ -295,9 +304,6 @@ %x нишки -Encoding extended time information: %x -Кодира разширената информация за време: %x - /sec /сек. @@ -319,9 +325,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. Моля, ползвайте 64-бит. версия на FFS за създаване фонови копия на тази система. -Cannot load file %x. -Файл %x не може да се зареди. - Cannot determine volume name for %x. Името на тома за %x не може да се определи. @@ -340,8 +343,8 @@ Save &as... Запази к&ато... -&Quit -Кра&й +E&xit +И&зход &File &Файл @@ -402,7 +405,7 @@ The command is triggered if: Командния ред се изпълнява, ако: - се променят файлове или подпапки, -- се появят нови папки (напр. вкарана флашка) +- се явят нови папки (напр. вкарана флашка). &Start @@ -435,6 +438,9 @@ The command is triggered if: &Show error Покажи гре&шката +&Quit +Кра&й + Incorrect command line: Невалиден команден ред: @@ -480,11 +486,11 @@ The command is triggered if: Creating folder %x Създава папка %x -Overwriting file %x -Презаписва файл %x +Updating file %x +Актуализира файл %x -Overwriting symbolic link %x -Презаписва символна връзка %x +Updating symbolic link %x +Актуализира символна връзка %x Verifying file %x Верифицира файл %x @@ -498,21 +504,21 @@ The command is triggered if: Data verification error: %x and %y have different content. Грешка при верификация: %x и %y имат различно съдържание. -Cannot find folder %x. -Не е открита папка %x. - Target folder %x already existing. Целевата папка %x вече съществува. +Cannot find folder %x. +Не е открита папка %x. + Target folder input field must not be empty. Полето за целева папка не бива да е празно. -Please enter a target folder for versioning. -Моля, въведете целева папка за версификация. - Source folder %x not found. Изходната папка %x не е намерена. +Please enter a target folder for versioning. +Моля, въведете целева папка за версификация. + The following items have unresolved conflicts and will not be synchronized: Следните елементи имат нерешени конфликти и няма да бъдат синхронизирани: @@ -555,8 +561,8 @@ The command is triggered if: Synchronization completed successfully Синхронизацията завърши успешно -Saving log file %x... -Запазване на протоколния файл %x... +Cleaning up old log files... +Изчиства старите log-файлове... Stopped Стопирано @@ -609,8 +615,8 @@ The command is triggered if: FreeFileSync is up to date. FreeFileSync вече е актуална. -Unable to connect to sourceforge.net. -Няма връзка със sourceforge.net. +Unable to connect to FreeFileSync.org. +Не мога да се свържа с FreeFileSync.org. Cannot find current FreeFileSync version number online. Do you want to check manually? Номера на текущата версия на FreeFileSync не е открит онлайн. Ще опитате ли ръчно? @@ -696,9 +702,21 @@ The command is triggered if: Start &comparison Почни &сравняване +C&omparison settings +Настройки на с&равняване + +&Filter settings +&Настройки на филтъра + +S&ynchronization settings +Настройки на с&инхронизацията + Start &synchronization Почни &синхронизация +&Actions +&Действия + &Options &Опции @@ -777,8 +795,8 @@ The command is triggered if: Number of files and folders that will be deleted Брой файлове и папки, които ще бъдат изтрити -Number of files that will be overwritten -Брой файлове, които ще бъдат презаписани +Number of files that will be updated +Брой файлове, които ще бъдат актуализирани Number of files and folders that will be created Брой файлове и папки, които ще бъдат създадени @@ -807,8 +825,14 @@ The command is triggered if: Handle daylight saving time Отчитай лятното време -Symbolic links: -Символни връзки: +Include symbolic links: +Включи символни връзки: + +Direct +Директно + +Follow +Следвай More information Още информация @@ -837,23 +861,23 @@ The command is triggered if: Maximum: Максимум: -C&lear -И&зчисти - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Изберете филтърни правила за изключване на някои файлове от синхронизация. Въведете файлови пътища относно съответните им двойки папки. +C&lear +И&зчисти + Detect moved files Откриване на преместени файлове -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- Изисква и създава файлове на базата данни. -- Активизира се след предходна синхронизация. +- Откриването е активно след начална синхронизация, +- Изисква и създава файлове на базата данни, - Не се поддържа от всички файлови системи. @@ -1041,7 +1065,7 @@ This guarantees a consistent state even in case of a serious error. Публикува се по лиценза GNU General Public License Many thanks for localization: -Много благодарности за локализацията: +Благодарности за локализацията: Save as Batch Job Запази като пакетна задача @@ -1067,27 +1091,15 @@ This guarantees a consistent state even in case of a serious error. View Settings Настройки на изгледа -Overview -Обзор - Configuration Конфигурация +Overview +Обзор + Main Bar Главен панел -Start comparison -Почни сравняване - -Comparison settings -Настройки на сравняването - -Synchronization settings -Настройки на синхронизацията - -Start synchronization -Старт на синхронизацията - Confirm Потвърждение @@ -1238,11 +1250,11 @@ This guarantees a consistent state even in case of a serious error. Show files that will be deleted on the right side Покажи файловете, които ще бъдат изтрити отдясно -Show files that will be overwritten on left side -Покажи файловете, които ще бъдат презаписани отляво +Show files that will be updated on the left side +Покажи файловете, които ще бъдат обновени отляво -Show files that will be overwritten on right side -Покажи файловете, които ще бъдат презаписани отдясно +Show files that will be updated on the right side +Покажи файловете, които ще бъдат обновени отдясно Show files that won't be copied Покажи файловете, които няма да бъдат копирани @@ -1379,15 +1391,6 @@ This guarantees a consistent state even in case of a serious error. Configure your own synchronization rules. Дефинирай свои правила за синхронизация. -Exclude -Изключи - -Direct -Директно - -Follow -Следвай - Today Днес @@ -1451,9 +1454,6 @@ This guarantees a consistent state even in case of a serious error. Cannot monitor directory %x. Директория %x не може да се следи. -Conversion error: -Грешка на преобразуване: - Cannot delete file %x. Файл %x не може да се изтрие. @@ -1487,8 +1487,8 @@ This guarantees a consistent state even in case of a serious error. Cannot create directory %x. Директория %x не може да се създаде. -Cannot create symbolic link %x. -Символната връзка %x не може да се създаде. +Cannot copy symbolic link %x to %y. +Символната връзка %x не може да се копира в %y. Cannot find system function %x. Системната функция %x не може да се намери. @@ -1571,3 +1571,72 @@ This guarantees a consistent state even in case of a serious error. Configuration file %x loaded partially only. Конфигурационния файл %x се зареди само частично. +Prepare installation +Подготовка за инсталиране + +Choose which components you want to install. +Изберете желаните компоненти за исталиране. + +Select installation type: +Изберете типа инсталация: + +Local +Локална + +Portable +Преносима + +recommended +препоръчително + +Save settings to "%APPDATA%\FreeFileSync" +Запази настройките в "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Регистрирай файлови разширения за FreeFileSync + +Create Explorer context menu entries +Създай полета в контекстното меню на Explorer + +Save settings in installation directory +Запази настройките в инсталационната директория + +Do not write to Registry +Не записвай нищо в Регистъра + +Just copy the files +Само копирай файловете + +Choose a directory for installation: +Изберете директория за инсталиране: + +Create shortcuts: +Създай къси пътища: + +Desktop +На десктопа + +Start menu +В стартовото меню + +Registering FreeFileSync file extensions +Регистриране на файлови разширения за FreeFileSync + +Unregistering FreeFileSync file extensions +Де-регистриране на файлови разширения за FreeFileSync + +FreeFileSync Configuration +Конфигуриране на FreeFileSync + +FreeFileSync Batch File +Пакетен файл на FreeFileSync + +FreeFileSync Synchronization Database +Синхронизираща база данни на FreeFileSync + +RealtimeSync Configuration +Конфигуриране на RealtimeSync + +Edit with FreeFileSync +Редактиране с FreeFileSync + diff --git a/FreeFileSync/Build/Languages/chinese_simple.lng b/FreeFileSync/Build/Languages/chinese_simple.lng index d8f33b6d..4d3cb947 100644 --- a/FreeFileSync/Build/Languages/chinese_simple.lng +++ b/FreeFileSync/Build/Languages/chinese_simple.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. 任意数量的替代目录对的最多一个配置文件. +Open configuration for edit without executing. +打开配置用于编辑而不执行. + Cannot find the following folders: 无法找到如下文件夹: @@ -184,11 +187,11 @@ Move file on right 移动右侧的文件 -Overwrite left item -覆盖左侧的项目 +Update left item +更新左侧项目 -Overwrite right item -覆盖右侧的项目 +Update right item +更新右侧项目 Do nothing 保持不动 @@ -216,6 +219,9 @@ %x GB %x GB +Cannot load file %x. +不能载入文件 %x. + Database file %x is incompatible. 数据库文件 %x 不兼容. @@ -266,6 +272,9 @@ Creating file %x 正在创建文件 %x +Saving file %x... +正在保存文件 %x... + Items processed: 已处理的项目: @@ -292,9 +301,6 @@ %x 线程 -Encoding extended time information: %x -正在编码扩展时间信息:%x - /sec /秒 @@ -316,9 +322,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. 请使用 FreeFileSync 64位版本来在这个系统上创建卷影复制. -Cannot load file %x. -不能载入文件 %x. - Cannot determine volume name for %x. 无法为 %x 确定卷名. @@ -337,8 +340,8 @@ Save &as... 另存为(&A)... -&Quit -退出(&Q) +E&xit +退出(&X) &File 文件(&F) @@ -432,6 +435,9 @@ The command is triggered if: &Show error 显示错误(&S) +&Quit +退出(&Q) + Incorrect command line: 不正确的命令行: @@ -477,11 +483,11 @@ The command is triggered if: Creating folder %x 正创建文件夹 %x -Overwriting file %x -正在覆盖文件 %x +Updating file %x +正在更新文件 %x -Overwriting symbolic link %x -正在覆盖符号连接 %x +Updating symbolic link %x +正在更新符号连接 %x Verifying file %x 校验文件 %x @@ -495,21 +501,21 @@ The command is triggered if: Data verification error: %x and %y have different content. 数据校验错误: %x 和 %y 有不同的内容. -Cannot find folder %x. -无法找到文件夹 %x. - Target folder %x already existing. 目标文件夹 %x 已经存在. +Cannot find folder %x. +无法找到文件夹 %x. + Target folder input field must not be empty. 目标文件夹输入框必须不为空. -Please enter a target folder for versioning. -请输入一个用于保存历史版本的目标文件夹. - Source folder %x not found. 无法找到源文件夹 %x. +Please enter a target folder for versioning. +请输入一个用于保存历史版本的目标文件夹. + The following items have unresolved conflicts and will not be synchronized: 如下项目有无法解决的冲突并将不会被同步: @@ -552,8 +558,8 @@ The command is triggered if: Synchronization completed successfully 同步成功完成 -Saving log file %x... -正在保存日志文件 %x... +Cleaning up old log files... +正在清理旧日志文件... Stopped 已停止 @@ -605,8 +611,8 @@ The command is triggered if: FreeFileSync is up to date. FreeFileSync 已是最新. -Unable to connect to sourceforge.net. -无法链接到 Sourceforge.net. +Unable to connect to FreeFileSync.org. +无法连接到FreeFileSync.org. Cannot find current FreeFileSync version number online. Do you want to check manually? 无法在线找到当前FreeFileSync版本号. 你要手动检查吗? @@ -692,9 +698,21 @@ The command is triggered if: Start &comparison 开始比较(&C) +C&omparison settings +比较设置(&O) + +&Filter settings +过滤器设置(&F) + +S&ynchronization settings +同步设置(&Y) + Start &synchronization 开始同步(&S) +&Actions +动作(&A) + &Options 选项(&O) @@ -773,8 +791,8 @@ The command is triggered if: Number of files and folders that will be deleted 将被删除的文件和文件夹数 -Number of files that will be overwritten -将被覆盖的文件数 +Number of files that will be updated +将会被更新的文件数 Number of files and folders that will be created 将被创建的文件和文件夹数 @@ -803,8 +821,14 @@ The command is triggered if: Handle daylight saving time 处理夏令时 -Symbolic links: -符号连接: +Include symbolic links: +包括符号连接: + +Direct +直接 + +Follow +跟随 More information 更多信息 @@ -833,24 +857,24 @@ The command is triggered if: Maximum: 最大: +Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. +选择过滤器规则以将某些文件从同步中排除. 输入与相应的文件夹对相关的文件路径. + C&lear 清除(&L) -Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. -选择过滤器规则以将某些文件从同步中排除. 输入与相关的文件夹对相对的与文件路径. - Detect moved files 检测被移动的文件 -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- 需求和创建数据库文件 -- 在初始同步后检测活动 -- 不是所有文件系统都支持 +- 检测在初始化同步之后生效 +- 需要并且会创建数据库文件 +- 不被所有文件系统支持 Detect synchronization directions with the help of database files @@ -1060,27 +1084,15 @@ This guarantees a consistent state even in case of a serious error. View Settings 视图设置 -Overview -摘要 - Configuration 配置 +Overview +摘要 + Main Bar 主工具栏 -Start comparison -开始比较 - -Comparison settings -比较设置 - -Synchronization settings -同步设置 - -Start synchronization -开始同步 - Confirm 确认 @@ -1227,11 +1239,11 @@ This guarantees a consistent state even in case of a serious error. Show files that will be deleted on the right side 显示将在右侧被删除的文件 -Show files that will be overwritten on left side -显示将在左侧被覆盖的文件 +Show files that will be updated on the left side +显示左侧将会被更新的文件 -Show files that will be overwritten on right side -显示将在右侧被覆盖的文件 +Show files that will be updated on the right side +显示右侧将会被更新的文件 Show files that won't be copied 显示将不被复制的文件 @@ -1366,15 +1378,6 @@ This guarantees a consistent state even in case of a serious error. Configure your own synchronization rules. 配置你自己的同步规则. -Exclude -排除 - -Direct -直接 - -Follow -跟随 - Today 今天 @@ -1438,9 +1441,6 @@ This guarantees a consistent state even in case of a serious error. Cannot monitor directory %x. 无法监视目录 %x. -Conversion error: -转换错误: - Cannot delete file %x. 无法删除文件 %x. @@ -1474,8 +1474,8 @@ This guarantees a consistent state even in case of a serious error. Cannot create directory %x. 无法创建目录 %x. -Cannot create symbolic link %x. -无法创建符号连接 %x. +Cannot copy symbolic link %x to %y. +无法复制符号连接 %x 到 %y. Cannot find system function %x. 无法找到系统功能 %x. @@ -1555,3 +1555,72 @@ This guarantees a consistent state even in case of a serious error. Configuration file %x loaded partially only. 配置文件 %x 只是部分载入. +Prepare installation +准备安装 + +Choose which components you want to install. +选择你要安装的组件. + +Select installation type: +选择安装方式: + +Local +本地 + +Portable +便携 + +recommended +推荐 + +Save settings to "%APPDATA%\FreeFileSync" +保存设置到 "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +注册 FreeFileSync 文件关联 + +Create Explorer context menu entries +创建浏览器右键菜单入口 + +Save settings in installation directory +保存设置到程序安装目录 + +Do not write to Registry +不写入注册表 + +Just copy the files +只复制文件 + +Choose a directory for installation: +选择要安装的目录位置: + +Create shortcuts: +创建快捷方式: + +Desktop +桌面 + +Start menu +开始菜单 + +Registering FreeFileSync file extensions +注册 FreeFileSync 文件关联 + +Unregistering FreeFileSync file extensions +取消注册 FreeFileSync 文件关联 + +FreeFileSync Configuration +FreeFileSync 配置 + +FreeFileSync Batch File +FreeFileSync批处理文件 + +FreeFileSync Synchronization Database +FreeFileSync同步数据库 + +RealtimeSync Configuration +实时同步配置 + +Edit with FreeFileSync +使用FreeFileSync编辑 + diff --git a/FreeFileSync/Build/Languages/chinese_traditional.lng b/FreeFileSync/Build/Languages/chinese_traditional.lng index 6f82db92..9c526db4 100644 --- a/FreeFileSync/Build/Languages/chinese_traditional.lng +++ b/FreeFileSync/Build/Languages/chinese_traditional.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. 任意數量的替代配對目錄為最多一個配置檔案。 +Open configuration for edit without executing. +只開啟配置來編輯而不執行。 + Cannot find the following folders: 找不到下列資料夾： @@ -184,11 +187,11 @@ Move file on right 移動右邊的檔案 -Overwrite left item -覆蓋左邊項目 +Update left item +更新左邊項目 -Overwrite right item -覆蓋右邊項目 +Update right item +更新右邊項目 Do nothing 維持原狀 @@ -216,6 +219,9 @@ %x GB %x GB +Cannot load file %x. +無法載入檔案 %x。 + Database file %x is incompatible. 資料庫檔案 %x 是不相容的。 @@ -266,6 +272,9 @@ Creating file %x 正在新建檔案 %x +Saving file %x... +正在儲存檔案 %x... + Items processed: 已處理項目： @@ -292,9 +301,6 @@ %x 個執行緒 -Encoding extended time information: %x -編碼延長時間資訊：%x - /sec /秒 @@ -316,9 +322,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. 請在此系統上使用FreeFileSync 64位元版本來新建卷影副本。 -Cannot load file %x. -無法載入檔案 %x。 - Cannot determine volume name for %x. 無法確定卷名為 %x。 @@ -337,8 +340,8 @@ Save &as... 另存新檔(&A)... -&Quit -離開(&Q) +E&xit +離開(&x) &File 檔案(&F) @@ -432,6 +435,9 @@ The command is triggered if: &Show error 顯示錯誤(&S) +&Quit +離開(&Q) + Incorrect command line: 不正確的命令列： @@ -477,11 +483,11 @@ The command is triggered if: Creating folder %x 正在新建資料夾 %x -Overwriting file %x -正在覆蓋檔案 %x +Updating file %x +正在更新檔案 %x... -Overwriting symbolic link %x -正在覆蓋符號連結 %x +Updating symbolic link %x +正在更新符號連結 %x... Verifying file %x 正在驗證檔案 %x @@ -495,21 +501,21 @@ The command is triggered if: Data verification error: %x and %y have different content. 資料驗證錯誤：%x 和 %y 內容不同！ -Cannot find folder %x. -找不到資料夾 %x。 - Target folder %x already existing. 目標資料夾 %x 已存在。 +Cannot find folder %x. +找不到資料夾 %x。 + Target folder input field must not be empty. 目標資料夾輸入欄位不能為空。 -Please enter a target folder for versioning. -請輸入版本控制的目的資料夾。 - Source folder %x not found. 來源資料夾 %x 找不到。 +Please enter a target folder for versioning. +請輸入版本控制的目的資料夾。 + The following items have unresolved conflicts and will not be synchronized: 下列項目有未解決的衝突，將不會同步： @@ -552,8 +558,8 @@ The command is triggered if: Synchronization completed successfully 同步已成功完成 -Saving log file %x... -正在儲存日誌檔 %x... +Cleaning up old log files... +清理舊日誌檔... Stopped 已停止 @@ -605,8 +611,8 @@ The command is triggered if: FreeFileSync is up to date. FreeFileSync已經是最新版本。 -Unable to connect to sourceforge.net. -無法連接到sourceforge.net。 +Unable to connect to FreeFileSync.org. +無法連接到FreeFileSync.org。 Cannot find current FreeFileSync version number online. Do you want to check manually? 找不到目前線上FreeFileSync版號！是否要手動檢查？ @@ -692,9 +698,21 @@ The command is triggered if: Start &comparison 開始比對(&c) +C&omparison settings +比對設定(&o) + +&Filter settings +篩選器設定(&F) + +S&ynchronization settings +同步設定(&y) + Start &synchronization 開始同步(&s) +&Actions +動作(&A) + &Options 選項(&O) @@ -773,8 +791,8 @@ The command is triggered if: Number of files and folders that will be deleted 將被刪除的檔案和資料夾數量 -Number of files that will be overwritten -一些檔案和目錄會被覆蓋 +Number of files that will be updated +將被更新的檔案數量 Number of files and folders that will be created 將被新建的檔案和資料夾數量 @@ -803,8 +821,14 @@ The command is triggered if: Handle daylight saving time 日光節約時間處理 -Symbolic links: -符號連結： +Include symbolic links: +包括的符號連結： + +Direct +直接 + +Follow +遵從 More information 詳細資訊 @@ -833,23 +857,23 @@ The command is triggered if: Maximum: 最大： -C&lear -清除(&C) - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. 選擇從同步中排除某些檔案的篩選器規則。輸入相對於其對應的配對資料夾路徑。 +C&lear +清除(&C) + Detect moved files 檢測被移動的檔案 -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- 要求並新建資料庫檔案 - 初始化同步後檢測活動 +- 要求並新建資料庫檔案 - 不支援所有檔案系統 @@ -1063,27 +1087,15 @@ This guarantees a consistent state even in case of a serious error. View Settings 檢視設定 -Overview -摘要 - Configuration 配置 +Overview +摘要 + Main Bar 主欄位 -Start comparison -開始比對 - -Comparison settings -比對設定 - -Synchronization settings -同步設定 - -Start synchronization -開始同步 - Confirm 確認 @@ -1183,7 +1195,7 @@ This guarantees a consistent state even in case of a serious error. 是否要儲存變更到 %x？ Never save &changes -從不保存更改(&c) +都不保存更改(&c) Do&n't save 不儲存(&N) @@ -1230,11 +1242,11 @@ This guarantees a consistent state even in case of a serious error. Show files that will be deleted on the right side 顯示右邊將被刪除的檔案 -Show files that will be overwritten on left side -顯示左邊將被覆蓋的檔案 +Show files that will be updated on the left side +顯示左邊將被更新的檔案 -Show files that will be overwritten on right side -顯示右邊將被覆蓋的檔案 +Show files that will be updated on the right side +顯示右邊將被更新的檔案 Show files that won't be copied 顯示將不會被複製的檔案 @@ -1369,15 +1381,6 @@ This guarantees a consistent state even in case of a serious error. Configure your own synchronization rules. 配置您自己的同步規則。 -Exclude -排除 - -Direct -直接 - -Follow -遵從 - Today 今日 @@ -1441,9 +1444,6 @@ This guarantees a consistent state even in case of a serious error. Cannot monitor directory %x. 無法監測目錄 %x。 -Conversion error: -轉換錯誤： - Cannot delete file %x. 無法刪除目錄 %x。 @@ -1477,8 +1477,8 @@ This guarantees a consistent state even in case of a serious error. Cannot create directory %x. 無法新建目錄 %x。 -Cannot create symbolic link %x. -無法新建符號連結 %x。 +Cannot copy symbolic link %x to %y. +無法複製符號連結 %x 到 %y。 Cannot find system function %x. 找不到系統函數 %x。 @@ -1558,3 +1558,72 @@ This guarantees a consistent state even in case of a serious error. Configuration file %x loaded partially only. 只載入設定檔 %x 的一部份。 +Prepare installation +準備安裝 + +Choose which components you want to install. +選擇您想要安裝哪些元件。 + +Select installation type: +選擇安裝類型： + +Local +本機 + +Portable +可攜式 + +recommended +建議 + +Save settings to "%APPDATA%\FreeFileSync" +儲存到"%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +註冊FreeFileSync檔案副檔名 + +Create Explorer context menu entries +新建資源管理器右鍵選單項目 + +Save settings in installation directory +儲存設定到安裝目錄 + +Do not write to Registry +不要寫入註冊表 + +Just copy the files +只要複製檔案 + +Choose a directory for installation: +選擇安裝目錄： + +Create shortcuts: +建立捷徑： + +Desktop +桌面 + +Start menu +開始功能表 + +Registering FreeFileSync file extensions +註冊FreeFileSync檔案副檔名 + +Unregistering FreeFileSync file extensions +取消註冊FreeFileSync檔案副檔名 + +FreeFileSync Configuration +FreeFileSync配置 + +FreeFileSync Batch File +FreeFileSync批次檔 + +FreeFileSync Synchronization Database +FreeFileSync同步資料庫 + +RealtimeSync Configuration +即時同步配置 + +Edit with FreeFileSync +使用FreeFileSync進行編輯 + diff --git a/FreeFileSync/Build/Languages/croatian.lng b/FreeFileSync/Build/Languages/croatian.lng index f6f8a476..93b7721a 100644 --- a/FreeFileSync/Build/Languages/croatian.lng +++ b/FreeFileSync/Build/Languages/croatian.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Bilo koji broj alternativnih parova mapa za najmanje jednu config datoteku. +Open configuration for edit without executing. +Otvori postavke za uređivanje bez pokretanja. + Cannot find the following folders: Ne mogu pronaći slijedeće mape: @@ -184,11 +187,11 @@ Move file on right Premjest datoteku desno -Overwrite left item -Prepiši lijevu stavku +Update left item +Ažuriraj lijevu stavku -Overwrite right item -Prepiši desnu stavku +Update right item +Ažuriraj desnu stavku Do nothing Ne radi ništa @@ -218,6 +221,9 @@ %x GB %x GB +Cannot load file %x. +Ne mogu učitati datoteku %x. + Database file %x is incompatible. Datoteka baze %x je nekompatibilna. @@ -270,6 +276,9 @@ Creating file %x Izrađujem datoteku %x +Saving file %x... +Spremanje datoteke %x... + Items processed: Obrađene stavke: @@ -298,9 +307,6 @@ %x niti -Encoding extended time information: %x -Pretvaram informacije o vremenu %x - /sec /sek @@ -322,9 +328,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. Molimo koristite FreeFileSync 64-bitnu verziju za izradu shadow kopija na ovom sustavu -Cannot load file %x. -Ne mogu učitati datoteku %x. - Cannot determine volume name for %x. Ne mogu utvrditi naziv spremnika za %x. @@ -343,8 +346,8 @@ Save &as... Spremiti &kao... -&Quit -&Izlaz +E&xit +I&zlaz &File &Datoteka @@ -438,6 +441,9 @@ Naredba će biti pokrenuta ako se: &Show error &Prikaži grešku +&Quit +&Izlaz + Incorrect command line: Netočna naredbena linija: @@ -483,11 +489,11 @@ Naredba će biti pokrenuta ako se: Creating folder %x Kreiranje mape %x -Overwriting file %x -Prepisivanje datoteke %x +Updating file %x +Ažuriram datoteku %x -Overwriting symbolic link %x -Prepisivanje simboličnog linka %x +Updating symbolic link %x +Ažuriram simboličnu poveznicu %x Verifying file %x Provjeravanje datoteke %x @@ -501,21 +507,21 @@ Naredba će biti pokrenuta ako se: Data verification error: %x and %y have different content. Greška prilikom provjere podataka: %x i %y imaju različit sadržaj. -Cannot find folder %x. -Ne mogu pronaći mapu %x. - Target folder %x already existing. Odredišna mapa %x već postoji. +Cannot find folder %x. +Ne mogu pronaći mapu %x. + Target folder input field must not be empty. Odredišna mapa ne može biti prazna. -Please enter a target folder for versioning. -Molimo odaberite odredišnu mapu za označavanje - Source folder %x not found. Izvorna mapa %x nije pronađena. +Please enter a target folder for versioning. +Molimo odaberite odredišnu mapu za označavanje + The following items have unresolved conflicts and will not be synchronized: Slijedeće stavke imaju nerješene konflikte i zato neće biti sinkronizirane: @@ -558,8 +564,8 @@ Naredba će biti pokrenuta ako se: Synchronization completed successfully Sinkronizacija uspješno dovršena -Saving log file %x... -Spremam izješće %x... +Cleaning up old log files... +Čistim stare datoteke o izvješću... Stopped Zaustavljeno @@ -613,8 +619,8 @@ Naredba će biti pokrenuta ako se: FreeFileSync is up to date. FreeFileSync je ažuran. -Unable to connect to sourceforge.net. -Ne mogu se povezati na sourceforge.net. +Unable to connect to FreeFileSync.org. +Nije moguće povezivanje s FreeFileSync.org. Cannot find current FreeFileSync version number online. Do you want to check manually? Ne mogu pronaći trenutnu verziju FreeFileSync-a online. Da li želite ručno potražiti? @@ -700,9 +706,21 @@ Naredba će biti pokrenuta ako se: Start &comparison Započni &usporedbu +C&omparison settings +P&ostavke usporedbe + +&Filter settings +&Postavke filtera + +S&ynchronization settings +P&ostavke sinkronizacije + Start &synchronization Započni &sinkronizaciju +&Actions +&Akcije + &Options &Opcije @@ -781,8 +799,8 @@ Naredba će biti pokrenuta ako se: Number of files and folders that will be deleted Broj datoteka i mapa koje će biti obrisane -Number of files that will be overwritten -Broj datoteka koje će biti prepisane +Number of files that will be updated +Broj datoteka koje će biti ažurirane Number of files and folders that will be created Broj datoteka i foldera koje će biti izrađene @@ -811,8 +829,14 @@ Naredba će biti pokrenuta ako se: Handle daylight saving time Upravljaj ljetnim računanjem vremena -Symbolic links: -Simbolične poveznice: +Include symbolic links: +Uključi simbolične poveznice: + +Direct +Direktno + +Follow +Slijedi More information Više informacija @@ -841,24 +865,24 @@ Naredba će biti pokrenuta ako se: Maximum: Maksimum: -C&lear -O&čisti - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Odaberite filter pravila da biste isključili određene datoteke iz sinkronizacije. Unesite relativnu putanju datoteka prema njihovim odgovarajućim parovima mapa. +C&lear +O&čisti + Detect moved files Otkrij premještene datoteke -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- Zahtjeva i kreira datoteke baze podataka - Otkrivanje aktivno nakon početne sinkronizacije -- Nije podržano od svih datotečnih sustava +- Zahtjeva te izrađuje baze podataka +- Nije podržano kod svih datotečnih sustava Detect synchronization directions with the help of database files @@ -1071,27 +1095,15 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. View Settings Postavke prikaza -Overview -Pregled - Configuration Postavke +Overview +Pregled + Main Bar Glavna traka -Start comparison -Započni usporedbu - -Comparison settings -Postavke usporedbe - -Synchronization settings -Postavke sinkronizacije - -Start synchronization -Započni sinkronizaciju - Confirm Potvrdi @@ -1246,11 +1258,11 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. Show files that will be deleted on the right side Prikaži datoteke koje će biti izbrisane na desnoj strani -Show files that will be overwritten on left side -Prikaži datoteke koje će biti prepisane na lijevoj strani +Show files that will be updated on the left side +Prikaži datoteke koje će biti ažurirane na lijevoj strani -Show files that will be overwritten on right side -Prikaži datoteke koje će biti prepisane na desnoj strani +Show files that will be updated on the right side +Prikaži datoteke koje će biti ažurirane na desnoj strani Show files that won't be copied Prikaži datoteke koje neće biti kopirane @@ -1277,7 +1289,7 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. Popis datoteka je izvezen Searching for program updates... -Pretražujem nadogradnju programa... +Tražim nadogradnju programa... Close progress dialog Zatvori prozor zadatka @@ -1389,15 +1401,6 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. Configure your own synchronization rules. Postavite vaša vlastita sinkronizacijska pravila. -Exclude -Isključi - -Direct -Direktno - -Follow -Slijedi - Today Danas @@ -1461,9 +1464,6 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. Cannot monitor directory %x. Ne mogu nadzirati direktorij %x. -Conversion error: -Greška prilikom pretvaranja: - Cannot delete file %x. Ne mogu izbrisati datoteku %x. @@ -1497,8 +1497,8 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. Cannot create directory %x. Ne mogu izraditi mapu %x. -Cannot create symbolic link %x. -Ne mogu stvoriti simboličku vezu %x. +Cannot copy symbolic link %x to %y. +Ne može se kopirati simbolična poveznica %x prema %y. Cannot find system function %x. Ne mogu pronaći sistemsku funkciju %x. @@ -1584,3 +1584,72 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. Configuration file %x loaded partially only. Datoteka postavki %x učitana samo djelomično +Prepare installation +Pripremam instalaciju + +Choose which components you want to install. +Odaberite koje komponente želite instalirati. + +Select installation type: +Odaberite vrstu instalacije: + +Local +Lokalno + +Portable +Prenosivo + +recommended +preporučljivo + +Save settings to "%APPDATA%\FreeFileSync" +Spremi postavke u "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Registriraj FreeFileSync ekstenziju + +Create Explorer context menu entries +Izradi stavke u Explorer kontekstnom izborniku + +Save settings in installation directory +Spremi postavke u instalacijsku mapu + +Do not write to Registry +Ne upisuj u Registry + +Just copy the files +Samo kopiraj datoteke + +Choose a directory for installation: +Odaberi mapu za instalaciju: + +Create shortcuts: +Izradi prečac: + +Desktop +Radna površina + +Start menu +Start izbornik + +Registering FreeFileSync file extensions +Registriram FreeFileSync ekstenziju + +Unregistering FreeFileSync file extensions +Uklanjam FreeFileSync ekstenziju + +FreeFileSync Configuration +FreeFileSync Postavke + +FreeFileSync Batch File +FreeFileSync slijedna datoteka + +FreeFileSync Synchronization Database +FreeFileSync sinkronizacijska baza podataka + +RealtimeSync Configuration +RealtimeSync postavke + +Edit with FreeFileSync +Uredi pomoću FreeFileSynca + diff --git a/FreeFileSync/Build/Languages/czech.lng b/FreeFileSync/Build/Languages/czech.lng index 2796d262..af34ceb9 100644 --- a/FreeFileSync/Build/Languages/czech.lng +++ b/FreeFileSync/Build/Languages/czech.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Libovolný počet alternativních párů adresářů na alespoň jednu konfiguraci. +Open configuration for edit without executing. +Otevřít konfiguraci pro úpravu bez spuštění. + Cannot find the following folders: Nelze najít následující složky: @@ -184,11 +187,11 @@ Move file on right Přesunout soubor napravo -Overwrite left item -Přepsat levou položku tou zprava +Update left item +Aktualizovat levou položku -Overwrite right item -Přepsat pravou položku tou zleva +Update right item +Aktualizovat pravou položku Do nothing Nic nedělat @@ -218,6 +221,9 @@ %x GB %x GB +Cannot load file %x. +Nelze načíst soubor %x. + Database file %x is incompatible. Chybný formát databáze %x. @@ -270,6 +276,9 @@ Creating file %x Vytváření souboru %x +Saving file %x... +Ukládání souboru %x... + Items processed: Zpracováno položek: @@ -298,9 +307,6 @@ %x procesů -Encoding extended time information: %x -Zpracování rozšířené informace o čase: %x - /sec /s @@ -322,9 +328,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. Prosím použijte FreeFileSync 64-bitovou verzi pro použití služby Stínové kopie. -Cannot load file %x. -Nelze načíst soubor %x. - Cannot determine volume name for %x. >Nelze zjistit jméno jednotky souboru %x. @@ -343,7 +346,7 @@ Save &as... Uložit &jako... -&Quit +E&xit U&končit &File @@ -438,6 +441,9 @@ Příkaz je spuštěn když: &Show error &Zobrazit chybu +&Quit +U&končit + Incorrect command line: Neplatný příkaz: @@ -483,11 +489,11 @@ Příkaz je spuštěn když: Creating folder %x Vytváření adresáře %x -Overwriting file %x -Přepisování souboru %x +Updating file %x +Aktualizace souboru %x -Overwriting symbolic link %x -Přepisování symbolického odkazu %x +Updating symbolic link %x +Aktualizace symbolického odkazu %x Verifying file %x Kontrola souboru %x @@ -501,21 +507,21 @@ Příkaz je spuštěn když: Data verification error: %x and %y have different content. Chyba porovnání dat: %x má jiný obsah než %y -Cannot find folder %x. -Nelze najít složku %x. - Target folder %x already existing. Cílová složka %x již existuje. +Cannot find folder %x. +Nelze najít složku %x. + Target folder input field must not be empty. Cílová složka nesmí být prázdná. -Please enter a target folder for versioning. -Prosím zadejte cílovou složku pro verzování. - Source folder %x not found. Zdrojovou složku %x nelze najít. +Please enter a target folder for versioning. +Prosím zadejte cílovou složku pro verzování. + The following items have unresolved conflicts and will not be synchronized: Následující položky jsou nevyřešené konflikty a nebudou synchronizovány: @@ -558,8 +564,8 @@ Příkaz je spuštěn když: Synchronization completed successfully Synchronizace dokončena úspěšně -Saving log file %x... -Ukládání žurnálu %x... +Cleaning up old log files... +Odstraňování starých žurnálů... Stopped Zastaveno @@ -613,8 +619,8 @@ Příkaz je spuštěn když: FreeFileSync is up to date. FreeFileSync je aktuální. -Unable to connect to sourceforge.net. -Není možné se připojit k sourceforge.net. +Unable to connect to FreeFileSync.org. +Není možné se připojit k FreeFileSync.org. Cannot find current FreeFileSync version number online. Do you want to check manually? Současná verze FreeFileSync nebyla nalezena online! Chcete verzi zkontrolovat ručně? @@ -700,9 +706,21 @@ Příkaz je spuštěn když: Start &comparison Začít &porovnání +C&omparison settings +Nastavení p&orovnání + +&Filter settings +Nastavení &filtru + +S&ynchronization settings +Nastavení s&ynchronizace + Start &synchronization Začít &synchronizaci +&Actions +&Akce + &Options Nastavení &programu @@ -781,8 +799,8 @@ Příkaz je spuštěn když: Number of files and folders that will be deleted Počet souborů a složek ke smazání -Number of files that will be overwritten -Počet souborů a adresářů k přepsání +Number of files that will be updated +Počet souborů k aktualizaci Number of files and folders that will be created Počet souborů a složek k vytvoření @@ -811,8 +829,14 @@ Příkaz je spuštěn když: Handle daylight saving time Používat letní čas -Symbolic links: -Symbolické odkazy: +Include symbolic links: +Zahrnout symbolické odkazy: + +Direct +Zachovat + +Follow +Použít cíl More information Více informací @@ -841,23 +865,23 @@ Příkaz je spuštěn když: Maximum: Do: -C&lear -Vy&mazat - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Nastavte pravidla filtru pro vynechání některých souborů ze synchronizace. Zadávejte cesty relativně k odpovídající složce. +C&lear +Vy&mazat + Detect moved files Detekce přesunutých souborů -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- vyžaduje a vytváří soubor databáze - je k dispozici po prvotní synchronizaci +- vyžaduje a vytváří soubor databáze - není dostupné na všech systémech @@ -1068,27 +1092,15 @@ This guarantees a consistent state even in case of a serious error. View Settings Nastavení zobrazení -Overview -Přehled - Configuration Konfigurace +Overview +Přehled + Main Bar Hlavní lišta -Start comparison -Začít porovnání - -Comparison settings -Nastavení porovnání - -Synchronization settings -Nastavení synchronizace - -Start synchronization -Start synchronizace - Confirm Potvrdit @@ -1243,11 +1255,11 @@ This guarantees a consistent state even in case of a serious error. Show files that will be deleted on the right side Zobrazit soubory, které budou vpravo smazány -Show files that will be overwritten on left side -Zobrazit soubory, které budou vlevo přepsány +Show files that will be updated on the left side +Zobrazit soubory, které budou vlevo aktualizovány -Show files that will be overwritten on right side -Zobrazit soubory, které budou vpravo přepsány +Show files that will be updated on the right side +Zobrazit soubory, které budou vpravo aktualizovány Show files that won't be copied Zobrazit soubory, které nebudou kopírovány @@ -1386,15 +1398,6 @@ This guarantees a consistent state even in case of a serious error. Configure your own synchronization rules. Nastavení vlastních pravidel synchronizace. -Exclude -Vynechat - -Direct -Zachovat - -Follow -Použít cíl - Today Dnes @@ -1458,9 +1461,6 @@ This guarantees a consistent state even in case of a serious error. Cannot monitor directory %x. Nelze nastavit monitorování adresáře %x. -Conversion error: -Chyba konverze: - Cannot delete file %x. Nelze smazat soubor %x. @@ -1494,8 +1494,8 @@ This guarantees a consistent state even in case of a serious error. Cannot create directory %x. Nelze vytvořit adresář %x. -Cannot create symbolic link %x. -Nelze vytvořit zástupce %x. +Cannot copy symbolic link %x to %y. +Nelze kopírovat symbolický odkaz %x do %y. Cannot find system function %x. Nelze najít systémovou funkci %x. @@ -1581,3 +1581,72 @@ This guarantees a consistent state even in case of a serious error. Configuration file %x loaded partially only. Konfigurace ze souboru %x byla načtena jen částečně. +Prepare installation +Příprava instalace + +Choose which components you want to install. +Vyberte komponenty k instalaci. + +Select installation type: +Vyberte typ instalace: + +Local +Lokální + +Portable +Přenosná + +recommended +doporučeno + +Save settings to "%APPDATA%\FreeFileSync" +uloží nastavení do složky "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +zaregistruje přípony souborů FreeFileSync + +Create Explorer context menu entries +Vytviřit položky v kontextovém menu Průzkumníka + +Save settings in installation directory +uloží nastavení do složky určené pro instalaci + +Do not write to Registry +nemění ani nezapisuje do Registrů + +Just copy the files +zkopíruje pouze soubory + +Choose a directory for installation: +Vyberte složku pro instalaci: + +Create shortcuts: +Vytvořit zástupce: + +Desktop +Plocha + +Start menu +Nabídka Start + +Registering FreeFileSync file extensions +Zaregistrovat příponu souborů FreeFileSync + +Unregistering FreeFileSync file extensions +Odregistrovat příponu souborů FreeFileSync + +FreeFileSync Configuration +Nastavení FreeFileSync + +FreeFileSync Batch File +Dávka FreeFileSync + +FreeFileSync Synchronization Database +Synchronizační databáze FreeFileSync + +RealtimeSync Configuration +Nastavení RealtimeSync + +Edit with FreeFileSync +Upravit v FreeFileSync + diff --git a/FreeFileSync/Build/Languages/danish.lng b/FreeFileSync/Build/Languages/danish.lng index 138a697b..1ac52b9a 100644 --- a/FreeFileSync/Build/Languages/danish.lng +++ b/FreeFileSync/Build/Languages/danish.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Vilkårligt antal alternative mappepar til højst en indstillingsfil +Open configuration for edit without executing. +Åben indstillingsfil for redigering + Cannot find the following folders: Kan ikke finde følgende mapper: @@ -184,11 +187,11 @@ Move file on right flyt filen til højre -Overwrite left item -Overskriv venstre emne +Update left item +Opdater venstre emne -Overwrite right item -Overskriv højre emne +Update right item +Opdater højre emne Do nothing Gør intet @@ -217,6 +220,9 @@ %x GB %x GB +Cannot load file %x. +Kan ikke indlæse filen %x. + Database file %x is incompatible. Databasefilen %x er inkompatibel. @@ -268,6 +274,9 @@ Creating file %x Opretter filen %x +Saving file %x... +Gemmer filen %x... + Items processed: Emner behandlet: @@ -295,9 +304,6 @@ %x tråde -Encoding extended time information: %x -Opretter udvidet tidsinformation: %x - /sec /sek @@ -319,9 +325,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. Brug FreeFileSync 64-bit til at lave VSS kopier på dette system. -Cannot load file %x. -Kan ikke indlæse filen %x. - Cannot determine volume name for %x. Kan ikke bestemme volumennavn for %x. @@ -340,8 +343,8 @@ Save &as... Gem &som... -&Quit -&Afslut +E&xit +L&uk &File &Fil @@ -368,7 +371,7 @@ 3. Klik 'Start'. To get started just import a .ffs_batch file. -Importer en .ffs_batchfil (Filer > Åben...) for at komme igang. +Importer en .ffs_batchfil (Fil > Åben...) for at komme igang. Folders to watch: Jobbets mapper: @@ -435,6 +438,9 @@ Kommandoen udføres hvis: &Show error Vi&s fejl +&Quit +&Afslut + Incorrect command line: Ugyldig kommando: @@ -480,11 +486,11 @@ Kommandoen udføres hvis: Creating folder %x Opretter mappen %x -Overwriting file %x -Overskriver filen %x +Updating file %x +Opdaterer filen %x -Overwriting symbolic link %x -Overskriver symlinket %x +Updating symbolic link %x +Opdaterer symbolsk link %x Verifying file %x Verificerer filen %x @@ -498,21 +504,21 @@ Kommandoen udføres hvis: Data verification error: %x and %y have different content. Godkendelsesfejl: %x og %y har forskelligt indhold -Cannot find folder %x. -Kan ikke finde mappen %x - Target folder %x already existing. Destinationsmappen %x findes allerede. +Cannot find folder %x. +Kan ikke finde mappen %x + Target folder input field must not be empty. Destinationsmappen skal angives. -Please enter a target folder for versioning. -Angiv mappe til versionering. - Source folder %x not found. Kildemappen %x blev ikke fundet. +Please enter a target folder for versioning. +Angiv mappe til versionering. + The following items have unresolved conflicts and will not be synchronized: Følgende emner har uløste konflikter og synkroniseres ikke: @@ -555,8 +561,8 @@ Kommandoen udføres hvis: Synchronization completed successfully Synkronisering gennemført -Saving log file %x... -Gemmer rapport %x... +Cleaning up old log files... +Fjerner gamle logfiler... Stopped Afbrudt @@ -609,8 +615,8 @@ Kommandoen udføres hvis: FreeFileSync is up to date. FreeFileSync er opdateret. -Unable to connect to sourceforge.net. -Kan ikke kontakte sourceforge.net. +Unable to connect to FreeFileSync.org. +Kan ikke kontakte FreeFileSync.org. Cannot find current FreeFileSync version number online. Do you want to check manually? Kunne ikke finde FreeFileSync's versionsnummer online. Vil du kontrollere manuelt? @@ -696,9 +702,21 @@ Kommandoen udføres hvis: Start &comparison Start &analyse +C&omparison settings +A&nalyseindstillinger + +&Filter settings +&Filterindstillinger + +S&ynchronization settings +S&ynkroniseringsindstillinger + Start &synchronization Start &synkronisering +&Actions +&Handlinger + &Options &Indstillinger @@ -777,8 +795,8 @@ Kommandoen udføres hvis: Number of files and folders that will be deleted Antal filer og mapper der slettes -Number of files that will be overwritten -Antal filer der overskrives +Number of files that will be updated +Antal filer der opdateres Number of files and folders that will be created Antal filer og mapper der oprettes @@ -807,8 +825,14 @@ Kommandoen udføres hvis: Handle daylight saving time Tag hensyn til sommertid -Symbolic links: -Symbolske link: +Include symbolic links: +Medtag symlinks: + +Direct +Direkte + +Follow +Følg More information Mere information @@ -837,24 +861,24 @@ Kommandoen udføres hvis: Maximum: Maksimum: -C&lear -R&yd - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Angiv filterregler til ekskludering af bestemte filer fra synkroniseringen. Filstier skal relatere til kildemapperne. +C&lear +R&yd + Detect moved files Genkend flyttede filer -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems +- Overvågning akiv efter første synk - Kræver og opretter databasefiler -- Genkendelse aktiv efter første synk -- Understøtter ikke alle filsystemer +- Støttes ikke af alle filsystemer Detect synchronization directions with the help of database files @@ -1064,27 +1088,15 @@ This guarantees a consistent state even in case of a serious error. View Settings Visninger -Overview -Oversigt - Configuration Indstilling +Overview +Oversigt + Main Bar Hovedlinie -Start comparison -Start analyse - -Comparison settings -Analyseindstillinger - -Synchronization settings -Synkroniseringsindstillinger - -Start synchronization -Start synkronisering - Confirm Bekræft @@ -1235,11 +1247,11 @@ This guarantees a consistent state even in case of a serious error. Show files that will be deleted on the right side Vis filer der slettes på højre side -Show files that will be overwritten on left side -Vis filer der overskrives på venstre side +Show files that will be updated on the left side +Vis filer der opdateres på venstre side -Show files that will be overwritten on right side -Vis filer der overskrives på højre side +Show files that will be updated on the right side +Vis filer der opdateres på højre side Show files that won't be copied Vis filer der ikke kopieres @@ -1376,15 +1388,6 @@ This guarantees a consistent state even in case of a serious error. Configure your own synchronization rules. Opret dine egne synkroniseringsregler. -Exclude -Ekskludér - -Direct -Direkte - -Follow -Følg - Today Idag @@ -1448,9 +1451,6 @@ This guarantees a consistent state even in case of a serious error. Cannot monitor directory %x. Kan ikke overvåge mappen %x. -Conversion error: -Konverteringsfejl: - Cannot delete file %x. Kan ikke slette filen %x. @@ -1484,8 +1484,8 @@ This guarantees a consistent state even in case of a serious error. Cannot create directory %x. Kan ikke oprette mappen %x. -Cannot create symbolic link %x. -Kan ikke oprette symbolsk link %x. +Cannot copy symbolic link %x to %y. +Kan ikke kopiere symlink fra %x til %y. Cannot find system function %x. Kan ikke finde systemfunktionen %x. @@ -1568,3 +1568,72 @@ This guarantees a consistent state even in case of a serious error. Configuration file %x loaded partially only. Indstillingsfilen %x er kun delvist indlæst. +Prepare installation +Forbereder installering + +Choose which components you want to install. +Vælg hvordan FreeFileSync skal installeres. + +Select installation type: +Vælg installeringstype: + +Local +Standard + +Portable +Portable + +recommended +anbefales + +Save settings to "%APPDATA%\FreeFileSync" +Gemmer indstillinger i "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Registrerer FreeFileSync filtyper + +Create Explorer context menu entries +Føj til Stifinders højrekliksmenu + +Save settings in installation directory +Gemmer indstillinger i programmets mappe + +Do not write to Registry +Skriver ikke til registreringsdatabasen + +Just copy the files +Udpakker filer til valgt mappe + +Choose a directory for installation: +Vælg installeringsmappe: + +Create shortcuts: +Opret genveje: + +Desktop +På skrivebord + +Start menu +I startmenu + +Registering FreeFileSync file extensions +Registrerer FreeFileSync filtyper + +Unregistering FreeFileSync file extensions +Fjerner FreeFileSync filtyperegistrering + +FreeFileSync Configuration +FreeFileSync indstillinger + +FreeFileSync Batch File +FreeFileSync batchfil + +FreeFileSync Synchronization Database +FreeFileSync synkroniseringsdatabase + +RealtimeSync Configuration +RealtimeSync indstillinger + +Edit with FreeFileSync +Rediger med FreeFileSync + diff --git a/FreeFileSync/Build/Languages/dutch.lng b/FreeFileSync/Build/Languages/dutch.lng index d8192801..93753618 100644 --- a/FreeFileSync/Build/Languages/dutch.lng +++ b/FreeFileSync/Build/Languages/dutch.lng @@ -7,9 +7,6 @@ n == 1 ? 0 : 1 -Open configuration for edit without executing. - - Both sides have changed since last synchronization. Beide zijden zijn gewijzigd sinds de laatste synchronisatie. @@ -89,7 +86,7 @@ directory Path to an alternate GlobalSettings.xml file. -Bestandspad naar alternatieve GlobalSettings.xml. +Bestandspad naar plaatsvervangend GlobalSettings.xml bestand. Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files. Een willekeurig aantal FreeFileSync. ffs_gui en/of .ffs_batch configuratiebestanden. @@ -97,8 +94,11 @@ Any number of alternative directory pairs for at most one config file. Een willekeurig aantal alternatieve directoryparen voor maximaal een configuratiebestand. +Open configuration for edit without executing. +Open configuratie voor het bewerken zonder uit te voeren. + Cannot find the following folders: -De volgende map kon niet worden gevonden: +De volgende mappen kon niet worden gevonden: You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization. Deze fout kan worden genegeerd, om de mappen als leeg te zien en de folders automatisch te creëren wanneer u synchroniseert. @@ -149,16 +149,16 @@ Onvoldoende werkgeheugen. Item exists on left side only -Item bestaat alleen aan de linkerkant +Item bestaat alleen aan de linkerzijde Item exists on right side only -Item bestaat alleen aan de rechterkant +Item bestaat alleen aan de rechterzijde Left side is newer -Linkerkant is nieuwer +Linkerzijde is nieuwer Right side is newer -Rechterkant is nieuwer +Rechterzijde is nieuwer Items have different content Items hebben verschillende inhoud @@ -187,11 +187,11 @@ Move file on right Verplaats rechter bestand -Overwrite left item -Overschrijf linker item +Update left item +Update linker item -Overwrite right item -Overschrijf rechter item +Update right item +Update rechter item Do nothing Niets doen @@ -248,7 +248,7 @@ Zoek naar map %x... Cannot read file attributes of %x. -Kan de bestandskenmerken niet lezen van %x. +Kan de bestandskenmerken van %x niet lezen. Cannot get process information. Kan geen procesinformatie krijgen. @@ -264,8 +264,8 @@ %x sec -1 Sek. -%x Sek. +1 sec +%x sec Detecting abandoned lock... @@ -274,6 +274,9 @@ Creating file %x Bestand %x maken +Saving file %x... +Opslaan van bestand %x... + Items processed: Items verwerkt: @@ -301,9 +304,6 @@ %x Threads -Encoding extended time information: %x -Codering van langere tijdinformatie: %x - /sec /sec @@ -320,7 +320,7 @@ Blader in directory Cannot access the Volume Shadow Copy Service. -Geen toegang tot het Volume Shadow Copy Service. +Kan geen toegang krijgen tot de Volume Shadow Copy Service. Please use FreeFileSync 64-bit version to create shadow copies on this system. Gebruik FreeFileSync 64-bits versie voor het maken van schaduwkopieën op dit systeem. @@ -332,7 +332,7 @@ Volumenaam %x behoort niet tot bestandspad %y. Stop requested: Waiting for current operation to finish... -Stop opgevraagd: wachten totdat de huidige bewerking is voltooit... +Stoppen gevraagd: wachten totdat de huidige bewerking is voltooid... Unable to create time stamp for versioning: Kan geen tijdstempel maken voor versiebeheer: @@ -343,8 +343,8 @@ Save &as... Opslaan &als... -&Quit -&Stoppen +E&xit +A&fsluiten &File &Bestand @@ -438,6 +438,9 @@ De opdracht wordt geactiveerd als: &Show error &Toon fout +&Quit +&Stoppen + Incorrect command line: Onjuiste opdrachtregel: @@ -478,16 +481,16 @@ De opdracht wordt geactiveerd als: Verwijderen van oude versies... Creating symbolic link %x -Creëren symbolische link %x +Symbolische link %x maken Creating folder %x Map %x maken -Overwriting file %x -Overschrijven bestand %x +Updating file %x +File %x bijwerken -Overwriting symbolic link %x -Symbolische link %x overschrijven +Updating symbolic link %x +Symbolische link %x bijwerken Verifying file %x Controleren van bestand %x @@ -558,8 +561,8 @@ De opdracht wordt geactiveerd als: Synchronization completed successfully Synchronisatie succesvol voltooid -Saving log file %x... -Opslaan logbestand %x... +Cleaning up old log files... +Opruimen oude logboekbestanden... Stopped Gestopt @@ -612,8 +615,8 @@ De opdracht wordt geactiveerd als: FreeFileSync is up to date. FreeFileSync is actueel. -Unable to connect to sourceforge.net. -Kan geen verbinding maken met sourceforge.net. +Unable to connect to FreeFileSync.org. +Kan geen verbinding maken met FreeFileSync.org. Cannot find current FreeFileSync version number online. Do you want to check manually? Kan online niet het actuele FreeFileSync versienummer vinden. Wilt u handmatig controleren? @@ -699,9 +702,21 @@ De opdracht wordt geactiveerd als: Start &comparison Start &vergelijking +C&omparison settings +V&ergelijking instellingen + +&Filter settings +&Filter instellingen + +S&ynchronization settings +S&ynchronisatie instellingen + Start &synchronization Start &synchronisatie +&Actions +&Acties + &Options &Opties @@ -709,7 +724,7 @@ De opdracht wordt geactiveerd als: &Taal &Find... -&Vinden... +&Zoeken... &Reset layout &Reset lay-out @@ -727,7 +742,7 @@ De opdracht wordt geactiveerd als: &Nu conroleren Check &automatically once a week -Controleer eens per week &automatisch +Controleer een keer per week &automatisch Cancel Annuleren @@ -780,14 +795,14 @@ De opdracht wordt geactiveerd als: Number of files and folders that will be deleted Aantal bestanden en mappen die worden verwijderd -Number of files that will be overwritten -Aantal bestanden die worden overschreven +Number of files that will be updated +Aantal bestanden die bijgewerkt zullen worden Number of files and folders that will be created Aantal bestanden en mappen die worden gemaakt Total bytes to copy -Totaal aantal te kopiëren bytes +Totaal aantal te kopieëren bytes Use local settings: Gebruik lokale instellingen: @@ -810,8 +825,14 @@ De opdracht wordt geactiveerd als: Handle daylight saving time Zomertijd gebruiken -Symbolic links: -Symbolische koppelingen: +Include symbolic links: +Omvat symbolische koppelingen + +Direct +Direct + +Follow +Volgen More information Meer informatie @@ -840,23 +861,23 @@ De opdracht wordt geactiveerd als: Maximum: Maximum: -C&lear -&Wissen - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Selecteer filterregels om bepaalde bestanden uit te sluiten van synchronisatie. Voer bestandspaden in ten opzichte van hun bijbehorend map-paar. +C&lear +&Wissen + Detect moved files -Verplaatste bestanden detecteren +Detecteren van verplaatste bestanden -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- Vereist en maakt database bestanden. -- Detectie actief na intitiële syncronisatie +- Detectie actief na eerste synchronisatie +- Vereist en maakt databasebestanden - Niet ondersteund door alle bestandssystemen @@ -942,7 +963,7 @@ De opdracht wordt geactiveerd als: Stop Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x -Creërt een batch-bestand om zonder toezicht te synchroniseren. Dubbelklikt u op het bestand om te starten of maak een opdracht in de taakplanner: %x +Maak een batch-bestand om zonder toezicht te synchroniseren. Om te starten, dubbelklik op het bestand of maak een opdracht in de taakplanner: %x &Stop &Stop @@ -969,14 +990,14 @@ De opdracht wordt geactiveerd als: De volgende instellingen worden gebruikt voor alle synchronisatie opdrachten. Fail-safe file copy -Fail-safe bestand kopiëren +Fail-safe bestand kopieëren Copy to a temporary file (*.ffs_tmp) before overwriting target. This guarantees a consistent state even in case of a serious error. -Kopiëren naar een tijdelijk bestand (*.ffs_tmp) voordat het doel wordt overschreven. +Kopieëren naar een tijdelijk bestand (*.ffs_tmp) voordat het doel wordt overschreven. Dit garandeert een consistente status zelfs in het geval van een ernstige fout. @@ -984,16 +1005,16 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. (aanbevolen) Copy locked files -Vergrendelde bestanden kopiëren +Vergrendelde bestanden kopieëren Copy shared or locked files using the Volume Shadow Copy Service. -Gedeelde of vergrendelde bestanden met behulp van de Volume Schaduw copy-Service kopiëren. +Gedeelde of vergrendelde bestanden met behulp van de Volume Schaduw copy-Service kopieëren. (requires administrator rights) (vereist beheerdersrechten) Copy file access permissions -Toegangsmachtigingen om bestanden te kopiëren +Toegangsmachtigingen om bestanden te kopieëren Transfer file and folder permissions. Overdracht van bestands- en mapmachtigingen. @@ -1070,27 +1091,15 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. View Settings Instellingen bekijken -Overview -Overzicht - Configuration Configuratie +Overview +Overzicht + Main Bar Hoofd balk -Start comparison -Vergelijking starten - -Comparison settings -Vergelijkings-instellingen - -Synchronization settings -Synchronisatie-instellingen - -Start synchronization -Synchronisatie starten - Confirm Bevestigen @@ -1140,7 +1149,7 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. meervoudige selectie Include via filter: -Via filter bijvoegen: +Opnemen via filter: Exclude via filter: Uitsluiten via filter: @@ -1209,10 +1218,10 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. Filter wissen Show files that exist on left side only -Toon bestanden die bestaan alleen aan de linkerkant +Toon bestanden die bestaan alleen aan de linkerzijde Show files that exist on right side only -Toon bestanden die bestaan alleen aan de rechterkant +Toon bestanden die bestaan alleen aan de rechterzijde Show files that are newer on left Bestanden die nieuwer zijn aan de linkerzijde weergeven @@ -1230,22 +1239,22 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. Conflicten weergeven Show files that will be created on the left side -Bestanden die gemaakt worden aan de linkerkant weergeven +Bestanden die gemaakt worden aan de linkerzijde weergeven Show files that will be created on the right side -Bestanden die gemaakt worden aan de rechterkant weergeven +Bestanden die gemaakt worden aan de rechterzijde weergeven Show files that will be deleted on the left side -Bestanden die worden verwijderd aan de linker kant weergeven +Bestanden die worden verwijderd aan de linkerzijde weergeven Show files that will be deleted on the right side -Bestanden die worden verwijderd op de rechterkant weergeven +Bestanden die worden verwijderd aan de rechterzijde weergeven -Show files that will be overwritten on left side -Bestanden die overschreven worden aan de linkerzijde weergeven +Show files that will be updated on the left side +Toon bestanden die worden bijgewerkt aan de linkerzijde -Show files that will be overwritten on right side -Bestanden die overschreven worden aan de rechterzijde weergeven +Show files that will be updated on the right side +Toon bestanden die worden bijgewerkt aan de rechterzijde Show files that won't be copied Bestanden weergeven die niet gekopieerd worden @@ -1272,7 +1281,7 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. Bestandenlijst geëxporteerd Searching for program updates... -Programma-updates zoekt... +Zoeken naar programma-updates... Close progress dialog Voortgang dialoogvenster sluiten @@ -1347,7 +1356,7 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. Voorkeuren Copy NTFS permissions -Kopiëren van NTFS-machtigingen +Kopieëren van NTFS-machtigingen Integrate external applications into context menu. The following macros are available: Externe applicaties integreren in het contextmenu. De volgende macro's zijn beschikbaar: @@ -1377,20 +1386,11 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. Maak een spiegel-backup van de linkermap, door de rechtermap aan te aanpassen. Copy new and updated files to the right folder. -Nieuwe en bijgewerkte bestanden naar de rechter map kopiëren. +Nieuwe en bijgewerkte bestanden naar de rechter map kopieëren. Configure your own synchronization rules. Configureer uw eigen synchronisatie regels. -Exclude -Uitsluiten - -Direct -Direct - -Follow -Volgen - Today Vandaag @@ -1454,9 +1454,6 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. Cannot monitor directory %x. Kan map %x niet bewaken. -Conversion error: -Conversie fout: - Cannot delete file %x. Kan bestand %x niet verwijderen. @@ -1490,14 +1487,14 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. Cannot create directory %x. Kan de map %x niet maken. -Cannot create symbolic link %x. -Kan de symbolische koppeling %x niet maken. +Cannot copy symbolic link %x to %y. +Kan de symbolische koppeling %x niet kopiëren naar %y Cannot find system function %x. Kan de systeemfunctie %x niet vinden. Cannot copy file %x to %y. -Kan bestand %x niet kopieëren naar %y. +Kan bestand %x niet kopieëren naar %y. Type of item %x is not supported: Dit itemtype %x wordt niet ondersteund: @@ -1574,3 +1571,72 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. Configuration file %x loaded partially only. Configuratiebestand %x alleen gedeeltelijk ingelezen. +Prepare installation +Installatie voorbereiden + +Choose which components you want to install. +Kies welke onderdelen u wilt installeren. + +Select installation type: +Selecteer type installatie: + +Local +Lokaal + +Portable +Portable + +recommended +aanbevolen + +Save settings to "%APPDATA%\FreeFileSync" +Instellingen opslaan in "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Registreer FreeFileSync bestands-extensies + +Create Explorer context menu entries +Maak Explorer contect menu-items + +Save settings in installation directory +Sla instellingen op in de installatiemap + +Do not write to Registry +Schrijf niet naar het register + +Just copy the files +Kopieer de bestanden + +Choose a directory for installation: +Kies een map voor de installatie: + +Create shortcuts: +Maak snelkoppelingen: + +Desktop +Bureaublad + +Start menu +Startmenu + +Registering FreeFileSync file extensions +Registeren van de FreeFileSync bestands-extensies + +Unregistering FreeFileSync file extensions +De-installeren van de FreeFileSync bestands-extensies + +FreeFileSync Configuration +FreeFileSync configuratie + +FreeFileSync Batch File +FreeFileSync batch bestand + +FreeFileSync Synchronization Database +FreeFileSync synchronisatie database + +RealtimeSync Configuration +RealtimeSync configuratie + +Edit with FreeFileSync +Bewerken met FreeFileSync + diff --git a/FreeFileSync/Build/Languages/english_uk.lng b/FreeFileSync/Build/Languages/english_uk.lng index d80f6748..60e334e5 100644 --- a/FreeFileSync/Build/Languages/english_uk.lng +++ b/FreeFileSync/Build/Languages/english_uk.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Any number of alternative directory pairs for at most one config file. +Open configuration for edit without executing. +Open configuration for edit without executing. + Cannot find the following folders: Cannot find the following folders: @@ -184,11 +187,11 @@ Move file on right Move file on right -Overwrite left item -Overwrite left item +Update left item +Update left item -Overwrite right item -Overwrite right item +Update right item +Update right item Do nothing Do nothing @@ -217,6 +220,9 @@ %x GB %x GB +Cannot load file %x. +Cannot load file %x. + Database file %x is incompatible. Database file %x is incompatible. @@ -268,6 +274,9 @@ Creating file %x Creating file %x +Saving file %x... +Saving file %x... + Items processed: Elements processed: @@ -295,9 +304,6 @@ %x threads -Encoding extended time information: %x -Encoding extended time information: %x - /sec /sec @@ -319,9 +325,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. Please use FreeFileSync 64-bit version to create shadow copies on this system. -Cannot load file %x. -Cannot load file %x. - Cannot determine volume name for %x. Cannot determine volume name for %x. @@ -340,8 +343,8 @@ Save &as... Save &as... -&Quit -&Quit +E&xit +E&xit &File &File @@ -435,6 +438,9 @@ The command is triggered if: &Show error &Show error +&Quit +&Quit + Incorrect command line: Incorrect command line: @@ -480,11 +486,11 @@ The command is triggered if: Creating folder %x Creating folder %x -Overwriting file %x -Overwriting file %x +Updating file %x +Updating file %x -Overwriting symbolic link %x -Overwriting symbolic link %x +Updating symbolic link %x +Updating symbolic link %x Verifying file %x Verifying file %x @@ -498,21 +504,21 @@ The command is triggered if: Data verification error: %x and %y have different content. Data verification error: %x and %y have different content. -Cannot find folder %x. -Cannot find folder %x. - Target folder %x already existing. Target folder %x already existing. +Cannot find folder %x. +Cannot find folder %x. + Target folder input field must not be empty. Target folder input field must not be empty. -Please enter a target folder for versioning. -Please enter a target folder for versioning. - Source folder %x not found. Source folder %x not found. +Please enter a target folder for versioning. +Please enter a target folder for versioning. + The following items have unresolved conflicts and will not be synchronized: The following items have unresolved conflicts and will not be synchronised: @@ -555,8 +561,8 @@ The command is triggered if: Synchronization completed successfully Synchronisation completed successfully -Saving log file %x... -Saving log file %x... +Cleaning up old log files... +Cleaning up old log files... Stopped Stopped @@ -609,8 +615,8 @@ The command is triggered if: FreeFileSync is up to date. FreeFileSync is up to date. -Unable to connect to sourceforge.net. -Unable to connect to sourceforge.net. +Unable to connect to FreeFileSync.org. +Unable to connect to FreeFileSync.org. Cannot find current FreeFileSync version number online. Do you want to check manually? Cannot find current FreeFileSync version number online. Do you want to check manually? @@ -696,9 +702,21 @@ The command is triggered if: Start &comparison Start &comparison +C&omparison settings +C&omparison settings + +&Filter settings +&Filter settings + +S&ynchronization settings +S&ynchronization settings + Start &synchronization Start &synchronisation +&Actions +&Actions + &Options &Options @@ -777,8 +795,8 @@ The command is triggered if: Number of files and folders that will be deleted Number of files and folders that will be deleted -Number of files that will be overwritten -Number of files that will be overwritten +Number of files that will be updated +Number of files that will be updated Number of files and folders that will be created Number of files and folders that will be created @@ -807,8 +825,14 @@ The command is triggered if: Handle daylight saving time Handle daylight saving time -Symbolic links: -Symbolic links: +Include symbolic links: +Include symbolic links: + +Direct +Direct + +Follow +Follow More information More information @@ -837,23 +861,23 @@ The command is triggered if: Maximum: Maximum: -C&lear -C&lear - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Select filter rules to exclude certain files from synchronisation. Enter file paths relative to their corresponding folder pair. +C&lear +C&lear + Detect moved files Detect moved files -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems @@ -1067,27 +1091,15 @@ This guarantees a consistent state even in case of a serious error. View Settings View Settings -Overview -Overview - Configuration Configuration +Overview +Overview + Main Bar Main Bar -Start comparison -Start comparison - -Comparison settings -Comparison settings - -Synchronization settings -Synchronisation settings - -Start synchronization -Start synchronisation - Confirm Confirm @@ -1238,11 +1250,11 @@ This guarantees a consistent state even in case of a serious error. Show files that will be deleted on the right side Show files that will be deleted on the right side -Show files that will be overwritten on left side -Show files that will be overwritten on left side +Show files that will be updated on the left side +Show files that will be updated on the left side -Show files that will be overwritten on right side -Show files that will be overwritten on right side +Show files that will be updated on the right side +Show files that will be updated on the right side Show files that won't be copied Show files that won't be copied @@ -1379,15 +1391,6 @@ This guarantees a consistent state even in case of a serious error. Configure your own synchronization rules. Configure your own synchronisation rules. -Exclude -Exclude - -Direct -Direct - -Follow -Follow - Today Today @@ -1451,9 +1454,6 @@ This guarantees a consistent state even in case of a serious error. Cannot monitor directory %x. Cannot monitor directory %x. -Conversion error: -Conversion error: - Cannot delete file %x. Cannot delete file %x. @@ -1487,8 +1487,8 @@ This guarantees a consistent state even in case of a serious error. Cannot create directory %x. Cannot create directory %x. -Cannot create symbolic link %x. -Cannot create symbolic link %x. +Cannot copy symbolic link %x to %y. +Cannot copy symbolic link %x to %y. Cannot find system function %x. Cannot find system function %x. @@ -1571,3 +1571,72 @@ This guarantees a consistent state even in case of a serious error. Configuration file %x loaded partially only. Configuration file %x loaded partially only. +Prepare installation +Prepare installation + +Choose which components you want to install. +Choose which components you want to install. + +Select installation type: +Select installation type: + +Local +Local + +Portable +Portable + +recommended +recommended + +Save settings to "%APPDATA%\FreeFileSync" +Save settings to "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Register FreeFileSync file extensions + +Create Explorer context menu entries +Create Explorer context menu entries + +Save settings in installation directory +Save settings in installation directory + +Do not write to Registry +Do not write to Registry + +Just copy the files +Just copy the files + +Choose a directory for installation: +Choose a directory for installation: + +Create shortcuts: +Create shortcuts: + +Desktop +Desktop + +Start menu +Start menu + +Registering FreeFileSync file extensions +Registering FreeFileSync file extensions + +Unregistering FreeFileSync file extensions +Unregistering FreeFileSync file extensions + +FreeFileSync Configuration +FreeFileSync Configuration + +FreeFileSync Batch File +FreeFileSync Batch File + +FreeFileSync Synchronization Database +FreeFileSync Synchronisation Database + +RealtimeSync Configuration +RealtimeSync Configuration + +Edit with FreeFileSync +Edit with FreeFileSync + diff --git a/FreeFileSync/Build/Languages/finnish.lng b/FreeFileSync/Build/Languages/finnish.lng index b63a903d..e499c8c3 100644 --- a/FreeFileSync/Build/Languages/finnish.lng +++ b/FreeFileSync/Build/Languages/finnish.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Vapaa määrä eri hakemistopareja yhdessä tietyssä määrittelyssä. +Open configuration for edit without executing. +Avaa määrittely muutoksia varten, ei suoriteta. + Cannot find the following folders: Seuraavia hakemistoja ei löydy: @@ -184,11 +187,11 @@ Move file on right Siirrä oikea tiedosto -Overwrite left item -Korvaa vasen kohde +Update left item +Päivitä vasen kohde -Overwrite right item -Korvaa oikea kohde +Update right item +Päivitä oikea kohde Do nothing Älä tee mitään @@ -217,6 +220,9 @@ %x GB %x Gt +Cannot load file %x. +Tiedostoa %x ei voida ladata. + Database file %x is incompatible. Tietokanta %x ei ole yhteensopiva. @@ -268,6 +274,9 @@ Creating file %x Luodaan tiedosto %x +Saving file %x... +Tallennetaan tiedostoa %x... + Items processed: Osioita käsitelty: @@ -295,9 +304,6 @@ %x säijettä -Encoding extended time information: %x -Koodataan laajennettua aikatietoa: %x - /sec /s @@ -319,9 +325,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. Tilannevedoksia varten käytä tässä järjestelmässä FreeFileSync 64-bittistä versiota. -Cannot load file %x. -Tiedostoa %x ei voida ladata. - Cannot determine volume name for %x. Levyn %x tunnistus ei onnistu. @@ -340,7 +343,7 @@ Save &as... Tallenna n&imellä... -&Quit +E&xit &Lopeta &File @@ -435,6 +438,9 @@ Käsky suoritetaan jos: &Show error &Näytä virhe +&Quit +&Lopeta + Incorrect command line: Virheellinen komento: @@ -480,11 +486,11 @@ Käsky suoritetaan jos: Creating folder %x Luodaan hakemisto %x -Overwriting file %x -Korvaa tiedosto %x +Updating file %x +Tiedostoa %x päivitetään -Overwriting symbolic link %x -Korvaa pikakuvake %x +Updating symbolic link %x +Pikakuvitetta %x päivitetään Verifying file %x Tarkistetaan tiedostoa %x @@ -498,21 +504,21 @@ Käsky suoritetaan jos: Data verification error: %x and %y have different content. Tiedon tarkistusvirhe: %x:n ja %y:n sisältö ovat erilaiset. -Cannot find folder %x. -Hakemistoa %x ei löydy. - Target folder %x already existing. Kohdehakemisto %x on jo olemassa. +Cannot find folder %x. +Hakemistoa %x ei löydy. + Target folder input field must not be empty. Kohde hakemiston kenttä on annettava. -Please enter a target folder for versioning. -Anna versioinnin kohdehakemisto. - Source folder %x not found. Lähdehakemistoa %x ei löydy. +Please enter a target folder for versioning. +Anna versioinnin kohdehakemisto. + The following items have unresolved conflicts and will not be synchronized: Näissä kohteissa on selvittämättömiä ristiriitoja, niitä ei täsmäytetä: @@ -555,8 +561,8 @@ Käsky suoritetaan jos: Synchronization completed successfully Täsmäys päättyi onnistuneesti -Saving log file %x... -Tallennetaan lokitiedosto %x... +Cleaning up old log files... +Siivotaan vanhat lokitiedostot.. Stopped Keskeytys @@ -609,8 +615,8 @@ Käsky suoritetaan jos: FreeFileSync is up to date. FreeFileSync on ajan tasalla. -Unable to connect to sourceforge.net. -Sourceforge.nettiin ei saada yhteyttä. +Unable to connect to FreeFileSync.org. +Ei yhteyttä FreeFileSync.org:iin. Cannot find current FreeFileSync version number online. Do you want to check manually? Nykyistä FreeFileSyncin versiota ei löydy verkosta. Suoritetaanko manuaalinen haku? @@ -696,9 +702,21 @@ Käsky suoritetaan jos: Start &comparison Aloita &vertailu +C&omparison settings +&Vertailu asetukset + +&Filter settings +&Suodattin asetukset + +S&ynchronization settings +&Täsmäytyksen asetukset + Start &synchronization Aloita &täsmäytys +&Actions +&Toinnot + &Options &Asetukset @@ -777,8 +795,8 @@ Käsky suoritetaan jos: Number of files and folders that will be deleted Poistettavien tiedostojen ja hakemistojen määrä -Number of files that will be overwritten -Korvattavien tiedostojen ja hakemistojen määrä +Number of files that will be updated +Päitettävien tiedostojen määrä Number of files and folders that will be created Luotavien tiedostojen ja hakemistojen määrä @@ -807,8 +825,14 @@ Käsky suoritetaan jos: Handle daylight saving time Käsittele kesäaika -Symbolic links: -Pikakuvike: +Include symbolic links: +Sisällytä pikalinkit: + +Direct +Suoraan + +Follow +Seuraa More information Lisää tietoa @@ -837,23 +861,23 @@ Käsky suoritetaan jos: Maximum: Enintään: -C&lear -&Nollaa - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Määrittele suodatussäännöt täsmäyksestä pois jätettäville tiedostoille. Anna hakemistopariin nähden suhteellinen osoite. +C&lear +&Nollaa + Detect moved files Tunnista siirretyt tiedostot -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- Vaatii ja luo tarvittavat tietokannat - Tunnistus alkaa ensimmäisestä täsmäyksestä +- Vaatii ja luo tarvittavat tietokannat - Ei toimi kaikissa tiedostojärjestelmissä @@ -1067,27 +1091,15 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. View Settings Näytä asetukset -Overview -Yleiskatsaus - Configuration Asetukset +Overview +Yleiskatsaus + Main Bar Pääpalkki -Start comparison -Aloita vertailu - -Comparison settings -Vertailun asetukset - -Synchronization settings -Täsmäyksen asetukset - -Start synchronization -Käynnistä täsmäys - Confirm Vahvista @@ -1238,11 +1250,11 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. Show files that will be deleted on the right side Näytä oikealta poistettavat tiedostot -Show files that will be overwritten on left side -Näytä vasemmalla korvattavat tiedostot +Show files that will be updated on the left side +Näytä ne tiedostot vasemmalla joita päivitetään -Show files that will be overwritten on right side -Näytä oikealla korvattavat tiedostot +Show files that will be updated on the right side +Näytä ne tiedostot oikealla joita päivitetään Show files that won't be copied Näytä kopioimatta jäävät tiedostot @@ -1379,15 +1391,6 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. Configure your own synchronization rules. Määritä omat täsmäyssäännöt. -Exclude -Sulje pois - -Direct -Suoraan - -Follow -Seuraa - Today Tänään @@ -1451,9 +1454,6 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. Cannot monitor directory %x. Hakemistoa %x ei voida tarkkaila. -Conversion error: -Muunnosvirhe: - Cannot delete file %x. Ei voi poistaa tiedostoa %x. @@ -1487,8 +1487,8 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. Cannot create directory %x. Hakemistoa %x ei voitu luoda. -Cannot create symbolic link %x. -Pikakuvikkeen luonti epäonnistui %x. +Cannot copy symbolic link %x to %y. +Pikakuvike %x - %y kopiointi epäonnistui. Cannot find system function %x. Järjestelmäfunktiota %x ei löydy. @@ -1571,3 +1571,72 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. Configuration file %x loaded partially only. Kokoonpanotiedosto %x ladattu vain osittain. +Prepare installation +Alusta asennus + +Choose which components you want to install. +Valitse asennettavat osiot + +Select installation type: +Valitse asennustapa: + +Local +Paikallinen + +Portable +Siirrettävä + +recommended +suositus + +Save settings to "%APPDATA%\FreeFileSync" +Tallenna asetukset "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Rekisterö FreeFileSync tiedostoliitteet + +Create Explorer context menu entries +Luo merkinnät Explorer-apuvalikoon + +Save settings in installation directory +Tallenna asetukset asennus hakemistoon + +Do not write to Registry +Älä kirjoita rekisteritietoja + +Just copy the files +Kopio vain tiedostot + +Choose a directory for installation: +Valitse asennushakemisto: + +Create shortcuts: +Luodaan pikavalinnat: + +Desktop +Työpöydälle + +Start menu +Käynnistä-valikkoon + +Registering FreeFileSync file extensions +Liitään FreeFileSync tiedostoliitteet + +Unregistering FreeFileSync file extensions +Poistetaan liitos, FreeFileSync tiedostoliite + +FreeFileSync Configuration +FreeFileSync määrittelyt + +FreeFileSync Batch File +FreeFileSync eräajo + +FreeFileSync Synchronization Database +FreeFileSync täsmäytyksen tietokanta + +RealtimeSync Configuration +RealtimeSync määrittelyt + +Edit with FreeFileSync +Muokkaa FreeFileSync:llä + diff --git a/FreeFileSync/Build/Languages/french.lng b/FreeFileSync/Build/Languages/french.lng index 55d7fcdd..46e6adb7 100644 --- a/FreeFileSync/Build/Languages/french.lng +++ b/FreeFileSync/Build/Languages/french.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. N'importe quel nombre de paires de répertoires distincts pour au plus un fichier de configuration +Open configuration for edit without executing. +Ouvrir la configuration pour la modifier sans l'exécuter + Cannot find the following folders: Impossible de trouver les dossiers suivants : @@ -184,11 +187,11 @@ Move file on right Déplacer les fichiers à droite -Overwrite left item -Remplacement de l'élément de gauche +Update left item +Mettre à jour l'élément de gauche -Overwrite right item -Remplacement de l'élément de droite +Update right item +Mettre à jour l'élément de droite Do nothing Ne rien faire @@ -217,6 +220,9 @@ %x GB %x Go +Cannot load file %x. +Impossible de charger le fichier %x. + Database file %x is incompatible. La base de données %x n'est pas compatible. @@ -268,6 +274,9 @@ Creating file %x Création du fichier %x +Saving file %x... +Enregistrement du fichier %x... + Items processed: Élements traités : @@ -295,9 +304,6 @@ %x tâches -Encoding extended time information: %x -Codage de l'heure au format étendu : %x - /sec /sec @@ -319,9 +325,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. Utilisez la version FreeFileSync 64-bit pour créer des "shadow copies" sur ce système. -Cannot load file %x. -Impossible de charger le fichier %x. - Cannot determine volume name for %x. Impossible de déterminer le nom du volume de %x. @@ -340,7 +343,7 @@ Save &as... S&auvegarder sous... -&Quit +E&xit &Quitter &File @@ -435,6 +438,9 @@ La commande est déclenchée si : &Show error &Afficher l'erreur +&Quit +&Quitter + Incorrect command line: Ligne de commande incorrecte : @@ -480,11 +486,11 @@ La commande est déclenchée si : Creating folder %x Création du dossier %x -Overwriting file %x -Remplacement du fichier %x +Updating file %x +Mise à jour du fichier %x -Overwriting symbolic link %x -Remplacement du lien symbolique %x +Updating symbolic link %x +Mise à jour du lien symbolique %x Verifying file %x Contrôle du fichier %x @@ -498,21 +504,21 @@ La commande est déclenchée si : Data verification error: %x and %y have different content. Erreur lors de la vérification des données : %x et %y ont des contenus différents. -Cannot find folder %x. -Dossier %x introuvable. - Target folder %x already existing. Le dossier destination %x existe déjà. +Cannot find folder %x. +Dossier %x introuvable. + Target folder input field must not be empty. L'entrée dossier de destination ne doit pas être vide. -Please enter a target folder for versioning. -Veuillez entrer le dossier destinataire pour la gestion des versions. - Source folder %x not found. Dossier source %x non trouvé. +Please enter a target folder for versioning. +Veuillez entrer le dossier destinataire pour la gestion des versions. + The following items have unresolved conflicts and will not be synchronized: Les éléments suivants sont en conflit non résolu et ne seront pas synchronisés : @@ -555,8 +561,8 @@ La commande est déclenchée si : Synchronization completed successfully Synchronisation terminée sans erreurs -Saving log file %x... -Enregistrement du fichier log %x... +Cleaning up old log files... +Nettoyage des anciens fichiers log ... Stopped Arrêté @@ -609,8 +615,8 @@ La commande est déclenchée si : FreeFileSync is up to date. FreeFileSync est à jour. -Unable to connect to sourceforge.net. -Impossible de se connecter à sourceforge.net. +Unable to connect to FreeFileSync.org. +Impossible de se connecter à FreeFileSync.org Cannot find current FreeFileSync version number online. Do you want to check manually? Impossible de trouver en ligne une nouvelle version de FreeFileSync.Voulez-vous le faire manuellement ? @@ -696,9 +702,21 @@ La commande est déclenchée si : Start &comparison Démarrer la &comparaison +C&omparison settings +Paramètres de C&omparaison + +&Filter settings +Paramètres de &Filtrage + +S&ynchronization settings +Paramètres de S&ynchronisation + Start &synchronization Démarrer la &synchronisation +&Actions +&Actions + &Options &Options @@ -763,7 +781,7 @@ La commande est déclenchée si : Sauvegarder Save as... -Enregistrer en tant que... +Sauvegarder sous... View type: Type de vue : @@ -777,8 +795,8 @@ La commande est déclenchée si : Number of files and folders that will be deleted Nombre de fichiers et de dossiers qui seront supprimés -Number of files that will be overwritten -Nombre de fichiers qui seront remplacés +Number of files that will be updated +Nombre de fichiers à mettre à jour Number of files and folders that will be created Nombre de fichiers et de dossiers qui seront créés @@ -807,8 +825,14 @@ La commande est déclenchée si : Handle daylight saving time Gérer l'heure d'été -Symbolic links: -Liens symboliques +Include symbolic links: +Inclure les liens symboliques : + +Direct +Direct + +Follow +Suivre More information Plus d'informations @@ -837,24 +861,24 @@ La commande est déclenchée si : Maximum: Maximum : -C&lear -&Effacer - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Sélectionnez les règles de filtrage pour exclure certains fichiers de la synchronisation. Entrez les chemins des fichiers par rapport à leur paire de dossiers. +C&lear +&Effacer + Detect moved files Détection des fichiers déplacés -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- Nécessite et crée les fichiers de la base de données - Détection active après la synchronisation initiale -- Non supporté par tout les fichiers système +- Nécessite et crée les fichiers de la base de données +- Non supporté par tous les systèmes de fichiers Detect synchronization directions with the help of database files @@ -1067,27 +1091,15 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. View Settings Configuration de la vue -Overview -Aperçu - Configuration Configuration +Overview +Aperçu + Main Bar Barre Principale -Start comparison -Démarrer la comparaison - -Comparison settings -Paramètres de comparaison - -Synchronization settings -Paramétrage de la synchronisation - -Start synchronization -Démarrer la synchronisation - Confirm Confirmer @@ -1238,11 +1250,11 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. Show files that will be deleted on the right side Afficher les fichiers qui seront supprimés à droite -Show files that will be overwritten on left side -Afficher les fichiers qui seront écrasés à gauche +Show files that will be updated on the left side +Affiche les fichiers à mettre à jour côté gauche -Show files that will be overwritten on right side -Afficher les fichiers qui seront écrasés à droite +Show files that will be updated on the right side +Affiche les fichiers à mettre à jour côté droit Show files that won't be copied Afficher les fichiers qui ne seront pas copiés @@ -1379,15 +1391,6 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. Configure your own synchronization rules. Paramétrage de vos règles de synchronisation. -Exclude -Exclure - -Direct -Direct - -Follow -Suivre - Today Aujourd'hui @@ -1451,9 +1454,6 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. Cannot monitor directory %x. Impossible de gérer le répertoire %x. -Conversion error: -Erreur de conversion : - Cannot delete file %x. Impossible de supprimer le fichier %x. @@ -1487,8 +1487,8 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. Cannot create directory %x. Impossible de créer le répertoire %x. -Cannot create symbolic link %x. -Impossible de créer le lien symbolique %x. +Cannot copy symbolic link %x to %y. +Impossible de copier le lien symbolique %x vers %y. Cannot find system function %x. Impossible de trouver la fonction système %x. @@ -1571,3 +1571,72 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. Configuration file %x loaded partially only. Le fichier de configuration %x a été chargé seulement partiellement. +Prepare installation +Préparation de l'installation + +Choose which components you want to install. +Sélectionnez les composants que vous voulez installer. + +Select installation type: +Choisir le type d'installation : + +Local +Locale + +Portable +Portable + +recommended +recommandée + +Save settings to "%APPDATA%\FreeFileSync" +Enregistrer la configuration dans "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Enregistrer les extensions de fichier + +Create Explorer context menu entries +Créer les entrées du menu contextuel de l'Explorateur + +Save settings in installation directory +Sauvegarder la configuration dans le répertoire d'installation + +Do not write to Registry +Ne pas modifier la base des registres + +Just copy the files +Copier seulement les fichiers + +Choose a directory for installation: +Choisir le répertoire d'installation : + +Create shortcuts: +Création de raccourcis sur : + +Desktop +le Bureau + +Start menu +le menu Démarrer + +Registering FreeFileSync file extensions +Enregistrement des extensions de fichier + +Unregistering FreeFileSync file extensions +Suppression des extensions de fichier + +FreeFileSync Configuration +Configuration de FreeFileSync + +FreeFileSync Batch File +Fichiers batch de FreeFileSync + +FreeFileSync Synchronization Database +Base de données de synchronisation de FreeFileSync + +RealtimeSync Configuration +Configuration de RealtimeSync + +Edit with FreeFileSync +Modification avec FreeFileSync + diff --git a/FreeFileSync/Build/Languages/german.lng b/FreeFileSync/Build/Languages/german.lng index 55c249eb..ac9e37ed 100644 --- a/FreeFileSync/Build/Languages/german.lng +++ b/FreeFileSync/Build/Languages/german.lng @@ -7,15 +7,6 @@ n == 1 ? 0 : 1 -Cannot copy symbolic link %x to %y. -Der Symbolische Link %x kann nicht nach %y kopiert werden. - -Unable to connect to freefilesync.org. -Es kann keine Verbindung zu freefilesync.org aufgebaut werden. - -Open configuration for edit without executing. -Konfiguration zum Editieren öffnen ohne auszuführen. - Both sides have changed since last synchronization. Beide Seiten wurden seit der letzten Synchronisation verändert. @@ -41,7 +32,7 @@ Verschiebe Ordner %x in den Papierkorb Moving symbolic link %x to the recycle bin -Verschiebe Symbolischen Link %x in den Papierkorb +Verschiebe symbolische Verknüpfung %x in den Papierkorb Deleting file %x Lösche Datei %x @@ -50,7 +41,7 @@ Lösche Ordner %x Deleting symbolic link %x -Lösche Symbolischen Link %x +Lösche symbolische Verknüpfung %x The recycle bin is not available for the following folders. Files will be deleted permanently instead: Der Papierkorb ist für die folgenden Ordner nicht verfügbar. Dateien werden stattdessen permanent gelöscht: @@ -103,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Beliebige Anzahl von alternativen Verzeichnispaaren für maximal eine Konfigurationsdatei. +Open configuration for edit without executing. +Konfiguration zum Editieren öffnen ohne auszuführen. + Cannot find the following folders: Die folgenden Ordner wurden nicht gefunden: @@ -137,7 +131,7 @@ Die Elemente unterscheiden sich nur in Attributen Resolving symbolic link %x -Folge dem Symbolischen Link %x +Folge der symbolischen Verknüpfung %x Comparing content of files %x Vergleiche Inhalt der Dateien %x @@ -193,11 +187,11 @@ Move file on right Verschiebe rechte Datei -Overwrite left item -Überschreibe linkes Element +Update left item +Aktualisiere linkes Element -Overwrite right item -Überschreibe rechtes Element +Update right item +Aktualisiere rechtes Element Do nothing Nichts tun @@ -280,8 +274,8 @@ Creating file %x Erstelle Datei %x -Saving log file %x... -Speichere Protokolldatei %x... +Saving file %x... +Speichere Datei %x... Items processed: Verarbeitete Elemente: @@ -349,7 +343,7 @@ Save &as... Speichern &unter... -&Quit +E&xit &Beenden &File @@ -444,6 +438,9 @@ Die Befehlszeile wird ausgelöst, wenn: &Show error &Zeige Fehler +&Quit +&Beenden + Incorrect command line: Ungültige Befehlszeile: @@ -478,22 +475,22 @@ Die Befehlszeile wird ausgelöst, wenn: Verschiebe Ordner %x nach %y Moving symbolic link %x to %y -Verschiebe Symbolischen Link %x nach %y +Verschiebe symbolische Verknüpfung %x nach %y Removing old versions... Entferne alte Versionen... Creating symbolic link %x -Erstelle Symbolischen Link %x +Erstelle symbolischen Verknüpfung %x Creating folder %x Erstelle Ordner %x -Overwriting file %x -Überschreibe Datei %x +Updating file %x +Aktualisiere Datei %x -Overwriting symbolic link %x -Überschreibe Symbolischen Link %x +Updating symbolic link %x +Aktualisiere symbolischen Verknüpfung %x Verifying file %x Verifiziere Datei %x @@ -564,6 +561,9 @@ Die Befehlszeile wird ausgelöst, wenn: Synchronization completed successfully Synchronisation erfolgreich abgeschlossen +Cleaning up old log files... +Bereinige alte Protokolldateien... + Stopped Unterbrochen @@ -615,6 +615,9 @@ Die Befehlszeile wird ausgelöst, wenn: FreeFileSync is up to date. FreeFileSync ist auf dem neuesten Stand. +Unable to connect to FreeFileSync.org. +Es kann keine Verbindung zu FreeFileSync.org aufgebaut werden. + Cannot find current FreeFileSync version number online. Do you want to check manually? Die aktuelle FreeFileSync Versionsnummer wurde online nicht gefunden. Möchten Sie manuell prüfen? @@ -699,9 +702,21 @@ Die Befehlszeile wird ausgelöst, wenn: Start &comparison &Vergleich starten +C&omparison settings +V&ergleichseinstellungen + +&Filter settings +&Filtereinstellungen + +S&ynchronization settings +S&ynchronisationseinstellungen + Start &synchronization &Synchronisation starten +&Actions +&Aktionen + &Options &Optionen @@ -780,8 +795,8 @@ Die Befehlszeile wird ausgelöst, wenn: Number of files and folders that will be deleted Anzahl der zu löschenden Dateien und Ordner -Number of files that will be overwritten -Anzahl der zu überschreibenden Dateien +Number of files that will be updated +Anzahl der zu aktualisierenden Dateien Number of files and folders that will be created Anzahl der zu erstellenden Dateien und Ordner @@ -810,8 +825,14 @@ Die Befehlszeile wird ausgelöst, wenn: Handle daylight saving time Sommerzeit berücksichtigen -Symbolic links: -Symbolische Links: +Include symbolic links: +Symbolische Verknüpfungen einschließen: + +Direct +Direkt + +Follow +Folgen More information Mehr Information @@ -1059,7 +1080,7 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. Zeitspanne auswählen &Preferences... -&Einstellungen +&Einstellungen... Folder Pairs Ordnerpaare @@ -1079,18 +1100,6 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. Main Bar Hauptleiste -Start comparison -Vergleich starten - -Comparison settings -Vergleichseinstellungen - -Synchronization settings -Synchronisationseinstellungen - -Start synchronization -Synchronisation starten - Confirm Bestätigen @@ -1230,25 +1239,25 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. Konflikte zeigen Show files that will be created on the left side -Dateien die links erstellt werden anzeigen +Dateien zeigen, die links erstellt werden Show files that will be created on the right side -Dateien die rechts erstellt werden anzeigen +Dateien zeigen, die rechts erstellt werden Show files that will be deleted on the left side -Dateien die links gelöscht werden anzeigen +Dateien zeigen, die links gelöscht werden Show files that will be deleted on the right side -Dateien die rechts gelöscht werden anzeigen +Dateien zeigen, die rechts gelöscht werden -Show files that will be overwritten on left side -Dateien die links überschrieben werden anzeigen +Show files that will be updated on the left side +Dateien zeigen, die links aktualisiert werden -Show files that will be overwritten on right side -Dateien die rechts überschrieben werden anzeigen +Show files that will be updated on the right side +Dateien zeigen, die rechts aktualisiert werden Show files that won't be copied -Dateien die nicht kopiert werden anzeigen +Dateien zeigen, die nicht kopiert werden Show filtered or temporarily excluded files Gefilterte oder temporär ausgeschlossene Dateien zeigen @@ -1382,15 +1391,6 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. Configure your own synchronization rules. Eigene Synchronisationsregeln definieren. -Exclude -Ausschließen - -Direct -Direkt - -Follow -Folgen - Today Heute @@ -1487,6 +1487,9 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. Cannot create directory %x. Das Verzeichnis %x kann nicht erstellt werden. +Cannot copy symbolic link %x to %y. +Die symbolische Verknüpfung %x kann nicht nach %y kopiert werden. + Cannot find system function %x. Die Systemfunktion %x wurde nicht gefunden. @@ -1497,7 +1500,7 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. Der Typ des Elements %x wird nicht unterstützt: Cannot resolve symbolic link %x. -Der Symbolische Link %x kann nicht aufgelöst werden. +Die symbolische Verknüpfung %x kann nicht aufgelöst werden. Cannot open directory %x. Das Verzeichnis %x kann nicht geöffnet werden. @@ -1568,3 +1571,72 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. Configuration file %x loaded partially only. Die Konfigurationsdatei %x wurde nur teilweise geladen. +Prepare installation +Installation vorbereiten + +Choose which components you want to install. +Wählen Sie die zu installierenden Komponenten. + +Select installation type: +Installationstyp wählen: + +Local +Lokal + +Portable +Portabel + +recommended +empfohlen + +Save settings to "%APPDATA%\FreeFileSync" +Einstellungen unter "%APPDATA%\FreeFileSync" sichern + +Register FreeFileSync file extensions +FreeFileSync Dateiendungen registrieren + +Create Explorer context menu entries +Einträge im Explorer Kontextmenü erstellen + +Save settings in installation directory +Einstellungen im Installationsverzeichnis sichern + +Do not write to Registry +Kein Eintrag in Windows Registrierung + +Just copy the files +Nur die Dateien kopieren + +Choose a directory for installation: +Wählen Sie ein Verzeichnis für die Installation: + +Create shortcuts: +Verknüpfungen erstellen: + +Desktop +Desktop + +Start menu +Startmenü + +Registering FreeFileSync file extensions +Registriere FreeFileSync Dateiendungen + +Unregistering FreeFileSync file extensions +Deregistriere FreeFileSync Dateiendungen + +FreeFileSync Configuration +FreeFileSync Konfiguration + +FreeFileSync Batch File +FreeFileSync Batchdatei + +FreeFileSync Synchronization Database +FreeFileSync Synchronisationsdatenbank + +RealtimeSync Configuration +RealtimeSync Konfiguration + +Edit with FreeFileSync +Mit FreeFileSync editieren + diff --git a/FreeFileSync/Build/Languages/greek.lng b/FreeFileSync/Build/Languages/greek.lng index 1cf3b13c..6fb8ba84 100644 --- a/FreeFileSync/Build/Languages/greek.lng +++ b/FreeFileSync/Build/Languages/greek.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Οποιοσδήποτε αριθμός από εναλλακτικά ζεύγη υποκαταλόγων για το πολύ ένα αρχείο ρυθμίσεων. +Open configuration for edit without executing. +Άνοιγμα των ρυθμίσεων προς επεξεργασία χωρίς εκτέλεση. + Cannot find the following folders: Οι ακόλουθοι υποκατάλογοι δεν ήταν δυνατό να βρεθούν: @@ -184,11 +187,11 @@ Move file on right Μεταφορά του αρχείου που βρίσκεται δεξιά -Overwrite left item -Αντικατάσταση του στοιχείου που βρίσκεται στα αριστερά +Update left item +Ενημέρωση του στοιχείου που βρίσκεται αριστερά -Overwrite right item -Αντικατάσταση του στοιχείου που βρίσκεται στα δεξιά +Update right item +Ενημέρωση του στοιχείου που βρίσκεται δεξιά Do nothing Καμία ενέργεια @@ -217,6 +220,9 @@ %x GB %x GB +Cannot load file %x. +Το αρχείο %x δεν ήταν δυνατόν να φορτωθεί. + Database file %x is incompatible. Το αρχείο βάσης δεδομένων %x δεν είναι συμβατό @@ -268,6 +274,9 @@ Creating file %x Δημιουργία του αρχείου %x +Saving file %x... +Αποθήκευση του αρχείου %x... + Items processed: Επεξεργάστηκαν στοιχεία: @@ -295,9 +304,6 @@ %x νήματα -Encoding extended time information: %x -Κωδικοποίηση εκτεταμένων πληροφοριών για την ώρα: %x - /sec /δευτερόλεπτο @@ -319,9 +325,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. Χρησιμοποιήστε την 64-μπιτη έκδοση του FreeFileSync για να δημιουργήσετε σκιώδη αντίγραφα σε αυτόν τον υπολογιστή. -Cannot load file %x. -Το αρχείο %x δεν ήταν δυνατόν να φορτωθεί. - Cannot determine volume name for %x. Δεν μπορεί να προσδιοριστεί το όνομα τόμου για το %x. @@ -340,7 +343,7 @@ Save &as... Αποθήκευση &ως... -&Quit +E&xit Έ&ξοδος &File @@ -435,6 +438,9 @@ The command is triggered if: &Show error &Εμφάνιση σφάλματος +&Quit +Έ&ξοδος + Incorrect command line: Εσφαλμένη γραμμή εντολών: @@ -480,11 +486,11 @@ The command is triggered if: Creating folder %x Δημιουργία του υποκαταλόγου %x -Overwriting file %x -Αντικατάσταση του αρχείου %x +Updating file %x +Ενημέρωση του αρχείου %x -Overwriting symbolic link %x -Αντικατάσταση του συμβολικού δεσμού %x +Updating symbolic link %x +Ενημέρωση του συμβολικού δεσμού %x Verifying file %x Επικύρωση του αρχείου %x @@ -498,21 +504,21 @@ The command is triggered if: Data verification error: %x and %y have different content. Σφάλμα επαλήθευσης δεδομένων: το %x και το %y έχουν διαφορετικό περιεχόμενο. -Cannot find folder %x. -Ο υποκατάλογος %x δεν μπορεί να βρεθεί. - Target folder %x already existing. Ο υποκατάλογος-στόχος %x υπάρχει ήδη. +Cannot find folder %x. +Ο υποκατάλογος %x δεν μπορεί να βρεθεί. + Target folder input field must not be empty. Το πεδίο εισαγωγής του υποκαταλόγου-στόχου πρέπει να μην είναι κενό. -Please enter a target folder for versioning. -Παρακαλώ εισάγετε έναν υποκατάλογο για αποθήκευση εκδόσεων. - Source folder %x not found. Ο υποκατάλογος %x δε βρέθηκε. +Please enter a target folder for versioning. +Παρακαλώ εισάγετε έναν υποκατάλογο για αποθήκευση εκδόσεων. + The following items have unresolved conflicts and will not be synchronized: Τα ακόλουθα στοιχεία έχουν ανεπίλυτες διενέξεις και δε θα συγχρονιστούν: @@ -555,8 +561,8 @@ The command is triggered if: Synchronization completed successfully Ο συγχρονισμός ολοκληρώθηκε επιτυχώς -Saving log file %x... -Αποθήκευση του αρχείου καταγραφής %x... +Cleaning up old log files... +Καθαρισμός των παλιών αρχείων καταγραφής... Stopped Διεκόπη @@ -609,8 +615,8 @@ The command is triggered if: FreeFileSync is up to date. Το FreeFileSync είναι ενημερωμένο. -Unable to connect to sourceforge.net. -Δεν είναι δυνατή η σύνδεση με το sourceforge.net. +Unable to connect to FreeFileSync.org. +Αδυναμία επικοινωνίας με το FreeFileSync.org. Cannot find current FreeFileSync version number online. Do you want to check manually? Ο αριθμός της τρέχουσας έκδοσης του FreeFileSync δεν βρέθηκε στο δίκτυο. Θέλετε να το ελέγξετε εσείς; @@ -694,10 +700,22 @@ The command is triggered if: Αποθήκευση ως δέσ&μη ενεργειών... Start &comparison -Έναρξη &σύγκρισης +Έ&ναρξη σύγκρισης + +C&omparison settings +Ρυθμίσεις &σύγκρισης + +&Filter settings +Ρυθμίσεις &φίλτρων + +S&ynchronization settings +Ρυθμίσεις σ&υγχρονισμού Start &synchronization -Έναρξη συγχρο&νισμού +Έναρ&ξη συγχρονισμού + +&Actions +Ε&νέργειες &Options &Επιλογές @@ -777,8 +795,8 @@ The command is triggered if: Number of files and folders that will be deleted Αριθμός αρχείων και υποκαταλόγων που θα διαγραφούν -Number of files that will be overwritten -Αριθμός αρχείων και υποκαταλόγων που θα αντικατασταθούν +Number of files that will be updated +Αριθμός αρχείων που θα ενημερωθούν Number of files and folders that will be created Αριθμός αρχείων και υποκαταλόγων που θα δημιουργηθούν @@ -807,8 +825,14 @@ The command is triggered if: Handle daylight saving time Διαχείριση θερινής ώρας -Symbolic links: -Συμβολικοί δεσμοί: +Include symbolic links: +Συμπερίληψη των συμβολικών δεσμών: + +Direct +Ως δεσμοί + +Follow +Ως περιεχόμενο More information Περισσότερες πληροφορίες @@ -837,23 +861,23 @@ The command is triggered if: Maximum: Μέγιστο -C&lear -&Καθαρισμός - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Επιλογή κανόνων φιλτραρίσματος, ώστε να αποκλειστούν ορισμένα αρχεία από το συγχρονισμό. Εισάγετε τις διαδρομές των αρχείων σχετικά με το αντίστοιχο ζεύγος υποκαταλόγων. +C&lear +&Καθαρισμός + Detect moved files Ανίχνευση των αρχείων που μεταφέρθηκαν -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- Απαιτεί και δημιουργεί αρχεία-βάσεις δεδομένων -- Η ανίχνευση είναι ενεργή μετά τον αρχικό συγχρονισμό +- Η ανίχνευση είναι ενεργή μετά από τον αρχικό συγχρονισμό +- Απαιτεί και δημιουργεί αρχεία βάσεων δεδομένων - Δεν υποστηρίζεται από όλα τα συστήματα αρχείων @@ -1067,27 +1091,15 @@ This guarantees a consistent state even in case of a serious error. View Settings Προβολή Ρυθμίσεων -Overview -Σύνοψη - Configuration Διάταξη +Overview +Σύνοψη + Main Bar Κύρια Γραμμή -Start comparison -Έναρξη σύγκρισης - -Comparison settings -Ρυθμίσεις σύγκρισης - -Synchronization settings -Ρυθμίσεις συγχρονισμού - -Start synchronization -Έναρξη του συγχρονισμού - Confirm Επιβεβαίωση @@ -1238,11 +1250,11 @@ This guarantees a consistent state even in case of a serious error. Show files that will be deleted on the right side Εμφάνιση των αρχείων που θα διαγραφούν στα δεξιά -Show files that will be overwritten on left side -Εμφάνιση των αρχείων που θα αντικατασταθούν στα αριστερά +Show files that will be updated on the left side +Εμφάνιση των αρχείων που θα ενημερωθούν στα αριστερά -Show files that will be overwritten on right side -Εμφάνιση των αρχείων που θα αντικατασταθούν στα αριστερά +Show files that will be updated on the right side +Εμφάνιση των αρχείων που θα ενημερωθούν στα δεξιά Show files that won't be copied Εμφάνιση των αρχείων που δε θα αντιγραφούν @@ -1379,15 +1391,6 @@ This guarantees a consistent state even in case of a serious error. Configure your own synchronization rules. Ορίστε τους δικούς σας κανόνες συγχρονισμού. -Exclude -Εξαίρεση - -Direct -Ως δεσμοί - -Follow -Ως περιεχόμενο - Today Σήμερα @@ -1451,9 +1454,6 @@ This guarantees a consistent state even in case of a serious error. Cannot monitor directory %x. Δεν είναι δυνατή η παρακολύθηση του υποκαταλόγου %x. -Conversion error: -Σφάλμα μετατροπής: - Cannot delete file %x. Δεν μπορεί να διαγραφεί το αρχείο %x. @@ -1487,8 +1487,8 @@ This guarantees a consistent state even in case of a serious error. Cannot create directory %x. Δεν μπορεί να δημιουργηθεί ο υποκατάλογος %x. -Cannot create symbolic link %x. -Ο συμβολικός δεσμός %x δεν μπορεί να δημιουργηθεί. +Cannot copy symbolic link %x to %y. +Αδυναμία αντιγραφής του συμβολικού δεσμού %x στο %y. Cannot find system function %x. Δεν ανευρίσκεται η λειτουργία συστήματος %x. @@ -1571,3 +1571,72 @@ This guarantees a consistent state even in case of a serious error. Configuration file %x loaded partially only. Το αρχείο διάταξης %x έχει φορτωθεί μόνο κατά ένα μέρος. +Prepare installation +Προετοιμασία εγκατάστασης + +Choose which components you want to install. +Επιλέξτε ποια στοιχεία θέλετε να εγκαταστήσετε + +Select installation type: +Επιλογή τύπου εγκατάστασης: + +Local +Τοπική + +Portable +Φορητή + +recommended +συνιστώμενη + +Save settings to "%APPDATA%\FreeFileSync" +Αποθήκευση ρυθμίσεων στο "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Καταχώρηση των επεκτάσεων των αρχείων του FreeFileSync + +Create Explorer context menu entries +Δημιουργία καταχωρήσεων στο μενού περιβάλλοντος του Explorer + +Save settings in installation directory +Αποθήκευση των ρυθμίσεων στον υποκατάλογο εγκατάστασης + +Do not write to Registry +Χωρίς εγγραφές στο Μητρώο + +Just copy the files +Απλή αντιγραφή των αρχείων + +Choose a directory for installation: +Επιλέξτε έναν υποκατάλογο για εγκατάσταση: + +Create shortcuts: +Δημιουργία συντομεύσεων: + +Desktop +Επιφάνεια εργασίας + +Start menu +Μενού έναρξης + +Registering FreeFileSync file extensions +Καταχώρηση των επεκτάσεων των αρχείων του FreeFileSync + +Unregistering FreeFileSync file extensions +Αναίρεση της καταχώρησης των επεκτάσεων των αρχείων του FreeFileSync + +FreeFileSync Configuration +Ρυθμίσεις του FreeFileSync + +FreeFileSync Batch File +Δέσμη Ενεργειών του FreeFileSync + +FreeFileSync Synchronization Database +Βάση Δεδομένων Συγχρονισμού του FreeFileSync + +RealtimeSync Configuration +Ρυθμίσεις του RealtimeSync + +Edit with FreeFileSync +Επεξεργασία με FreeFileSync + diff --git a/FreeFileSync/Build/Languages/hebrew.lng b/FreeFileSync/Build/Languages/hebrew.lng index df907e40..51465750 100644 --- a/FreeFileSync/Build/Languages/hebrew.lng +++ b/FreeFileSync/Build/Languages/hebrew.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. כל כמות של זוגות מחיצות אלטרנטיביות עבור קובץ תצורה אחד לפחות. +Open configuration for edit without executing. +פתח תצורה לעריכה ללא ביצוע. + Cannot find the following folders: לא יכול למצוא את המחיצות הבאות: @@ -184,11 +187,11 @@ Move file on right העבר קובץ בצד שמאל -Overwrite left item -רשום על גבי פריט בצד ימין +Update left item +עדכן פריט בצד שמאל -Overwrite right item -רשום על גבי פריט בצד שמאל +Update right item +עדכן פריט בצד ימין Do nothing אל תעשה כלום @@ -217,6 +220,9 @@ %x GB %x גיגה בייט +Cannot load file %x. +לא יכול לטעון קובץ %x. + Database file %x is incompatible. קובץ מסד נתונים %x אינו במבנה מתאים. @@ -268,6 +274,9 @@ Creating file %x יוצר קובץ %x +Saving file %x... +שומר קובץ %x... + Items processed: אלמנטים עובדו: @@ -295,9 +304,6 @@ %x תהליכים -Encoding extended time information: %x -מקודד אינפורמצית זמן מורחבת: %x - /sec /שנ @@ -319,9 +325,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. אנא השתמש בגירסת 64-bit של FreeFileSync על מנת ליצר shadow copies במערכת הפעלה זו. -Cannot load file %x. -לא יכול לטעון קובץ %x. - Cannot determine volume name for %x. לא יכול לקבוע שם אמצעי אחסון %x. @@ -340,8 +343,8 @@ Save &as... שמור &בשם... -&Quit -&יציאה +E&xit +י&ציאה &File &קובץ @@ -435,6 +438,9 @@ The command is triggered if: &Show error &הראה שגיאה +&Quit +&יציאה + Incorrect command line: שורת פקודה לא תקינה: @@ -480,11 +486,11 @@ The command is triggered if: Creating folder %x יוצר מחיצה %x -Overwriting file %x -דורס קובץ %x +Updating file %x +מעדכן קובץ %x -Overwriting symbolic link %x -דורס קישור סימבולי %x +Updating symbolic link %x +מעדכן קישור סימבולי %x Verifying file %x מאמת קובץ %x @@ -498,21 +504,21 @@ The command is triggered if: Data verification error: %x and %y have different content. שגיאת אימות נתונים. ל %x ו %y יש תוכן שונה. -Cannot find folder %x. -לא מוצא תיקייה %x. - Target folder %x already existing. תיקיית מטרה %x כבר קיימת. +Cannot find folder %x. +לא מוצא תיקייה %x. + Target folder input field must not be empty. קלט תיקיית מטרה אינה יכול להיות ריק. -Please enter a target folder for versioning. -בבקשה הזן תיקיית יעד עבור גרסאות. - Source folder %x not found. תיקיית מקור %x לא נמצאת. +Please enter a target folder for versioning. +בבקשה הזן תיקיית יעד עבור גרסאות. + The following items have unresolved conflicts and will not be synchronized: לפריטים הבאים יש קונפליקטים בלתי פתורים והם לא יסונכרנו: @@ -555,8 +561,8 @@ The command is triggered if: Synchronization completed successfully סנכרון הסתיים בהצלחה -Saving log file %x... -שומר קובץ יומן %x... +Cleaning up old log files... +מנקה קבצי יומן ישנים... Stopped נעצר @@ -609,8 +615,8 @@ The command is triggered if: FreeFileSync is up to date. FreeFileSync מעודכן לגירסה האחרונה. -Unable to connect to sourceforge.net. -אין תקשורת ל sourceforge.net. +Unable to connect to FreeFileSync.org. +אין תקשורת אל FreeFileSync.org Cannot find current FreeFileSync version number online. Do you want to check manually? לא מוצא מספר גירסה עדכנית של FreeFileSync באופן מכוון. האם אתה רוצה לבדוק באופן ידני? @@ -696,9 +702,21 @@ The command is triggered if: Start &comparison התחל &והשווה +C&omparison settings +הגדרות ה&שוואה + +&Filter settings +הגדרות ס&ינון + +S&ynchronization settings +הגדרות סינכ&רון + Start &synchronization התחל &וסנכרן +&Actions +&פעולות + &Options &אפשרויות @@ -777,8 +795,8 @@ The command is triggered if: Number of files and folders that will be deleted מספר הקבצים והתיקיות שימחקו -Number of files that will be overwritten -מספר הקבצים העומדים להיכתב מחדש +Number of files that will be updated +מספר הקבצים העומדים להתעדכן Number of files and folders that will be created מספר הקבצים והתיקיות שייוצרו @@ -807,8 +825,14 @@ The command is triggered if: Handle daylight saving time התמודד עם שעון קיץ -Symbolic links: -קישורים סימבוליים: +Include symbolic links: +כלול קישורים סימבוליים: + +Direct +כוון + +Follow +עקוב More information מידע נוסף @@ -837,23 +861,23 @@ The command is triggered if: Maximum: מקסימום: -C&lear -א&פס - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. בחר כללי סינון כדי לא לכלול קבצים מסוימים בסנכרון. הזן את נתיבי הקבצים ביחס לזוג התיקיות בהתאמה. +C&lear +א&פס + Detect moved files גלה קבצים מועברים -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- דורש ויוצר קבצי בסיס נתונים - גילוי פעיל לאחר סינכרון ראשוני +- דורש ויוצר קבצי בסיס נתונים - לא נתמך ע"י כל מערכות הקבצים @@ -1067,27 +1091,15 @@ This guarantees a consistent state even in case of a serious error. View Settings הגדרות תצוגה -Overview -מבט כללי - Configuration תצורה +Overview +מבט כללי + Main Bar סרגל ראשי -Start comparison -התחל השוואה - -Comparison settings -הגדרות השוואה - -Synchronization settings -הגדרות סנכרון - -Start synchronization -התחל סנכרון - Confirm אשר @@ -1238,11 +1250,11 @@ This guarantees a consistent state even in case of a serious error. Show files that will be deleted on the right side הראה קבצים שימחקו בצד שמאל -Show files that will be overwritten on left side -הראה קבצים שידרסו בצד ימין +Show files that will be updated on the left side +הראה קבצים שיעטדכנו בצד שמאל -Show files that will be overwritten on right side -הראה קבצים שידרסו בצד שמאל +Show files that will be updated on the right side +הראה קבצים שיעודכנו בצד ימין Show files that won't be copied הראה קבצים שלא יועתקו @@ -1379,15 +1391,6 @@ This guarantees a consistent state even in case of a serious error. Configure your own synchronization rules. סדר את כללי הסנכרון שלך. -Exclude -אל תכלול - -Direct -כוון - -Follow -עקוב - Today היום @@ -1451,9 +1454,6 @@ This guarantees a consistent state even in case of a serious error. Cannot monitor directory %x. לא יכול לנטר מחיצה %x. -Conversion error: -שגיאה בהסבה: - Cannot delete file %x. לא יכול למחוק קובץ %x. @@ -1487,8 +1487,8 @@ This guarantees a consistent state even in case of a serious error. Cannot create directory %x. לא יכול ליצור מחיצה %x. -Cannot create symbolic link %x. -לא יכול ליצור קישור סימבולי %x. +Cannot copy symbolic link %x to %y. +לא יכול להעתיק קישור סימבולי %x אל %y. Cannot find system function %x. לא יכול למצוא פונקצית מערכת %x. @@ -1571,3 +1571,72 @@ This guarantees a consistent state even in case of a serious error. Configuration file %x loaded partially only. קובץ תצורה %x נטען חלקית בלבד. +Prepare installation +מכין התקנה + +Choose which components you want to install. +בחר אילו מרכיבים ברצונך להתקין. + +Select installation type: +בחר סוג התקנה: + +Local +מקומי + +Portable +נייד + +recommended +מומלץ + +Save settings to "%APPDATA%\FreeFileSync" +שמור נתונים ל "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +רושם סיומות תוכנת סנכרון קבצים חופשית + +Create Explorer context menu entries +צור תפריט הקשר בסייר הקבצים + +Save settings in installation directory +שמור נתוני תוכנית בתיקית התקנה + +Do not write to Registry +אל תרשום לקבצי רגיסטרי + +Just copy the files +העתק קבצים בלבד + +Choose a directory for installation: +בחר תיקיה להתקנה + +Create shortcuts: +צור קיצורי דרך + +Desktop +שולחן עבודה + +Start menu +תפריט התחל + +Registering FreeFileSync file extensions +רושם קובצי תוכנת סנכרון קבצים חופשית + +Unregistering FreeFileSync file extensions +מבטל הרשמת קובצי תוכנת סנכרון קבצים חופשית + +FreeFileSync Configuration +תצורת FreeFileSync + +FreeFileSync Batch File +קובץ אצווה של FreeFileSync + +FreeFileSync Synchronization Database +בסיס נתוני סינכרון של FreeFileSync + +RealtimeSync Configuration +תצורת RealtimeSync + +Edit with FreeFileSync +ערוך עם FreeFileSync + diff --git a/FreeFileSync/Build/Languages/hungarian.lng b/FreeFileSync/Build/Languages/hungarian.lng index 2572e61f..96433e65 100644 --- a/FreeFileSync/Build/Languages/hungarian.lng +++ b/FreeFileSync/Build/Languages/hungarian.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Tetszőleges számú alternatív könyvtár-pár legfeljebb egy konfigurációs fájlban. +Open configuration for edit without executing. +Nyisd meg a konfigurációt szerkesztésre végrehajtás nélkül. + Cannot find the following folders: A következő könyvtárak nem találhatóak: @@ -184,11 +187,11 @@ Move file on right Jobb oldali fájl mozgatása -Overwrite left item -Bal oldali elem fölülírása +Update left item +Bal oldal frissítése -Overwrite right item -Jobb oldali elem fölülírása +Update right item +Jobb oldal frissítése Do nothing Nincs mit csinálni @@ -217,6 +220,9 @@ %x GB %x GB +Cannot load file %x. +%x fájl betöltése nem sikerült. + Database file %x is incompatible. %x adatbázisfájl inkompatibilis: . @@ -268,6 +274,9 @@ Creating file %x %x fájl létrehozása +Saving file %x... +%x fájl mentése + Items processed: Feldolgozott elemek száma: @@ -295,9 +304,6 @@ %x szál -Encoding extended time information: %x -Kibővített időinformációk kódolása: %x - /sec /másodperc @@ -319,9 +325,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. Kérjük, használd a FreeFileSync 64 bites verzióját az árnyékmásolatok készítéséhez ezen a rendszeren. -Cannot load file %x. -%x fájl betöltése nem sikerült. - Cannot determine volume name for %x. Nem lehet meghatározni a kötet-nevet a(z) %x számára @@ -340,8 +343,8 @@ Save &as... Mentés m&ásként... -&Quit -&Kilépés +E&xit +&Kilép &File &Fájl @@ -435,6 +438,9 @@ A parancs végrehajtódik, ha: &Show error &Mutassa a hibákat +&Quit +&Kilépés + Incorrect command line: Hibás parancssor: @@ -480,11 +486,11 @@ A parancs végrehajtódik, ha: Creating folder %x %x könyvtár létrehozása -Overwriting file %x -%x fájl felülírása +Updating file %x +%x fájl frissítése -Overwriting symbolic link %x -%x szimbolikus hivatkozás felülírása +Updating symbolic link %x +%x szimbolikus link frissítése Verifying file %x %x fájl ellenőrzése @@ -498,21 +504,21 @@ A parancs végrehajtódik, ha: Data verification error: %x and %y have different content. Adat-ellenőrzési hiba: %x és %y tartalma különböző. -Cannot find folder %x. -%x könyvtárat nem találom. - Target folder %x already existing. %x célkönyvtár már létezik. +Cannot find folder %x. +%x könyvtárat nem találom. + Target folder input field must not be empty. A célkönyvtárat meghatározó beviteli mező nem lehet üres. -Please enter a target folder for versioning. -Adja meg a célkönyvtárat a verziókövetéshez. - Source folder %x not found. %x forráskönyvtár nem található . +Please enter a target folder for versioning. +Adja meg a célkönyvtárat a verziókövetéshez. + The following items have unresolved conflicts and will not be synchronized: A következő elemek feloldatlan ütközést tartalmaznak, így nem lesznek szinkronizálva: @@ -555,8 +561,8 @@ A parancs végrehajtódik, ha: Synchronization completed successfully A szinkronizálás sikeresen befejeződött -Saving log file %x... -Naplófájl mentése a következő fájlba: %x. +Cleaning up old log files... +Régi log fájlok törlése Stopped Leállítva @@ -609,8 +615,8 @@ A parancs végrehajtódik, ha: FreeFileSync is up to date. A FreeFileSync naprakész. -Unable to connect to sourceforge.net. -Nem sikerült a csatlakozás a sourceforge.net-hez. +Unable to connect to FreeFileSync.org. +Nem tudok csatlakozni a FreeFileSync.org-hoz Cannot find current FreeFileSync version number online. Do you want to check manually? Nem lehet online megtalálni a jelenlegi FreeFileSync verziószámot. Meg akarod keresni manuálisan? @@ -696,9 +702,21 @@ A parancs végrehajtódik, ha: Start &comparison Kezdje az &összehasonlítást +C&omparison settings +Öss&zehasonlítási beállítások + +&Filter settings +&Szűrési beállítások + +S&ynchronization settings +Sz&inkronizálási beállítások + Start &synchronization Kezdje a &szinkronizálást +&Actions +&Műveletek + &Options &Beállítások @@ -777,8 +795,8 @@ A parancs végrehajtódik, ha: Number of files and folders that will be deleted A törlendő fájlok és könyvtárak száma -Number of files that will be overwritten -A felülírandó fájlok száma +Number of files that will be updated +Frissítendő fájlok száma Number of files and folders that will be created A létrehozandó fájlok és könyvtárak száma @@ -807,8 +825,14 @@ A parancs végrehajtódik, ha: Handle daylight saving time Kezelje a nyári időszámítás különbségét -Symbolic links: -Szimbolikus linkek: +Include symbolic links: +Csatolja a szimbolikus linkeket: + +Direct +Közvetlen + +Follow +Követ More information További információ @@ -837,23 +861,23 @@ A parancs végrehajtódik, ha: Maximum: Maximum: -C&lear -&Töröl - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Meghatározott fájlok szinkronizálásból történő kizárásához válasszon szűrőt. Az útvonalakat a megfelelő könyvtár-párjaikhoz viszonyítva adja meg. +C&lear +&Töröl + Detect moved files Érzékelje a mozgatott fájlokat -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- Adatbázis fájlokat feltételez és készít -- Az érzékelés a kezdeti szinkronizálás után válik aktívvá +- Az érzékelés a kezdeti szinkronizálás után aktív +- Adatbázisok fájlokat hoz létre és használ - Nem minden fájlrendszer támogatja @@ -1067,27 +1091,15 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. View Settings Mutassa a beállításokat -Overview -Áttekintés - Configuration Beállítás +Overview +Áttekintés + Main Bar Fő sáv -Start comparison -Kezdje az összehasonlítást - -Comparison settings -Összehasonlítási beállítások - -Synchronization settings -Szinkronizálási beállítások - -Start synchronization -Indítja a szinkronizálást - Confirm Jóváhagy @@ -1238,11 +1250,11 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. Show files that will be deleted on the right side Mutassa a jobb oldalon törlendő fájlokat -Show files that will be overwritten on left side -Mutassa a bal oldalon felülírandó fájlokat +Show files that will be updated on the left side +Mutassa a bal oldalon a frissítendő fájlokat -Show files that will be overwritten on right side -Mutassa a jobb oldalon felülírandó fájlokat +Show files that will be updated on the right side +Mutassa a jobb oldalon a frissítendő fájlokat Show files that won't be copied Mutassa a nem másolandó fájlokat @@ -1379,15 +1391,6 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. Configure your own synchronization rules. Állítsd be a saját szinkronizálási szabályaidat -Exclude -Kizár - -Direct -Közvetlen - -Follow -Követ - Today Mai @@ -1451,9 +1454,6 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. Cannot monitor directory %x. Nem sikerült monitorozni a(z) %x könyvtárat. -Conversion error: -Konverziós hiba: - Cannot delete file %x. Nem sikerült a(z) %x fájl törlése. @@ -1487,8 +1487,8 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. Cannot create directory %x. Nem sikerült a következő könyvtár létrehozása: %x. -Cannot create symbolic link %x. -Nem lehet létrehozni a(z) %x szimbolikus hivatkozást. +Cannot copy symbolic link %x to %y. +Nem tudja másolni a(z) %x szimbolikus linket %y-ba. Cannot find system function %x. Nem található a következő rendszerfunkció: %x. @@ -1571,3 +1571,72 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. Configuration file %x loaded partially only. %x konfigurációs fájl csak részlegesen töltődött be. +Prepare installation +Telepítés előkészítése + +Choose which components you want to install. +Válassza ki, mely komponenseket akarja telepíteni + +Select installation type: +Válassza ki a telepítési módot: + +Local +Lokális + +Portable +Hordozható + +recommended +ajánlott + +Save settings to "%APPDATA%\FreeFileSync" +Beállítások mentése a "%APPDATA%\FreeFileSync" mappába + +Register FreeFileSync file extensions +A FreeFileSync fájlkiterjesztéseinek regisztrálása + +Create Explorer context menu entries +Készítsen környezetfüggő menüsorokat az Explorerbe + +Save settings in installation directory +Beállítások mentése a telepítési mappába + +Do not write to Registry +Ne írjon a rendszerleíró adatbázisba + +Just copy the files +Csak a fájlok másolása + +Choose a directory for installation: +Válassza ki a telepítési mappát: + +Create shortcuts: +Hivatkozások létrehozása: + +Desktop +Asztalon + +Start menu +Start menü + +Registering FreeFileSync file extensions +A FreeFileSync fájlkiterjesztéseinek regisztrálása + +Unregistering FreeFileSync file extensions +A FreeFileSync fájlkiterjesztések regisztrációjának törlése + +FreeFileSync Configuration +FreeFileSync konfigurálása + +FreeFileSync Batch File +FreeFileSync kötegelt fájl + +FreeFileSync Synchronization Database +FreeFileSync szinkronizációs adatbázis + +RealtimeSync Configuration +RealtimeSync konfigurálása + +Edit with FreeFileSync +Szerkesztés FreeFileSync-kel + diff --git a/FreeFileSync/Build/Languages/italian.lng b/FreeFileSync/Build/Languages/italian.lng index a3c08e19..402edbdd 100644 --- a/FreeFileSync/Build/Languages/italian.lng +++ b/FreeFileSync/Build/Languages/italian.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Qualsiasi numero di coppie di directory alternative per al massimo un file di configurazione. +Open configuration for edit without executing. +Configurazione aperta per la modifica senza eseguire. + Cannot find the following folders: Impossibile trovare le seguenti cartelle: @@ -184,11 +187,11 @@ Move file on right Sposta il file a destra -Overwrite left item -Sovrascrivi oggetto di sinistra +Update left item +Aggiornamento voce sinistra -Overwrite right item -Sovrascrivi oggetto di destra +Update right item +Aggiornamento voce destra Do nothing Non fare nulla @@ -217,6 +220,9 @@ %x GB %x GB +Cannot load file %x. +Impossibile caricare il file %x. + Database file %x is incompatible. Il file del database %x non è compatibile. @@ -268,6 +274,9 @@ Creating file %x Creazione file %x +Saving file %x... +Salvare il file %x... + Items processed: Oggetti processati: @@ -295,9 +304,6 @@ %x thread -Encoding extended time information: %x -Codifica estesa informazioni orario: %x - /sec /sec @@ -319,9 +325,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. E' necessario utilizzare FreeFileSync versione 64-bit per creare copie shadow su questo sistema. -Cannot load file %x. -Impossibile caricare il file %x. - Cannot determine volume name for %x. Impossibile determinare nome del volume per %x. @@ -340,8 +343,8 @@ Save &as... Salva &come... -&Quit -&Esci +E&xit +U&scita &File &File @@ -435,6 +438,9 @@ Il comando è attivato se: &Show error &Mostra errore +&Quit +&Esci + Incorrect command line: Linea di comando non corretta: @@ -480,11 +486,11 @@ Il comando è attivato se: Creating folder %x Creazione cartella %x -Overwriting file %x -Sovrascrittura file %x +Updating file %x +Aggiornamento file %x -Overwriting symbolic link %x -Sovrascrittura collegamento %x +Updating symbolic link %x +Aggiornamento collegamento %x Verifying file %x Verifica file %x @@ -498,21 +504,21 @@ Il comando è attivato se: Data verification error: %x and %y have different content. Dati di verifica errore: %x e %y hanno un contenuto diverso. -Cannot find folder %x. -Impossibile trovare la cartella %x. - Target folder %x already existing. La cartella di destinazione %x è già esistente. +Cannot find folder %x. +Impossibile trovare la cartella %x. + Target folder input field must not be empty. Il campo per la cartella di destinazione non può essere vuoto. -Please enter a target folder for versioning. -Inserisci una cartella di destinazione per il controllo delle versioni. - Source folder %x not found. Cartella sorgente %x non trovata. +Please enter a target folder for versioning. +Inserisci una cartella di destinazione per il controllo delle versioni. + The following items have unresolved conflicts and will not be synchronized: I seguenti oggetti hanno conflitti irrisolti e non saranno sincronizzati: @@ -555,8 +561,8 @@ Il comando è attivato se: Synchronization completed successfully Sincronizzazione completata con successo -Saving log file %x... -Salvataggio file di log %x... +Cleaning up old log files... +Pulizia vecchi file di log ... Stopped Arrestato @@ -609,8 +615,8 @@ Il comando è attivato se: FreeFileSync is up to date. FreeFileSync è aggiornato. -Unable to connect to sourceforge.net. -Impossibile collegarsi a sourceforge.net. +Unable to connect to FreeFileSync.org. +Impossibile connettersi al FreeFileSync.org. Cannot find current FreeFileSync version number online. Do you want to check manually? Non riesci a trovare l'attuale numero di versione di FreeFileSync on-line. Vuoi controllare manualmente? @@ -652,7 +658,7 @@ Il comando è attivato se: Azioni Drag && drop -Trascina +Trascina e rilascia Local comparison settings Impostazioni di confronto locali @@ -696,9 +702,21 @@ Il comando è attivato se: Start &comparison Avvio &confronto +C&omparison settings +Impostazioni C&onfronto + +&Filter settings +Impostazioni &Filtro + +S&ynchronization settings +Impostazioni S&incronizzazione + Start &synchronization Avvio &sincronizzazione +&Actions +&Azioni + &Options &Opzioni @@ -777,8 +795,8 @@ Il comando è attivato se: Number of files and folders that will be deleted Numero di file e cartelle che verranno eliminati -Number of files that will be overwritten -Numero di file che verranno sovrascritti +Number of files that will be updated +Numero di file che verranno aggiornati Number of files and folders that will be created Numero di file e cartelle che verranno creati @@ -807,8 +825,14 @@ Il comando è attivato se: Handle daylight saving time Maneggiare l'ora legale -Symbolic links: -Link simbolici: +Include symbolic links: +Include i collegamenti: + +Direct +Diretto + +Follow +Segui More information Maggiori informazioni @@ -837,24 +861,24 @@ Il comando è attivato se: Maximum: Massimo: -C&lear -Cance&lla - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Selezionare le regole del filtro per escludere alcuni file dalla sincronizzazione. Immettere i percorsi dei file relativi alla loro corrispondente coppia di cartelle. +C&lear +Cance&lla + Detect moved files Rileva file spostati -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- Richiede e crea file di database - Rilevamento attivo dopo la sincronizzazione iniziale -- Non supportato da tutti i sistemi +- Richiede e crea file di database +- Non è supportato da tutti i sistemi Detect synchronization directions with the help of database files @@ -1067,27 +1091,15 @@ Questo garantisce uno stato consistente anche in caso di errore grave. View Settings Impostazioni Visualizzazione -Overview -Anteprima - Configuration Configurazione +Overview +Anteprima + Main Bar Barra Principale -Start comparison -Avviare confronto - -Comparison settings -Impostazioni di comparazione - -Synchronization settings -Parametri di sincronizzazione - -Start synchronization -Avvia sincronizzazione - Confirm Confermare @@ -1238,11 +1250,11 @@ Questo garantisce uno stato consistente anche in caso di errore grave. Show files that will be deleted on the right side Mostra i file che verranno cancellati sul lato destro -Show files that will be overwritten on left side -Mostra i file che verranno sovrascritti sul lato sinistro +Show files that will be updated on the left side +Mostra i file che verranno aggiornati sul lato sinistro -Show files that will be overwritten on right side -Mostra i file che verranno sovrascritti sul lato destro +Show files that will be updated on the right side +Mostra i file che verranno aggiornati sul lato destro Show files that won't be copied Mostra i file che non saranno copiati @@ -1379,15 +1391,6 @@ Questo garantisce uno stato consistente anche in caso di errore grave. Configure your own synchronization rules. Configura le tue regole di sincronizzazione. -Exclude -Escludi - -Direct -Diretto - -Follow -Segui - Today Oggi @@ -1451,9 +1454,6 @@ Questo garantisce uno stato consistente anche in caso di errore grave. Cannot monitor directory %x. Impossibile monitorare la directory %x. -Conversion error: -Errore di conversione: - Cannot delete file %x. Impossibile eliminare il file %x. @@ -1487,8 +1487,8 @@ Questo garantisce uno stato consistente anche in caso di errore grave. Cannot create directory %x. Impossibile creare la cartella %x. -Cannot create symbolic link %x. -Impossibile creare il collegamento %x. +Cannot copy symbolic link %x to %y. +Impossibile copiare collegamento %x per %y. Cannot find system function %x. Impossibile trovare la funzione di sistema %x. @@ -1571,3 +1571,72 @@ Questo garantisce uno stato consistente anche in caso di errore grave. Configuration file %x loaded partially only. File di configurazione %x caricato solo parzialmente. +Prepare installation +Preparare l'installazione + +Choose which components you want to install. +Scegliere i componenti che si desidera installare. + +Select installation type: +Selezionare il tipo di installazione: + +Local +Locale + +Portable +Portatile + +recommended +raccommandata + +Save settings to "%APPDATA%\FreeFileSync" +Salva impostazioni in "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Registra estensioni file di FreeFileSync + +Create Explorer context menu entries +Creare voci del menu contestuale di Explorer + +Save settings in installation directory +Salva impostazioni nella cartella di installazione + +Do not write to Registry +Non scrive nel Registro di Windows + +Just copy the files +Basta copiare i file + +Choose a directory for installation: +Seleziona cartella di installazione: + +Create shortcuts: +Crea collegamenti: + +Desktop +Desktop + +Start menu +Menù Avvio + +Registering FreeFileSync file extensions +Registra estensioni file FreeFileSync + +Unregistering FreeFileSync file extensions +Rimuovi registrazione estensioni file di FreeFileSync + +FreeFileSync Configuration +Configurazione FreeFileSync + +FreeFileSync Batch File +File Batch FreeFileSync + +FreeFileSync Synchronization Database +Database sincronizzazione FreeFileSync + +RealtimeSync Configuration +Configurazione RealtimeSync + +Edit with FreeFileSync +Modifica con FreeFileSync + diff --git a/FreeFileSync/Build/Languages/japanese.lng b/FreeFileSync/Build/Languages/japanese.lng index dd8c6a0e..ab14ad2e 100644 --- a/FreeFileSync/Build/Languages/japanese.lng +++ b/FreeFileSync/Build/Languages/japanese.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. 任意の数の代替ディレクトリペア(ひとつの構成ファイル) +Open configuration for edit without executing. +実行しないで構成ファイルを編集用に開く. + Cannot find the following folders: 以下のフォルダがみつかりません: @@ -184,11 +187,11 @@ Move file on right ファイルを右に移動 -Overwrite left item -左の項目に上書き +Update left item +左の項目を更新 -Overwrite right item -右の項目に上書き +Update right item +右の項目を更新 Do nothing 何もしない @@ -216,6 +219,9 @@ %x GB %x GB +Cannot load file %x. +ファイル %x を読み込めません. + Database file %x is incompatible. データベース %x とは互換性がありません. @@ -266,6 +272,9 @@ Creating file %x ファイル %x を作成中 +Saving file %x... +ファイル %x を保存中... + Items processed: 処理された要素: @@ -292,9 +301,6 @@ %x スレッド -Encoding extended time information: %x -拡張された時間情報のエンコーディング: %x - /sec /秒 @@ -316,9 +322,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. FreeFileSync 64-bit 版を使用してこのシステムにシャドウコピーを作成してください. -Cannot load file %x. -ファイル %x を読み込めません. - Cannot determine volume name for %x. %x のボリューム名が決定されていません @@ -337,8 +340,8 @@ Save &as... 別名保存(&A)... -&Quit -終了(&Q) +E&xit +終了(&X) &File ファイル(&F) @@ -432,6 +435,9 @@ The command is triggered if: &Show error エラー表示(&S) +&Quit +終了(&Q) + Incorrect command line: 不正なコマンドライン: @@ -477,11 +483,11 @@ The command is triggered if: Creating folder %x フォルダ %x を作成中 -Overwriting file %x -ファイル %x を上書き中 +Updating file %x +ファイル %x を更新中 -Overwriting symbolic link %x -シンボリックリンク %x を上書き中 +Updating symbolic link %x +シンボリックリンク %x を更新中 Verifying file %x ファイル %x の検証中 @@ -495,21 +501,21 @@ The command is triggered if: Data verification error: %x and %y have different content. データ検証エラー: %x と %y には異なる内容が含まれています. -Cannot find folder %x. -%x フォルダがみつかりません - Target folder %x already existing. 対象フォルダ %x は既に存在します. +Cannot find folder %x. +%x フォルダがみつかりません + Target folder input field must not be empty. 対象フォルダ入力欄が空白になっています. -Please enter a target folder for versioning. -バージョン付けをする対象フォルダを入力 - Source folder %x not found. ソースフォルダ %x が見つかりません +Please enter a target folder for versioning. +バージョン付けをする対象フォルダを入力 + The following items have unresolved conflicts and will not be synchronized: 以下の項目は、未解決の競合が存在するため同期処理を実行できませんでした: @@ -552,8 +558,8 @@ The command is triggered if: Synchronization completed successfully 同期処理はすべてが正常に完了しました -Saving log file %x... -ログファイル %x を保存中... +Cleaning up old log files... +古いログファイルをクリーン... Stopped 停止 @@ -605,8 +611,8 @@ The command is triggered if: FreeFileSync is up to date. FreeFileSync は最新です. -Unable to connect to sourceforge.net. -Sourceforge.net に接続できません. +Unable to connect to FreeFileSync.org. +FreeFileSync.org に接続できません. Cannot find current FreeFileSync version number online. Do you want to check manually? 現在の FreeFileSync バージョン番号を確認できませんでした、手動で確認しますか? @@ -692,9 +698,21 @@ The command is triggered if: Start &comparison 比較を開始(&C) +C&omparison settings +比較の設定(&O) + +&Filter settings +フィルター設定(&F) + +S&ynchronization settings +同期の設定(&Y) + Start &synchronization 同期を開始(&S) +&Actions +動作(&A) + &Options 設定(&O) @@ -773,8 +791,8 @@ The command is triggered if: Number of files and folders that will be deleted 削除されたファイル、およびフォルダの数 -Number of files that will be overwritten -上書きされたファイルの数 +Number of files that will be updated +更新されたファイルの数 Number of files and folders that will be created 作成されたファイル、およびフォルダの数 @@ -803,8 +821,14 @@ The command is triggered if: Handle daylight saving time 夏時間の取り扱い -Symbolic links: -シンボリック リンク: +Include symbolic links: +Sym リンクを含める: + +Direct +直接 + +Follow +考慮 More information 更に詳細な情報 @@ -833,24 +857,24 @@ The command is triggered if: Maximum: 最大: -C&lear -クリア(&L) - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. 同期処理から特定のファイルを除外するためのフィルター規則を選択、対応するそれらフォルダ ペアからの相対ファイルパスを入力します. +C&lear +クリア(&L) + Detect moved files 移動済みのファイルを検出する -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- データベースファイルの作成と要求 -- 初期同期後にアクティブを検出 -- すべてのファイルシステムには非対応 +- 初期同期の後、アクティブを検出 +- 必要なデータベースファイルを作成 +- すべてのシステムには対応していません Detect synchronization directions with the help of database files @@ -1063,27 +1087,15 @@ This guarantees a consistent state even in case of a serious error. View Settings 表示設定 -Overview -概要 - Configuration 構成設定 +Overview +概要 + Main Bar メインバー -Start comparison -比較を開始 - -Comparison settings -比較設定 - -Synchronization settings -同期処理設定 - -Start synchronization -同期の開始 - Confirm 確認 @@ -1230,11 +1242,11 @@ This guarantees a consistent state even in case of a serious error. Show files that will be deleted on the right side 右側で削除されたファイルを表示 -Show files that will be overwritten on left side -左側で上書きされたファイルを表示 +Show files that will be updated on the left side +左側で更新されたファイルを表示 -Show files that will be overwritten on right side -右側で上書きされたファイルを表示 +Show files that will be updated on the right side +右側で更新されたファイルを表示 Show files that won't be copied コピーされなかったファイルを表示 @@ -1367,16 +1379,7 @@ This guarantees a consistent state even in case of a serious error. 新しい、または更新されたファイルを右側フォルダにコピーします。 Configure your own synchronization rules. -あなたの設定した同期規則を使用します。 - -Exclude -除外 - -Direct -ダイレクト - -Follow -考慮する +あなたが使用する同期規則を設定します。 Today 今日 @@ -1441,9 +1444,6 @@ This guarantees a consistent state even in case of a serious error. Cannot monitor directory %x. ディレクトリ %x を監視できません. -Conversion error: -変換エラー: - Cannot delete file %x. ファイル %x を削除出来ません. @@ -1477,8 +1477,8 @@ This guarantees a consistent state even in case of a serious error. Cannot create directory %x. ディレクトリ %x を作成出来ません. -Cannot create symbolic link %x. -シンボリックリンク %x を作成出来ません +Cannot copy symbolic link %x to %y. +シンボリックリンク %x を %y にコピーできません. Cannot find system function %x. システム関数 %x がみつかりません. @@ -1558,3 +1558,72 @@ This guarantees a consistent state even in case of a serious error. Configuration file %x loaded partially only. 構成ファイル %x は部分的のみ読み込まれます. +Prepare installation +インストールの準備 + +Choose which components you want to install. +インストールするコンポーネントを選択 + +Select installation type: +インストールの種類を選択 + +Local +ローカル + +Portable +ポータブル + +recommended +推奨 + +Save settings to "%APPDATA%\FreeFileSync" +設定の保存先 "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +ファイル拡張子を登録 + +Create Explorer context menu entries +エクスプローラのメニュー項目に統合 + +Save settings in installation directory +設定をインストールディレクトリに保存 + +Do not write to Registry +レジストリを使用しない + +Just copy the files +ファイルのコピーのみ + +Choose a directory for installation: +インストールするディレクトリを選択: + +Create shortcuts: +ショートカットの作成: + +Desktop +デスクトップ + +Start menu +スタートメニュー + +Registering FreeFileSync file extensions +FreeFileSync ファイル拡張子を登録中 + +Unregistering FreeFileSync file extensions +FreeFileSync ファイル拡張子の登録解除中 + +FreeFileSync Configuration +FreeFileSync 構成設定 + +FreeFileSync Batch File +FreeFileSync 一括ファイル + +FreeFileSync Synchronization Database +FreeFileSync 同期データベース + +RealtimeSync Configuration +RealtimeSync 構成設定 + +Edit with FreeFileSync +FreeFileSync で編集 + diff --git a/FreeFileSync/Build/Languages/korean.lng b/FreeFileSync/Build/Languages/korean.lng index 08385610..8495026c 100644 --- a/FreeFileSync/Build/Languages/korean.lng +++ b/FreeFileSync/Build/Languages/korean.lng @@ -89,11 +89,14 @@ GlobalSettings.xml 대체 파일에 대한 경로 Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files. -FreeFileSync .ffs_gui 또는 .ffs_batch 설정파일 개수 +FreeFileSync .ffs_gui 또는 .ffs_batch 설정 파일 개수 Any number of alternative directory pairs for at most one config file. 최대 1개 설정파일에 대한 대체 디렉토리 페어 개수 +Open configuration for edit without executing. +실행하지 않은 상태로 편집 구성 열기 + Cannot find the following folders: 다음 폴더를 찾을 수 없습니다: @@ -184,11 +187,11 @@ Move file on right 우측 파일 이동 -Overwrite left item -좌측 항목 덮어쓰기 +Update left item +좌측 항목 업데이트 -Overwrite right item -우측 항목 덮어쓰기 +Update right item +우측 항목 업데이트 Do nothing 아무 것도 하지 않음 @@ -216,6 +219,9 @@ %x GB %x GB +Cannot load file %x. +파일 %x을(를) 로드할 수 없습니다. + Database file %x is incompatible. 데이터베이스 파일 %x 은(는) 호환 불가능합니다. @@ -266,6 +272,9 @@ Creating file %x 파일 %x 생성 중 +Saving file %x... +파일 %x 저장 중... + Items processed: 처리된 항목: @@ -292,9 +301,6 @@ %x 스레드 -Encoding extended time information: %x -인코딩 확장 시간 정보: %x - /sec /초 @@ -316,9 +322,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. 본 운영체제에서의 Shadow Copy 생성은 FreeFileSync 64-비트 버전을 사용하세요. -Cannot load file %x. -파일 %x을(를) 로드할 수 없습니다. - Cannot determine volume name for %x. %x 에 대한 볼륨 이름을 결정할 수 없습니다. @@ -337,8 +340,8 @@ Save &as... 다른 이름으로 저장(&a) -&Quit -종료(&Q) +E&xit +나가기(&x) &File 파일(&F) @@ -365,7 +368,7 @@ 3. '시작'을 누르세요. To get started just import a .ffs_batch file. -시작하려면 .ffs_batch file (일괄 파일)을 가져오십시오. +시작하려면 .ffs_batch file을 가져 오십시오. Folders to watch: 열어 볼 폴더: @@ -432,6 +435,9 @@ The command is triggered if: &Show error 오류 표시(&S) +&Quit +종료(&Q) + Incorrect command line: 부정확한 명령줄: @@ -445,7 +451,7 @@ The command is triggered if: 파일 시간 및 크기 Two way -양방/양면 (Two Way) +양측 방향 (Two Way) Mirror 미러 @@ -477,11 +483,11 @@ The command is triggered if: Creating folder %x 폴더 %x 생성 중 -Overwriting file %x -파일 %x 덮어쓰는 중 +Updating file %x +파일 %x 업데이트 중 -Overwriting symbolic link %x -심볼릭 링크 %x 덮어쓰는 중 +Updating symbolic link %x +심볼릭 링크 %x 업데이트 중 Verifying file %x 파일 %x 확인 중 @@ -495,21 +501,21 @@ The command is triggered if: Data verification error: %x and %y have different content. 데이터 확인 오류: %x 및 %y 의 내용이 서로 다릅니다. -Cannot find folder %x. -%x 폴더를 찾을 수 없습니다. - Target folder %x already existing. 대상 폴더 %x이(가) 이미 존재함. +Cannot find folder %x. +%x 폴더를 찾을 수 없습니다. + Target folder input field must not be empty. 대상 폴더 입력 필드가 비어 있어서는 안 됩니다. -Please enter a target folder for versioning. -버저닝을 위한 대상 폴더를 입력하세요. - Source folder %x not found. 소스 폴더 %x을(를) 찾을 수 없음. +Please enter a target folder for versioning. +버저닝을 위한 대상 폴더를 입력하세요. + The following items have unresolved conflicts and will not be synchronized: 아래의 항목들은 해결치 못 한 충돌로 인해 동기화할 수 없습니다: @@ -552,8 +558,8 @@ The command is triggered if: Synchronization completed successfully 동기화가 성공적으로 완료 됐습니다 -Saving log file %x... -로그 파일 %x 저장 중... +Cleaning up old log files... +이전 로그 파일 정리 중... Stopped 중단 @@ -605,8 +611,8 @@ The command is triggered if: FreeFileSync is up to date. FreeFileSync는 현재 최신버전 상태입니다. -Unable to connect to sourceforge.net. -Sourceforge.net에 접속할 수 없습니다. +Unable to connect to FreeFileSync.org. +FreeFileSync.org.에 접속할 수 없습니다. Cannot find current FreeFileSync version number online. Do you want to check manually? 현재 사용 중인 FreeFileSync 버전 번호를 온라인에서 찾을 수 없습니다. 수동으로 확인해 보시겠습니까? @@ -692,9 +698,21 @@ The command is triggered if: Start &comparison 비교 시작(&C) +C&omparison settings +비교 설정(&o) + +&Filter settings +필터 설정(&F) + +S&ynchronization settings +동기화 설정(&y) + Start &synchronization 동기화 시작(&S) +&Actions +실행(&A) + &Options 옵션(&O) @@ -773,8 +791,8 @@ The command is triggered if: Number of files and folders that will be deleted 삭제될 파일 및 폴더 개수 -Number of files that will be overwritten -덮어 씌어질 파일 개수 +Number of files that will be updated +업데이트 될 파일 개수 Number of files and folders that will be created 생성될 파일 및 폴더 개수 @@ -803,8 +821,14 @@ The command is triggered if: Handle daylight saving time 서머타임 설정 -Symbolic links: -심볼링 링크: +Include symbolic links: +심볼릭 링크 포함: + +Direct +다이렉트 + +Follow +팔로우 More information 상세 정보 @@ -833,24 +857,24 @@ The command is triggered if: Maximum: 최대: -C&lear -제거(&l) - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. 동기화에서 특정 파일을 제외시키는 필터 규칙을 선택합니다. 해당 폴더 페어에 대한 상대 파일 경로를 입력하세요. +C&lear +제거(&l) + Detect moved files 이동 파일 탐지 -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- 데이터베이스 파일 필요 및 생성 - 초기 동기화 이후 탐지기능 활성화 -- 모든 파일 시스템에서 지원되지 않음 +- 데이터베이스 파일 요청 및 생성 +- 모든 파일 시스템에서 지원되지는 않음 Detect synchronization directions with the help of database files @@ -935,7 +959,7 @@ The command is triggered if: 중지 Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x -직접 지켜보지 않는 자동 동기화의 경우, 배치 파일을 만듭니다. 시작하려면 파일을 더블 클릭하거나 작업 플래너에서 일정을 만듭니다: %x +직접 지켜보지 않는 자동 동기화의 경우, 배치 파일을 만듭니다. 시작하려면 파일을 더블 클릭하거나 작업 플래너에서 일정을 만드십시오: %x &Stop 중지(&S) @@ -1063,27 +1087,15 @@ This guarantees a consistent state even in case of a serious error. View Settings 설정 보기 -Overview -개요 - Configuration 구성 설정 +Overview +개요 + Main Bar 메인 바 -Start comparison -비교 시작 - -Comparison settings -비교 설정 - -Synchronization settings -동기화 설정 - -Start synchronization -동기화 시작 - Confirm 확인 @@ -1177,7 +1189,7 @@ This guarantees a consistent state even in case of a serious error. 설정 저장 완료 FreeFileSync batch -FreeFileSync 일괄처리(배치) +FreeFileSync 배치(일괄) 처리 Do you want to save changes to %x? %x의 변경사항을 저장하시겠습니까? @@ -1230,11 +1242,11 @@ This guarantees a consistent state even in case of a serious error. Show files that will be deleted on the right side 우측에서 삭제될 파일 표시 -Show files that will be overwritten on left side -좌측에 덮어쓰여질 파일 표시 +Show files that will be updated on the left side +좌측에 업데이트 될 파일 표시 -Show files that will be overwritten on right side -우측에 덮어쓰여질 파일 표시 +Show files that will be updated on the right side +우측에 업데이트 될 파일 표시 Show files that won't be copied 복사되지 않을 파일 표시 @@ -1369,15 +1381,6 @@ This guarantees a consistent state even in case of a serious error. Configure your own synchronization rules. 개인 동기화 규칙 설정 -Exclude -제외 - -Direct -다이렉트 - -Follow -팔로우 - Today 오늘 @@ -1441,9 +1444,6 @@ This guarantees a consistent state even in case of a serious error. Cannot monitor directory %x. 디렉토리 %x을(를) 모니터링 할 수 없습니다. -Conversion error: -변환 오류: - Cannot delete file %x. 파일 %x을(를) 삭제할 수 없습니다. @@ -1477,8 +1477,8 @@ This guarantees a consistent state even in case of a serious error. Cannot create directory %x. 디렉토리 %x을(를) 생성할 수 없습니다. -Cannot create symbolic link %x. -심볼릭 링크 %x을(를) 생성할 수 없습니다. +Cannot copy symbolic link %x to %y. +심볼릭 링크 %x을(를) %y(으)로 복사할 수 없습니다. Cannot find system function %x. 시스템 함수 %x을(를) 찾을 수 없습니다. @@ -1558,3 +1558,72 @@ This guarantees a consistent state even in case of a serious error. Configuration file %x loaded partially only. 구성 파일 %x이(가) 부분적으로만 로드 되었음. +Prepare installation +설치 준비 + +Choose which components you want to install. +설치할 구성 요소를 선택하세요. + +Select installation type: +설치 유형 선택: + +Local +로컬 + +Portable +포터블 + +recommended +권장 + +Save settings to "%APPDATA%\FreeFileSync" +"%APPDATA%\FreeFileSync"에 설정 저장 + +Register FreeFileSync file extensions +FreeFileSync 파일 확장자 등록 + +Create Explorer context menu entries +익스플로러 컨텍스트 메뉴 항목 생성 + +Save settings in installation directory +설치 디렉토리에 설정 저장 + +Do not write to Registry +레지스트리에 기록 안 함 + +Just copy the files +파일만 복사 + +Choose a directory for installation: +설치할 디렉토리를 선택하세요 : + +Create shortcuts: +바로가기 생성 : + +Desktop +바탕화면 + +Start menu +시작 메뉴 + +Registering FreeFileSync file extensions +FreeFileSync 파일 확장자 등록 중 + +Unregistering FreeFileSync file extensions +FreeFileSync 파일 확장자 등록 해제 중 + +FreeFileSync Configuration +FreeFileSync 환경설정 + +FreeFileSync Batch File +FreeFileSync 배치(일괄) 파일 + +FreeFileSync Synchronization Database +FreeFileSync 동기화 데이터베이스 + +RealtimeSync Configuration +RealtimeSync (실시간 동기화) 환경설정 + +Edit with FreeFileSync +FreeFileSync로 편집 + diff --git a/FreeFileSync/Build/Languages/lithuanian.lng b/FreeFileSync/Build/Languages/lithuanian.lng index d8e0573f..78af9c50 100644 --- a/FreeFileSync/Build/Languages/lithuanian.lng +++ b/FreeFileSync/Build/Languages/lithuanian.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Bet koks skaičius alternatyvių katalogų grupuojams tik su vienu konfigūraciniu failu +Open configuration for edit without executing. +Atidaryti ir koreguoti pasirinkimus be programos vykdymo + Cannot find the following folders: Nepavyksta rasti šių aplankų: @@ -184,11 +187,11 @@ Move file on right Perkelti failą į dešinę -Overwrite left item -Perrašyti kairįjį elementą +Update left item +Atnaujinti kairėje esantį elementą -Overwrite right item -Perrašyti dešinįjį elementą +Update right item +Atnaujinti dešinėje esantį elementą Do nothing Nieko nedaryti @@ -273,6 +276,9 @@ Creating file %x Kuriamas failas %x +Saving file %x... +Išsaugomas failas %x... + Items processed: Elementų apdorota: @@ -301,9 +307,6 @@ %x srautų -Encoding extended time information: %x -Koduojama išplėstinė laiko informacija: %x - /sec /sek. @@ -343,8 +346,8 @@ Save &as... Išsaugoti &kaip... -&Quit -&Išeiti +E&xit +I&šeiti &File &Failas @@ -438,6 +441,9 @@ Komanda inicijuojama jei: &Show error &Parodyti klaidą +&Quit +&Išeiti + Incorrect command line: Netaisyklinga Komandinė eilutė: @@ -483,11 +489,11 @@ Komanda inicijuojama jei: Creating folder %x Kuriamas aplankas %x -Overwriting file %x -Perrašomas failas %x +Updating file %x +Atnaujinamas failas %x -Overwriting symbolic link %x -Perrašoma simbolinė nuoroda %x +Updating symbolic link %x +Atnaujinama virtuali nuoroda %x Verifying file %x Tikrinamas failas %x @@ -558,8 +564,8 @@ Komanda inicijuojama jei: Synchronization completed successfully Suvienodinimas sėkmingai baigtas -Saving log file %x... -Iš saugomas žurnalo failas %x... +Cleaning up old log files... +Išvalomi seni žurnalo įrašai... Stopped Sustabdyta @@ -613,8 +619,8 @@ Komanda inicijuojama jei: FreeFileSync is up to date. FreeFileSync yra naujausia. -Unable to connect to sourceforge.net. -Nepavyksta prisijungti prie sourceforge.net. +Unable to connect to FreeFileSync.org. +Nepavyko prisijungti prie FreeFileSync.org Cannot find current FreeFileSync version number online. Do you want to check manually? Dabartinės FreeFileSync versijos numeris internete nerastas. Ar norėtumėte patikrinti rankiniu būdu? @@ -656,7 +662,7 @@ Komanda inicijuojama jei: Veiksmas Drag && drop -Vilkti && numesti +Vilkti && Numesti Local comparison settings Vietiniai palyginimo parametrai @@ -700,9 +706,21 @@ Komanda inicijuojama jei: Start &comparison Pradėti &palyginimą +C&omparison settings +P&alyginimo parametrai + +&Filter settings +&Filtro parametrai + +S&ynchronization settings +S&uvienodinimo parametrai + Start &synchronization Pradėti &suvienodinimą +&Actions +&Veiksmai + &Options &Parinktys @@ -781,8 +799,8 @@ Komanda inicijuojama jei: Number of files and folders that will be deleted Failų ir aplankų, kurie bus ištrinti, skaičius -Number of files that will be overwritten -Skaičius failų, kurie bus perrašyti +Number of files that will be updated +Atnaujinamų failų kiekis Number of files and folders that will be created Failų ir aplankų, kurie bus sukurti, skaičius @@ -811,8 +829,14 @@ Komanda inicijuojama jei: Handle daylight saving time Naudoti vasaros laiką -Symbolic links: -Simbolinės nuorodos: +Include symbolic links: +Pridėti simbolinias nuorodas: + +Direct +Tiesiogiai + +Follow +Sekti More information Daugiau informacijos @@ -841,24 +865,24 @@ Komanda inicijuojama jei: Maximum: Didžiausias: -C&lear -&Išvalyti - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Pasirinkti filtro taisykles norint išskirti pasirinktus failus iš Suvienodinimo. Įveskite failo kelią, kuris atitinka aplanką. +C&lear +&Išvalyti + Detect moved files Rasti perkeltus failus -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- Sukuriami reikalingi duomenų bazės failai -- Aktyvus tikrinimas vykdant suvienodinimą -- Nesuderinamas su visomis failų sistemomis +- Aptikimas aktyvuosis pradėjus suvienodinimui +- Sukuriami būtini duomenų bazės failai +- Nesuderinama su visomis failų sistemomis Detect synchronization directions with the help of database files @@ -1071,27 +1095,15 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. View Settings Rodymo parametrai -Overview -Apžvalga - Configuration Nustatymai +Overview +Apžvalga + Main Bar Pagrindinė įrankinė -Start comparison -Pradėti palyginimą - -Comparison settings -Palyginimo nustatymai - -Synchronization settings -Suvienodinimo nustatymai - -Start synchronization -Pradėti suvienodinimą - Confirm Patvirtinti @@ -1246,11 +1258,11 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. Show files that will be deleted on the right side Rodyti failus, kurie bus ištrinti dešinėje pusėje -Show files that will be overwritten on left side -Rodyti failus, kurie bus perrašyti kairėje pusėje +Show files that will be updated on the left side +Rodyti failus, kurie bus atnaujinti kairėje pusėje -Show files that will be overwritten on right side -Rodyti failus, kurie bus perrašyti dešinėje pusėje +Show files that will be updated on the right side +Rodyti failus, kurie bus atnaujinti dešinėje pusėje Show files that won't be copied Rodyti failus, kurie ne bus kopijuojami @@ -1389,15 +1401,6 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. Configure your own synchronization rules. Nustatyti Jūsų pačių suvienodinimo taisykles. -Exclude -Neįtraukti - -Direct -Tiesiogiai - -Follow -Sekti - Today Šiandien @@ -1461,9 +1464,6 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. Cannot monitor directory %x. Nepavyko stebėti katalogo %x. -Conversion error: -Konvertavimo klaida: - Cannot delete file %x. Nepavyksta ištrinti failo %x. @@ -1497,17 +1497,17 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. Cannot create directory %x. Nepavyksta sukurti katalogo %x. -Cannot create symbolic link %x. -Nepavyko sukurti simbolinės nuorodos %x +Cannot copy symbolic link %x to %y. +Nepavyko nukopijuoti simbolinės nuorodos %x į %y. Cannot find system function %x. -Nepavyksta rasti sistemos funkcijos %x. +Nepavyksta rasti sisteminės funkcijos %x. Cannot copy file %x to %y. -Nepavyksta nukopijuoti failo %x į %y. +Nepavyksta nukopijuoti failų %x į %y. Type of item %x is not supported: -Element tipas %x nepalaikomas: +Elemento tipas %x nepalaikomas: Cannot resolve symbolic link %x. Nepavyko rasti simbolinės nuorodos %x reikšmės @@ -1584,3 +1584,72 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. Configuration file %x loaded partially only. Nustatymų failas %x įkeltas tik dalinai. +Prepare installation +Ruošiamasi įdiegimui + +Choose which components you want to install. +Pasirinkite kuriuos komponentus norėtumėte įdiegti + +Select installation type: +Pasirinkti įdiegimo būdą + +Local +Vietoje + +Portable +Nešiojamas + +recommended +rekomenduojama + +Save settings to "%APPDATA%\FreeFileSync" +Išsaugoti nustatymus į "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Įrašyti FreeFileSync failų plėtinius + +Create Explorer context menu entries +Sukurti failų naršyklės turinio įrašus + +Save settings in installation directory +Išsaugoti parametrus įdiegimo kataloge + +Do not write to Registry +Nerašyti į registrų skiltį + +Just copy the files +Tiesiog kopijuoti failus + +Choose a directory for installation: +Pasirinkite aplanką į kurį norėtumėte įdiegti: + +Create shortcuts: +Sukurti nuorodas: + +Desktop +Darbalaukis + +Start menu +Pradėti meniu + +Registering FreeFileSync file extensions +Registruojami FreeFileSync failų plėtiniai + +Unregistering FreeFileSync file extensions +Išregistruojami FreeFileSync failų plėtiniai + +FreeFileSync Configuration +FreeFileSync Konfigūracijos + +FreeFileSync Batch File +FreeFileSync Failų Paketas + +FreeFileSync Synchronization Database +FreeFileSync Suvienodinimo duomenų bazė + +RealtimeSync Configuration +Realaus laiko suvienodinimo konfiguracija + +Edit with FreeFileSync +Koreguoti su FreeFileSync + diff --git a/FreeFileSync/Build/Languages/norwegian.lng b/FreeFileSync/Build/Languages/norwegian.lng index 914184dc..50096dbb 100644 --- a/FreeFileSync/Build/Languages/norwegian.lng +++ b/FreeFileSync/Build/Languages/norwegian.lng @@ -1,37 +1,12 @@
      Norsk - bjorn039 + bjorn96 nb_NO flag_norway.png 2 n == 1 ? 0 : 1
      -Cannot copy symbolic link %x to %y. - - - -- Detection active after initial sync -- Requires and creates database files -- Not supported by all file systems - - - -C&lear - - -Consider file times with specified offset as equal - - -Unable to connect to freefilesync.org. - - -Removing old log files exceeding limit... - - -Open configuration for edit without executing. - - Both sides have changed since last synchronization. Begge sider er endret siden siste synkronisering. @@ -119,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Et ubegrenset antall alternative kataloger for maksimalt én konfigurasjonsfil +Open configuration for edit without executing. +Åpne konfigurasjon for å redigere, uten å kjøre den + Cannot find the following folders: Kan ikke finne følgende mapper: @@ -209,11 +187,11 @@ Move file on right Flytt filen til høyre -Overwrite left item -Overskriv venstre mappe +Update left item +Oppdater fil til venstre -Overwrite right item -Overskriv høyre mappe +Update right item +Oppdater fil til høyre Do nothing Ikke gjør noe @@ -296,8 +274,8 @@ Creating file %x Oppretter filen %x -Saving log file %x... -Lagrer rapport %x... +Saving file %x... +Lagrer fil %x... Items processed: Mapper behandlet: @@ -365,8 +343,8 @@ Save &as... Lagre &som... -&Quit -&Avslutt +E&xit +A&vslutt &File &Fil @@ -460,6 +438,9 @@ Kommandoen utføres hvis: &Show error &Vis feil +&Quit +&Avslutt + Incorrect command line: Ugyldig kommando: @@ -505,11 +486,11 @@ Kommandoen utføres hvis: Creating folder %x Oppretter mappen %x -Overwriting file %x -Overskriver filen %x +Updating file %x +Oppdaterer fil %x -Overwriting symbolic link %x -Overskriver symlinken %x +Updating symbolic link %x +Oppdaterer symbolsk link %x Verifying file %x Verifiserer filen %x @@ -580,6 +561,9 @@ Kommandoen utføres hvis: Synchronization completed successfully Synkronisering gjennomført +Cleaning up old log files... +Fjerner gamle loggfiler + Stopped Avbrutt @@ -631,6 +615,9 @@ Kommandoen utføres hvis: FreeFileSync is up to date. FreeFileSync er oppdatert. +Unable to connect to FreeFileSync.org. +Kan ikke koble til FreeFileSync.org + Cannot find current FreeFileSync version number online. Do you want to check manually? Kunne ikke finne FreeFileSync's versjonsnummer online. Vil du kontrollere manuelt? @@ -715,9 +702,21 @@ Kommandoen utføres hvis: Start &comparison Start &sammenligning +C&omparison settings +S&ammenligner instillinger + +&Filter settings +&Filtrer instillinger + +S&ynchronization settings +S&ynkroniserings-instillinger + Start &synchronization Start &synkronisering +&Actions +&Handling + &Options &Valg @@ -796,8 +795,8 @@ Kommandoen utføres hvis: Number of files and folders that will be deleted Antall filer og mapper som slettes -Number of files that will be overwritten -Antall filer som overskrives +Number of files that will be updated +Antall filer som vil bli oppdatert Number of files and folders that will be created Antall filer og mapper som vil bli opprettet @@ -820,11 +819,20 @@ Kommandoen utføres hvis: Ignore time shift (in hours) Ignorer tidsbytte (i timer) +Consider file times with specified offset as equal +Vurder filtidspunkt med spesifisert oppstilling som like + Handle daylight saving time Behandle sommertid -Symbolic links: -Symbolsk link: +Include symbolic links: +Inkluder symbolske linker: + +Direct +Direkte + +Follow +Følg More information Mer informasjon @@ -856,9 +864,23 @@ Kommandoen utføres hvis: Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Angi filterregler til ekskludering av bestemte filer fra synkroniseringen. Filstier skal relatere til kildemappene. +C&lear +F&jern + Detect moved files Gjennkjenn flyttede filer + +- Detection active after initial sync +- Requires and creates database files +- Not supported by all file systems + + +- Detektering er aktiv etter første synkronisering +- Krever og skaper databasefiler +- Ikke støttet av alle filsystemer + + Detect synchronization directions with the help of database files Gjennkjenn synkretninger ved hjelp av databasefiler @@ -1019,7 +1041,7 @@ This guarantees a consistent state even in case of a serious error. &Standard Source code written in C++ using: -Kildekoden er skrevet i C++ med Hjelp fra: +Kildekoden er skrevet i C++ med hjelp fra: If you like FreeFileSync Hvis du liker FreeFileSync @@ -1075,18 +1097,6 @@ This guarantees a consistent state even in case of a serious error. Main Bar Hovedlinje -Start comparison -Start sammenligning - -Comparison settings -Analyseinnstillinger - -Synchronization settings -Synkroniseringsinnstillinger - -Start synchronization -Start synkronisering - Confirm Bekreft @@ -1125,8 +1135,8 @@ This guarantees a consistent state even in case of a serious error. Showing %y of %x rows -Viser %y af 1 rekke -Viser %y af %x rekker +Viser %y av 1 rekke +Viser %y av %x rekker Set direction: @@ -1237,11 +1247,11 @@ This guarantees a consistent state even in case of a serious error. Show files that will be deleted on the right side Vis filer som slettes på høyre side -Show files that will be overwritten on left side -Vis filer som overskrives på venstre side +Show files that will be updated on the left side +Vis filer som vil bli oppdaters på venstre side -Show files that will be overwritten on right side -Vis filer som overskrives på høyre side +Show files that will be updated on the right side +Vis filer som vil bli oppdatert på høyre side Show files that won't be copied Vis filer som ikke kopieres @@ -1378,15 +1388,6 @@ This guarantees a consistent state even in case of a serious error. Configure your own synchronization rules. Oppret dine egne synkroniseringsregler. -Exclude -Ekskludér - -Direct -Direkte - -Follow -Følg - Today I dag @@ -1483,6 +1484,9 @@ This guarantees a consistent state even in case of a serious error. Cannot create directory %x. Kan ikke opprette mappen %x. +Cannot copy symbolic link %x to %y. +Kan ikke kopiere symolsk link %x til %y + Cannot find system function %x. Kan ikke finne systemfunksjonen %x. @@ -1564,3 +1568,72 @@ This guarantees a consistent state even in case of a serious error. Configuration file %x loaded partially only. Konfigureringsfilen %x er delvis innlastet +Prepare installation +Forbered installering + +Choose which components you want to install. +Velg hva du vil installere + +Select installation type: +Velg installasjonstype + +Local +Lokal + +Portable +Portabel (USB) + +recommended +anbefalt + +Save settings to "%APPDATA%\FreeFileSync" +Lagre innstillinger til "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Registrer FreeFileSync filendelser + +Create Explorer context menu entries +Legg til i høyreklikkmeny + +Save settings in installation directory +Lagre innstillinger i installasjonsmappen + +Do not write to Registry +Ikke skriv til registeret + +Just copy the files +Bare kopier filene + +Choose a directory for installation: +Velg en mappe for installasjon: + +Create shortcuts: +Opprett snarveier: + +Desktop +Skrivebord + +Start menu +Startmeny + +Registering FreeFileSync file extensions +Registrerer FreeFileSync filendelser + +Unregistering FreeFileSync file extensions +Avregistrerer FreeFileSync filendelser + +FreeFileSync Configuration +FreeFileSync konfigurering + +FreeFileSync Batch File +FreeFileSync Batch Fil + +FreeFileSync Synchronization Database +FreeFileSync Synkronisering + +RealtimeSync Configuration +RealtimeSync konfigurering + +Edit with FreeFileSync +Rediger med FreeFileSync + diff --git a/FreeFileSync/Build/Languages/outdated/scottish_gaelic.lng b/FreeFileSync/Build/Languages/outdated/scottish_gaelic.lng new file mode 100644 index 00000000..90aeaa2b --- /dev/null +++ b/FreeFileSync/Build/Languages/outdated/scottish_gaelic.lng @@ -0,0 +1,1664 @@ +
      + Gàidhlig + Michael Bauer aka Akerbeltz + gd + flag_scotland.png + 4 + (n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3 +
      + +Both sides have changed since last synchronization. +Chaidh an dà thaobh atharrachadh on t-sioncronachadh mu dheireadh. + +Cannot determine sync-direction: +Cha ghabh comhair an t-sioncronachaidh aithneachadh: + +No change since last synchronization. +Cha deach dad atharrachadh on t-sioncronachadh mu dheireadh. + +The database entry is not in sync considering current settings. +Chan eil innteart an stòir-dhàta sioncronaicht a-rèir nan roghainnean làithreach + +Setting default synchronization directions: Old files will be overwritten with newer files. +A’ suidheachadh comhair bhunaiteach an t-sioncronachaidh: Thèid faidhlichean nas ùire a sgrìobhadh thairis air seann-fhaidhlichean. + +Checking recycle bin availability for folder %x... +A’ toirt sùil a bheil am biona ri fhaighin airson a’ phasgain %x... + +Moving file %x to the recycle bin +A’ gluasad an fhaidhle %x dhan bhiona + +Moving folder %x to the recycle bin +A’ gluasad a’ phasgain %x dhan bhiona + +Moving symbolic link %x to the recycle bin +A’ gluasad an symbolic link %x dhan bhiona + +Deleting file %x +A’ sguabadh às an fhaidhle %x + +Deleting folder %x +A’ sguabadh às a’ phasgain %x + +Deleting symbolic link %x +A’ sguabadh às an symbolic link %x + +The recycle bin is not available for the following folders. Files will be deleted permanently instead: +Chan eil am biona ri làimh airson nam pasganan a leanas. Thèid an sguabadh às gu buan an àite sin: + +An exception occurred +Thachair eisgeachd + +A directory path is expected after %x. +Tha dùil ri slighe pasgain an dèidh %x + +Syntax error +Mearachd co-chàraidh + +Cannot open file %x. +Cha ghabh am faidhle %x fhosgladh. + +File %x does not contain a valid configuration. +Chan eil rèiteachadh dligheach san fhaidhle %x. + +Unequal number of left and right directories specified. +Chan eil àireamh nam pasganan air an taobh chlì ’s an taobh deas co-ionnann + +The config file must not contain settings at directory pair level when directories are set via command line. +Chan fhaod roghainnean aig ìre paidhrichean nam pasganan a bhith san fhaidhle rèiteachaidh nuair a thathar a’ cur pasganan slighe na loidhne-àithne. + +Directories cannot be set for more than one configuration file. +Cha ghabh pasganan a shuidheachadh airson barrachd air aon fhaidhle rèiteachaidh. + +Command line +Loidhne-àithne + +Syntax: +Co-chàradh: + +global config file: +faidhle uile-choitcheann an rèiteachaidh + +config files: +faidhlichean rèiteachaidh: + +directory +pasgan + +Path to an alternate GlobalSettings.xml file. +Slighe gu faidhle GlobalSettings.xml eile + +Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files. +Àireamh sam bith de dh’fhaidhlichean rèiteachaidh FreeFileSync .ffs_gui agus/no .ffs_batch + +Any number of alternative directory pairs for at most one config file. +Àireamh sam bith de phaidhrichean pasgain eile airson aon fhaidhle rèiteachaidh air a’ char as fhaide + +Open configuration for edit without executing. + + +Cannot find the following folders: +Chan urrainn dhuinn na pasgain a leanas a lorg: + +You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization. +’S urrainn dhut a’ mhearachd seo a leigeil seachad ma tha thu airson ’s gun dèilig sinn ri gach pasgan mar gum biodh iad falamh. Thèid na pasgain a chruthachadh gu fèin-obrachail an uairsin rè an t-sioncronachaidh + +A folder input field is empty. +Tha co-dhiù aon raon pasgain ann a tha falamh. + +The corresponding folder will be considered as empty. +Thèid am pasgan a leanas a làimhseachadh mar phasgan falamh. + +The following folder paths are dependent from each other: +Tha slighean nam pasganan a leanas an eisimeil a chèile: + +File %x has an invalid date. +Tha ceann-là mì-dhligheach aig an fhaidhle %x. + +Date: +Ceann-là: + +Files %x have the same date but a different size. +Tha an dearbh cheann-là aig na faidhlichean %x ach chan eil am meud co-ionnann. + +Size: +Meud: + +Content comparison was skipped for excluded files %x. +Leumadh thairis air coimeas na susbaint mu choinneamh nam faidhlichean a chaidh an dùnadh às (%x). + +Items differ in attributes only +Chan eil diofar eatarra ach a thaobh an cuid bhuadhan + +Resolving symbolic link %x +Duilgheadas a’ rèiteachadh a’ symbolic link %x + +Comparing content of files %x +A’ dèanamh coimheas eadar na faidhlichean %x + +Generating file list... +A’ gintinn liosta nam faidhle... + +Starting comparison +A’ tòiseachadh air a’ choimeasadh + +Calculating sync directions... +Ag àireamhachadh comhairean an t-sioncronachaidh... + +Out of memory. +Chan eil cuimhne gu leòr ann. + +Item exists on left side only +Chan eil an nì seo ann ach air an taobh chlì + +Item exists on right side only +Chan eil an nì seo ann ach air an taobh deas + +Left side is newer +Tha an taobh clì nas ùire + +Right side is newer +Tha an taobh deas nas ùire + +Items have different content +Tha diofar susbaint sna nithean + +Both sides are equal +Tha an dà thaobh co-ionnann + +Conflict/item cannot be categorized +Tha còmhstri/nì ann nach urrainn dhuinn aithneachadh + +Copy new item to left +Cuir lethbhreac dhen nì ùr dhan taobh chlì + +Copy new item to right +Cuir lethbhreac dhen nì ùr dhan taobh deas + +Delete left item +Sguab às an nì air an taobh chlì + +Delete right item +Sguab às an nì air an taobh deas + +Move file on left +Gluais am faidhle a tha air an taobh chlì + +Move file on right +Gluais am faidhle a tha air an taobh deas + +Update left item + + +Update right item + + +Do nothing +Na dèan dad + +Update attributes on left +Ùraich na buadhan air an taobh chlì + +Update attributes on right +Ùraich na buadhan air an taobh deas + + +1 byte +%x bytes + + +%x byte +%x bytes +%x bytes +%x bytes + + +%x MB +%x MB + +%x KB +%x KB + +%x GB +%x GB + +Cannot load file %x. +Cha ghabh am faidhle %x a lorg. + +Database file %x is incompatible. +Chan eil am faidhle stòir-dhàta %x co-chòrdail. + +Initial synchronization: +A’ chiad sioncronachadh: + +Database file %x does not yet exist. +Chan eil am faidhle stòir-dhàta %x ann fhathast. + +Database file is corrupt: +Tha am faidhle stòir-dhàta coirbte: + +Cannot write file %x. +Cha ghabh am faidhle %x a sgrìobhadh. + +Cannot read file %x. +Cha ghabh am faidhle %x a leughadh. + +Database files do not share a common session. +Chan eil seisean an cumantas aig na faidhlichean stòir-dhàta. + +Searching for folder %x... +A’ lorg a’ phasgain %x... + +Cannot read file attributes of %x. +Cha ghabh buadhan an fhaidhle %x a leughadh. + +Cannot get process information. +Chan urrainn dhuinn greim fhaighinn air fiosrachadh a’ phròiseis. + +Waiting while directory is locked: +A’ feitheamh fhad ’s a thèid am pasgan a ghlasadh: + +Lock owner: +Glais an sealbhadair: + + +1 sec +%x sec + + +%x diog +%x dhiog +%x diogan +%x diog + + +Detecting abandoned lock... +A’ mothachadh ri glasan trèigte... + +Creating file %x +A’ cruthachadh an fhaidhle %x + +Saving file %x... + + +Items processed: +Nithean a tha deiseil: + +Items remaining: +Nithean a tha ri dhèanamh: + +Total time: +An ùine gu lèir: + +Error parsing file %x, row %y, column %z. +Mearachd le parsadh an fhaidhle %x, loidhne %y, colbh %z. + +Cannot set directory lock for %x. +Cha ghabh glas a’ phasgain airson %x a shuidheachadh. + +Scanning: +’Ga sganadh: + + +1 thread +%x threads + + +%x shnàithlean +%x shnàithlean +%x snàithleanan +%x snàithlean + + +/sec +/diog + +%x items/sec +%x nithean/diog + +Show in Explorer +Seall san taisgealaiche + +Open with default application +Fosgail leis an aplacaid bhunaiteach + +Browse directory +Rùraich am pasgan + +Cannot access the Volume Shadow Copy Service. +Chan fhaigh sinn cothrom air seirbheise lethbhreacan sgàil an draibh. + +Please use FreeFileSync 64-bit version to create shadow copies on this system. +Nach cleachd sibh an tionndadh 64 biot de FreeFileSync gus lethbhreacan-sgàile a chruthachadh air an t-siostam seo? + +Cannot determine volume name for %x. +Chan urrainn dhuinn ainm an draibh airson %x a dhearbhadh. + +Volume name %x is not part of file path %y. +Chan eil ainm an draibh %x ’na phàirt de shlighe an fhaodhle %y. + +Stop requested: Waiting for current operation to finish... +Dh’iarr thu oirnn sgur: A’ feitheamh ri crìoch na h-obrach làithreach... + +Unable to create time stamp for versioning: +Cha ghabh stampa ama a chruthachadh airson versioning: + +&Open... +F&osgail... + +Save &as... +Sàbhail &mar... + +E&xit + + +&File +&Faidhle + +&View help +&Faic a’ chobhair + +&About +&Mu dheidhinn + +&Help +&Cobhair + +Usage: +Cleachdadh: + +1. Select folders to watch. +1. Tagh na pasgain air an cumar sùil. + +2. Enter a command line. +2. Cuir a-steach àithne. + +3. Press 'Start'. +3. Briog air ”Tòisich”. + +To get started just import a .ffs_batch file. +Cha leig thu leas ach faidhle .ffs_batch ion-phortadh airson toiseach tòiseachaidh. + +Folders to watch: +Pasganan air an cumar sùil: + +Add folder +Cuir pasgan ris + +Remove folder +Thoir am pasgan air falbh + +Browse +Rùraich + +Select a folder +Tagh pasgan + +Idle time (in seconds): +Ùine ’na thàmh (ann an diogan): + +Idle time between last detected change and execution of command +An tàmh eadar an t-atharrachadh mu dheireadh agus gnìomhachadh na h-àithne + +Command line: +Loidhne-àithne: + + +The command is triggered if: +- files or subfolders change +- new folders arrive (e.g. USB stick insert) + + +Thèid an loidhne-àithne a chur gu dol: +- ma dh’atharraicheas faidhlichean no fo-phasgain +- ma nochdas pasgain ùra (m.e. ma chuireas tu a-steach bioran USB) + + +&Start +Tòi&sich + +About +Mu dheidhinn + +Build: %x +Build: %x + +All files +Gach faidhle + +Automated Synchronization +Sioncronachadh fèin-obrachail + +Directory monitoring active +Tha na pasganan ’gam marasgladh + +Waiting until all directories are available... +A’ feitheamh gus am bi gach pasgan ri làimh... + +Error +Mearachd + +&Restore +&Aisig + +&Show error +&Seall a’ mhearachd + +&Quit +&Fàg + +Incorrect command line: +Loidhne-àithne chearr: + +&Retry +&Feuch ris a-rithist + +File content +Susbaint an fhaidhle + +File time and size +Ceann-là is meud + +Two way +An dà chomhair + +Mirror +Sgàthanaich + +Update +Ùraich + +Custom +Gnàthaichte + +Multiple... +Iomadh fear... + +Moving file %x to %y +A’ gluasad an fhaidhle %x gu %y + +Moving folder %x to %y +A’ gluasad a’ phasgain %x gu %y + +Moving symbolic link %x to %y +A’ gluasad an symbolic link %x gu %y + +Removing old versions... +A’ toirt air falbh nan seann tionndaidhean... + +Creating symbolic link %x +A’ cruthachadh an symbolic link %x + +Creating folder %x +A’ cruthachadh a’ phasgain %x + +Updating file %x + + +Updating symbolic link %x + + +Verifying file %x +A’ dearbhadh an fhaidhle %x + +Updating attributes of %x +Ag ùrachadh buadhan %x + +Creating a Volume Shadow Copy for %x... +A’ cruthachadh lethbhreac sgàil draibh airson %x... + +Data verification error: %x and %y have different content. +Mearachd le dearbhadh an dàta: tha susbaint eadar-dhealaichte ann an %x agus %y. + +Target folder %x already existing. +Tha am pasgan-uidhe %x ann mu thràth. + +Cannot find folder %x. +Chan urrainn dhuinn am pasgan %x a lorg + +Target folder input field must not be empty. +Chan fhaod raon a’ phasgain a bhith falamh. + +Source folder %x not found. +Cha deach am pasgan tùsail %x a lorg. + +Please enter a target folder for versioning. +Cuir a-steach pasgan-targaide a chum versioning. + +The following items have unresolved conflicts and will not be synchronized: +Tha còmstrithean aig na nithean a leanas fhathast is cha dèid an sioncronachadh: + +The following folders are significantly different. Make sure you are matching the correct folders for synchronization. +Tha diofar mòr eadar na pasganan a leanas. Dèan cinnteach gu bheil thu a’ maidseadh nam pasganan ceart airson sioncronachadh. + +Not enough free disk space available in: +Chan eil rùm saor gu leòr air an diosga: + +Required: +Na tha feum air: + +Available: +Na tha ri làimh: + +Multiple folder pairs write to a common subfolder. Please review your configuration. +Tha grunnan a phaidhrichean phasganan a’ sgrìobhadh anns an aon fho-phasgan. Thoir sùil air an rèiteachadh + +Synchronizing folder pair: +A’ sioncronachadh paidhir nam pasgan: + +Generating database... +A’ gintinn an stòir-dhàta... + +job name +ainm na h-obrach + +Synchronization stopped +Sguireadh dhen t-sioncronachadh + +Synchronization completed with errors +Chaidh an sioncronachadh a choileanadh ach bha mearachdan ann + +Synchronization completed with warnings +Chaidh a shioncronachadh ach bha rabhaidhean ann + +Nothing to synchronize +Chan eil dad ri shioncronachadh + +Synchronization completed successfully +Chaidh a shioncronachadh + +Cleaning up old log files... + + +Stopped +Chaidh stad a chur air + +You can switch to FreeFileSync's main window to resolve this issue. +’S urrainn dhut leum a ghearradh gu prìomh-uinneag FreeFileSync gus an duilgheadas seo fhuasgladh. + +&Don't show this warning again +Na seall an rabha&dh seo a-rithist + +&Ignore +&Leig seachad + +&Switch +&Dèan suids + +Switching to FreeFileSync's main window +A’ gearradh leum gu prìomh-uinneag FreeFileSync + + +Automatic retry in 1 second... +Automatic retry in %x seconds... + + +A’ feuchainn ris às ùr gu fèin-obrachail ann an %x diog... +A’ feuchainn ris às ùr gu fèin-obrachail ann an %x dhiog... +A’ feuchainn ris às ùr gu fèin-obrachail ann an %x diogan... +A’ feuchainn ris às ùr gu fèin-obrachail ann an %x diog... + + +&Ignore subsequent errors +Le&ig seachad mearachdan às a dhèidh seo + +Retrying operation... +A’ feuchainn ris a-rithist... + +Serious Error +Mearachd mhòr + +Check for Program Updates +Thoir sùil ach a bheil ùrachadh ann airson a’ phrògraim + +A new version of FreeFileSync is available: +Tha tionndadh ùr de FreeFileSync ann: + +Download now? +A bheil thu airson a luchdadh a-nuas an-dràsta? + +&Download +&Luchdaich a-nuas + +FreeFileSync is up to date. +Tha FreeFileSync cho ùr ’s a ghabhas. + +Unable to connect to FreeFileSync.org. + + +Cannot find current FreeFileSync version number online. Do you want to check manually? +Chan urrainn dhuinn àireamh an tionndaidh làithrich aig FreeFileSync a lorg air loidhne. A bheil thu airson sùil a thoirt thu fhèin? + +&Check +&Sgrùd + +Symlink +Symlink + +Folder +Pasgan + +Full path +Slighe shlan + +Name +Ainm + +Relative folder +Pasgan dàimheach + +Base folder +Bun-phasgan + +Size +Meud + +Date +Ceann-là + +Extension +Leudachan + +Category +Roinn seòrsa + +Action +Gnìomh + +Drag && drop +Slaod ⁊ leig às + +Local comparison settings +Roghainnean coimeis ionadail + +Local synchronization settings +Roghainnean sioncronachaidh ionadail + +Local filter +Criathrag ionadail + +Active +Gnìomhach + +None +Chan eil gin + +Remove local settings +Thoir air falbh na roghainnean ionadail + +Clear local filter +Falamhaich a’ chriathrag iondail + +Copy +Dèan lethbhreac + +Paste +Cuir ann + +Local Synchronization Settings +Roghainnean sioncronachaidh ionadail + +&New +Ù&r + +&Save +&Sàbhail + +Save as &batch job... +Sàbhail mar obair &baidse... + +Start &comparison +Tòisich air a’ &choimheas + +C&omparison settings + + +&Filter settings + + +S&ynchronization settings + + +Start &synchronization +Tòisich air an t-&sioncronachadh + +&Actions + + +&Options +R&oghainnean + +&Language +&Cànan + +&Find... +L&org... + +&Reset layout +&Ath-shuidhich a’ cho-dhealbhachd + +&Export file list... +Às-p&hortaich liosta nam faidhle... + +&Tools +&Innealan + +&Check for new version +Thoir sùil a&ch a bheil tionndadh ùr ann + +&Check now +&Thoir sùil an-dràsta + +Check &automatically once a week +Thoir sùil gu &fèin-obrachail turas san t-seachdain + +Cancel +Sguir dheth + +Compare +Dèan coimeas + +Synchronize +Dèan sioncronachadh + +Add folder pair +Cuir paidhir de phasgain ris + +Remove folder pair +Thoir air falbh am paidhir seo de phasgain + +Swap sides +Cuir an dà thaobh an àite a chèile + +Close search bar +Dùin bàr an luirg + +Find: +Lorg: + +Match case +An aire do litrichean mòra ’s beaga + +New +Ùr + +Open... +Fosgail... + +Save +Sàbhail + +Save as... +Sàbhail mar... + +View type: +Seall an seòrsa: + +Select view: +Tagh an seòrsa: + +Statistics: +Stats: + +Number of files and folders that will be deleted +Àireamh nam faidhle ’s nam pasgan a thèid a sguabadh às + +Number of files that will be updated + + +Number of files and folders that will be created +Àireamh nam faidhle ’s nam pasgan a thèid a chruthachadh + +Total bytes to copy +Co mheud baidht a thèid lethbhreac a dhèanamh dhiubh + +Use local settings: +Cleachd na roghainnean ionadail + +Select a variant: +Tagh eug-samhail: + +Identify equal files by comparing modification time and size. +Lorg faidhlichean a tha co-ionnann le bhith a’ dèanamh coimeas eadar an cuid meud is ama. + +Identify equal files by comparing the file content. +Lorg faidhlichean a tha co-ionnann le bhith a’ dèanamh coimeas eadar susbaint nam faidhlichean. + +Ignore time shift (in hours) +Leig seachad sioft an ama (ann an uairean a thìde) + +Consider file times with specified offset as equal +Làimhsich amannan fhaidhlichean aig a bheil an offset sin mar gum biodh iad co-ionnann + +Handle daylight saving time +Aire ri tìde an t-samhraidh + +Include symbolic links: + + +Direct +Dìreach + +Follow +Lean + +More information +Barrachd fiosrachaidh + +Local settings: +Roghainnean ionadail + +Include: +Gabh a-staigh: + +Exclude: +Dùin a-mach: + +Show examples +Seall buill-eisimpleir + +Time span: +An rainse ama: + +File size: +Meud an fhaidhle: + +Minimum: +Air a’ char as lugha: + +Maximum: +Air a’ char as motha: + +Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. +Tagh riaghailteach criathraidh gus seòrsachan àraidh de dh’fhaidhlichean fhàgail às an t-sioncronachadh. Cuir a-steach slighean fhaidhlichean a-rèir paidhir an dà phasgan aca. + +C&lear +Fala&mhaich + +Detect moved files +Mothaich do dh’fhaidhlichean a chaidh a ghluasad + + +- Detection active after initial sync +- Requires and creates database files +- Not supported by all file systems + + + +Detect synchronization directions with the help of database files +Mothaich do chomhair an t-sioncronachaidh le taic o fhaidhlichean stòir-dhàta + +Delete files: +Sguab às na faidhlichean: + +&Permanent +&Buan + +Delete or overwrite files permanently +Sguab às no sgrìobh thairis air faidhlichean gu buan + +&Recycle bin +A&m biona + +Back up deleted and overwritten files in the recycle bin +Dèan lethbhreac-glèidhidh de dh’fhaidhlichean sa bhiona a chaidh a sguabadh às no a chaidh sgrìobhadh thairis orra + +&Versioning +&Versioning + +Move files to a user-defined folder +Gluais na faidhlichean gu àite a shònraich an cleachdaiche + +Naming convention: +Gnàthas nan ainmean: + +Handle errors: +Mearachdan làimhseachaidh: + +Hide all error and warning messages +Falaich gach teachdaireachd mu mhearachdan no rabhaidhean + +&Pop-up +&Priob-uinneag + +Show pop-up on errors or warnings +Seall priob-uinneagan a thaobh mhearachdan no rabhaidhean + +On completion: +An dèidh coileanaidh: + +OK +Ceart ma-thà + +Start synchronization now? +A bheil thu airson tòiseachadh air an t-sioncronachadh an-dràsta? + +Variant: +Eug-samhail: + +&Don't show this dialog again +&Na seall an còmhradh seo a-rithist + +Items found: +Rudan a chaidh a lorg: + +Time remaining: +An ùine a tha air fhàgail: + +Time elapsed: +An ùine a dh’fhalbh: + +Synchronizing... +A’ sioncronachadh... + +Minimize to notification area +Lùghdach ’s gluais gu raon nam brathan + +Bytes copied: +Bytes a chaidh lethbhreac a dhèanamh dhiubh + +Close +Dùin + +&Pause +&Cuir ’na stad + +Stop +Sguir dheth + +Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x +Cruthaich faidhle batch airson sioncronachadh a dh’obraicheas gun thusa a bhith an làthair. Gus a thòiseachadh, dèan briogadh dùbailte air an fhaidhle seo ann am planadair shaothraichean: %x + +&Stop +&Sguir dheth + +Stop synchronization at first error +Sguir dhen t-sioncronachadh aig a’ chiad mhearachd + +Run minimized +Ruith e sa mhodh lùghdaichte + +Save log: +Sàbhail an loga: + +Limit: +Crìoch: + +Limit maximum number of log files +Cuingich an àireamh as motha de dh’fhaidhlichean an loga + +How can I schedule a batch job? +Ciamar a chuireas mi obair baidse air an sgeideal? + +The following settings are used for all synchronization jobs. +Thèid na roghainnean a leanas a chleachdadh airson a h-uile obair sioncronachaidh. + +Fail-safe file copy +Dèan lethbhreac nach gabh fàilligeadh + + +Copy to a temporary file (*.ffs_tmp) before overwriting target. +This guarantees a consistent state even in case of a serious error. + + +Cuir lethbhreac dheth ann am faidhle sealach (*.ffs_tmp) mus sgrìobhar thairis air an targaid. +Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. + + +(recommended) +(mholamaid seo) + +Copy locked files +Dèan lethbhreac de dh’fhaidhlichean glaiste + +Copy shared or locked files using the Volume Shadow Copy Service. +Dèan lethbhreac de dh’fhaidhlichean co-roinnte no glaiste le seirbheis lethbhreacan sgàil an draibh. + +(requires administrator rights) +(feumaidh seo còraichean rianadair) + +Copy file access permissions +Dèan lethbhreac de cheadan-inntrigidh nam faidhle + +Transfer file and folder permissions. +Tar-chuir am faidhle ’s ceadan a’ phasgain + +Automatic retry on error: +Feuch ris a-rithist gu fèin-obrachail ri linn mearachd: + +Retry count: +Co mheud turas a dh’fheudadh ris a-rithist: + +Delay (in seconds): +An dàil (ann an diogan): + +Customize context menu: +Gnàthaich an clàr-taice co-theacsail + +Description +Tuairisgeul + +Show hidden dialogs again +Seall na còmraidhean falaichte a-rithist + +Show all permanently hidden dialogs and warning messages again +Seall na còmraidhean is rabhaidhean falaichte uile a-rithist + +&Default +&Bun-roghainn + +Source code written in C++ using: +Chaidh an còd tùsail a sgrìobhadh ann an C++ le taic: + +If you like FreeFileSync +Ma tha FreeFileSync a’ còrdadh riut + +Donate with PayPal +Nach doir sibh tabhartas le PayPal? + +Feedback and suggestions are welcome +Tha sinn a’ cur fàilte mhòr air beachd is moladh sam bith + +Homepage +An duilleag-dhachaigh + +Email +Post-d + +Published under the GNU General Public License +Air fhoillseachadh fo GNU General Public License + +Many thanks for localization: +Tha sinn fada an comain nan daoine a leanas airson eadar-theangachadh: + +Save as Batch Job +Sàbhail mar obair baidse + +Delete Items +Sguab às na nithean + +Options +Roghainnean + +Select Time Span +Tagh an rainse ama + +&Preferences... +&Roghainnean + +Folder Pairs +Paidhrichean nam pasganan + +Find +Lorg + +View Settings +Seall na roghainnean + +Configuration +Rèiteachadh + +Overview +Foir-shealladh + +Main Bar +Am prìomh-bhàr + +Confirm +Dearbh + + +Do you really want to execute the command %y for one item? +Do you really want to execute the command %y for %x items? + + +A bheil thu cinnteach gu bheil thu airson an àithne seo (%y) a ruith air %x nì? +A bheil thu cinnteach gu bheil thu airson an àithne seo (%y) a ruith air %x nì? +A bheil thu cinnteach gu bheil thu airson an àithne seo (%y) a ruith air %x nithean? +A bheil thu cinnteach gu bheil thu airson an àithne seo (%y) a ruith air %x nì? + + +&Execute +&Cuir an gnìomh + + +1 directory +%x directories + + +%x phasgan +%x phasgan +%x pasgain +%x pasgan + + + +1 file +%x files + + +%x fhaidhle +%x fhaidhle +%x faidhlichean +%x faidhle + + + +Showing %y of 1 row +Showing %y of %x rows + + +A’ sealltainn %y à %x ràgh +A’ sealltainn %y à %x ràgh +A’ sealltainn %y à %x ràghan +A’ sealltainn %y à %x ràgh + + +Set direction: +Suidhich a’ chomhair: + +multiple selection +Ioma-thaghadh + +Include via filter: +Gach a-steach slighe na criathraige: + +Exclude via filter: +Dùin a-mach le criathrag: + +Include temporarily +Gabh a-steach gu sealach + +Exclude temporarily +Dùin a-mach gu sealach + +Delete +Sguab às + +Include all +Gabh a-steach na h-uile + +Exclude all +Dùin a-mach na h-uile + +Show icons: +Meud nan ìomhaigheagan: + +Small +Beag + +Medium +Meadhanach + +Large +Mòr + +Select time span... +Tagh an raon-ama... + +Show "%x" +Seall “%x” + +Last session +An seisean mu dheireadh + +Folder Comparison and Synchronization +Coimeas eadar na pasgain is sioncronachadh + +Configuration saved +Chaidh an rèiteachadh a shàbhaladh + +FreeFileSync batch +FreeFileSync batch + +Do you want to save changes to %x? +An sàbhail sinn dhut na h-atharraichean air %x? + +Never save &changes +Na sàbhail atharrai&chean idir + +Do&n't save +&Na sàbhail + +Delete selected configurations +Sguab às na rèiteachaidhean a thagh thu + +Synchronization Settings +Roghainnean an t-sioncronachaidh + +Clear filter +Falamhaich a’ chriathrag + +Show files that exist on left side only +Na seall ach faidhlichean a tha air an taobh chlì a-mhàin + +Show files that exist on right side only +Na seall ach faidhlichean a tha air an taobh deas a-mhàin + +Show files that are newer on left +Seall faidhlichean a tha nas ùire air an taobh chlì + +Show files that are newer on right +Seall faidhlichean a tha nas ùire air an taobh deas + +Show files that are equal +Seall faidhlichean a tha co-ionnann + +Show files that are different +Seall faidhlichean a tha eadar-dhealaichte + +Show conflicts +Seall còmhstrithean + +Show files that will be created on the left side +Seall faidhlichean a thèid a chruthachadh air an taobh chlì + +Show files that will be created on the right side +Seall faidhlichean a thèid a chruthachadh air an taobh deas + +Show files that will be deleted on the left side +Seall faidhlichean a thèid a sguabadh às air an taobh chlì + +Show files that will be deleted on the right side +Seall faidhlichean a thèid a sguabadh às air an taobh deas + +Show files that will be updated on the left side + + +Show files that will be updated on the right side + + +Show files that won't be copied +Seall faidhlichean nach dèid lethbhreac a dhèanamh dhiubh + +Show filtered or temporarily excluded files +Seall faidhlichean a tha ’gan dùnadh a-mach no air an criathradh a-mach an-dràsta fhèin + +Set as default +Suidhich mar a’ bhun-roghainn + +Filter +Criathrag + +All files are in sync +Tha gach faidhle sioncronaichte + +Cannot find %x +Chan urrainn dhuinn %x a lorg. + +Comma-separated values +Luachan le cromagan eatarra + +File list exported +Chaidh liosta nam faidhle às-phortadh + +Searching for program updates... +A’ lorg ùrachaidhean a’ phrògraim... + +Close progress dialog +Dùin còmhradh an adhartais + +Standby +Cuir ’na fhuireachas + +Log off +Clàraich a-mach + +Shut down +Dùin sìos an siostam + +Hibernate +Geamhraich + +Scanning... +’Ga sganadh... + +Comparing content... +A’ dèanamh coimeas eadar an cuid susbaint... + +Info +Fiosrachadh + +Warning +Rabhadh + +Select all +Tagh na h-uile + +Paused +’Na stad + +Initializing... +A’ tòiseachadh... + +Completed +Deiseil + +&Continue +Lean air adhar&t + +Progress +Adhartas + +Log +Logaich + + +Do you really want to move the following item to the recycle bin? +Do you really want to move the following %x items to the recycle bin? + + +A bheil thu cinnteach gu bheil thu airson an %x nì seo a chur dhan bhiona? +A bheil thu cinnteach gu bheil thu airson an %x nì seo a chur dhan bhiona? +A bheil thu cinnteach gu bheil thu airson na %x nithean seo a chur dhan bhiona? +A bheil thu cinnteach gu bheil thu airson an %x nì seo a chur dhan bhiona? + + +Move +Gluais + + +Do you really want to delete the following item? +Do you really want to delete the following %x items? + + +A bheil thu cinnteach gu bheil thu airson an %x nì seo a sguabadh às? +A bheil thu cinnteach gu bheil thu airson na %x nì seo a sguabadh às? +A bheil thu cinnteach gu bheil thu airson na %x nithean seo a sguabadh às? +A bheil thu cinnteach gu bheil thu airson na %x nì seo a sguabadh às? + + +Preferences +Roghainnean + +Copy NTFS permissions +Dèan lethbhreac de cheadan NTFS + +Integrate external applications into context menu. The following macros are available: +Amalaichidh seo aplacaidean air an taobh a-muigh dhan chlàr-taice cho-theacsail. Tha na macrothan a leanas ri làimh: + +- full file or folder name +- ainm slàn dhen fhaidhle no dhen phasgan + +- folder part only +- cuid a’ phasgain a-mhàin + +- Other side's counterpart to %item_path% +- Seise %item_folder% aig a’ choimpiutair eile + +- Other side's counterpart to %item_folder% +- Seise %item_folder% aig a’ choimpiutair eile + +Show hidden dialogs and warning messages again? +A bheil thu airson na còmhraidhean is rabhaidhean falaichte a shealltainn a-rithist? + +&Show +&Seall + +Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database. +Lorg is sìolaich na h-atharraichean air an dà thaobh. Mothaichidh sinn do rudan a chaidh a sguabadh às, a ghluasad no còmhstrithean gu fèin-obrachail le stòr-dàta. + +Create a mirror backup of the left folder by adapting the right folder to match. +Cruthaich lethbhreac-glèidhidh sgàthanaichte dhen phasgan air an taobh clì ’s am pasgan air an taobh deas ’ga atharrachadh d’ a rèir. + +Copy new and updated files to the right folder. +Cuir lethbhreac de dh’fhaidhlichean ùra ’s ùraichte dhan phasgan air an taobh deas. + +Configure your own synchronization rules. +Sònraich riaghailtean sioncronachaidh thu fhèin. + +Today +An-diugh + +This week +An t-seachdain seo + +This month +Am mìos seo + +This year +Am bliadhna + +Last x days +Na x làithean seo chaidh + +Byte +Baidht + +KB +KB + +MB +MB + +Replace +Cuir ’na àite + +Move files and replace if existing +Gluais na faidhlichean ’s cuir iad an àite na feadhainn làithreach ma tha gin ann + +Time stamp +Stampa ama + +Append a time stamp to each file name +Cuir stampa ama ri gach ainm faidhle + +Comparison +Coimeas + +Synchronization +Sioncronachadh + +Leave as unresolved conflict +Fàg mar còmhstri gun rèiteachadh + +File +Faidhle + +YYYY-MM-DD hhmmss +BBBB-MM-LL uummdd + +Files +Faidhlichean + +Items +Nithean + +Percentage +Ceudad + +Cannot monitor directory %x. +Chan urrainn dhuinn sùil a chumail air %x. + +Cannot delete file %x. +Cha ghabh am faidhle %x a sguabadh às. + +The file is locked by another process: +Tha am faidhle glaiste aig pròiseas eile: + +Cannot move file %x to %y. +Cha ghabh am faidhle %x a ghluasad dha %y. + +Cannot delete directory %x. +Cha ghabh am pasgan %x a sguabadh às. + +Cannot write file attributes of %x. +Chan urrainn dhuinn buadhan an fhaidhle %x a sgrìobhadh. + +Cannot write modification time of %x. +Cha ghabh àm atharrachaidh %x a sgrìobhadh. + +Cannot read security context of %x. +Cha ghabh susbaint tèarainteachd %x a leughadh. + +Cannot write security context of %x. +Cha ghabh susbaint tèarainteachd %x a sgrìobhadh. + +Cannot read permissions of %x. +Cha ghabh ceadan %x a leughadh. + +Cannot write permissions of %x. +Cha ghabh ceadan %x a sgrìobhadh. + +Cannot create directory %x. +Cha ghabh am pasgan %x a chruthachadh. + +Cannot copy symbolic link %x to %y. + + +Cannot find system function %x. +Chan urrainn dhuinn foincsean an t-siostaim %x a lorg. + +Cannot copy file %x to %y. +Cha ghabh lethbhreac an fhaidhle %x a chur gu %y. + +Type of item %x is not supported: +Chan eil taic ri nì dhen t-seòrsa %x: + +Cannot resolve symbolic link %x. +Cha ghabh an symbolic link %x fhuasgladh. + +Cannot open directory %x. +Cha ghabh am pasgan %x fhosgladh. + +Cannot enumerate directory %x. +Cha ghabh am pasgan %x àireamhachadh. + +%x TB +%x TB + +%x PB +%x PB + + +1 min +%x min + + +%x mhionaid +%x mhionaid +%x mionaidean +%x mionaid + + + +1 hour +%x hours + + +%x uair a thìde +%x uair a thìde +%x uairean a thìde +%x uair a thìde + + + +1 day +%x days + + +%x latha +%x latha +%x làithean +%x latha + + +Unable to register to receive system messages. +Chan urrainn dhuinn clàradh gus teachdaireachdan an t-siostaim fhaighinn. + +Cannot set privilege %x. +Cha ghabh a’ phribhleid %x a shuidheachadh. + +Unable to suspend system sleep mode. +Chan urrainn dhuinn modh cadal an t-siostaim a chur dheth. + +Cannot change process I/O priorities. +Chan urrainn dhuinn na prìomhachasan I/O atharrachadh. + +Unable to move %x to the recycle bin. +Cha ghabh %x a ghluasad dhan bhiona. + +Checking recycle bin failed for folder %x. +Dh’fhàillig sgrùdadh a’ bhiona airson a’ phasgain %x. + +Cannot determine final path for %x. +Chan urrainn dhuinn an t-slighe dheireannach airson %x a dhearbhadh. + +Error Code %x: +Còd na mearachd %x: + +Cannot read the following XML elements: +Chan urrainn dhuinn na h-eileamaidean XML a leanas a leughadh: + +Configuration file %x loaded partially only. +Cha deach faidhle an rèiteachaidh %x a luchdadh gu tur. + +Prepare installation + + +Choose which components you want to install. + + +Select installation type: + + +Local + + +Portable + + +recommended + + +Save settings to "%APPDATA%\FreeFileSync" + + +Register FreeFileSync file extensions + + +Create Explorer context menu entries + + +Save settings in installation directory + + +Do not write to Registry + + +Just copy the files + + +Choose a directory for installation: + + +Create shortcuts: + + +Desktop + + +Start menu + + +Registering FreeFileSync file extensions + + +Unregistering FreeFileSync file extensions + + +FreeFileSync Configuration + + +FreeFileSync Batch File + + +FreeFileSync Synchronization Database + + +RealtimeSync Configuration + + +Edit with FreeFileSync + + diff --git a/FreeFileSync/Build/Languages/outdated/slovenian.lng b/FreeFileSync/Build/Languages/outdated/slovenian.lng new file mode 100644 index 00000000..be8afc55 --- /dev/null +++ b/FreeFileSync/Build/Languages/outdated/slovenian.lng @@ -0,0 +1,1664 @@ +
      + Slovenščina + Matej Badalič, Tine Mlakar + sl_SI + flag_slovenia.png + 4 + n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3 +
      + +Both sides have changed since last synchronization. +Obe strani sta se spremenili od zadnje sinhronizacije. + +Cannot determine sync-direction: +Ne morem določiti sinhronizacijske smeri. + +No change since last synchronization. +Ni sprememb od zadnje sinhronizacije. + +The database entry is not in sync considering current settings. +Glede na trenutne nastavitve vnos v podatkovni bazi ni sinhroniziran. + +Setting default synchronization directions: Old files will be overwritten with newer files. +Nastavljanje privzetih smeri sinhronizacije: Stare datoteke bodo prepisane z novimi datotekami. + +Checking recycle bin availability for folder %x... +Preverjam razpoložljivost koša za mapo %x... + +Moving file %x to the recycle bin +Premikam datoteko %x koš + +Moving folder %x to the recycle bin +Premikam imenik %x v koš + +Moving symbolic link %x to the recycle bin +Premikam simbolično povezavo %x v koš + +Deleting file %x +Brisanje datoteke %x + +Deleting folder %x +Brisanje mape %x + +Deleting symbolic link %x +Brisanje simboličnih povezav %x + +The recycle bin is not available for the following folders. Files will be deleted permanently instead: +Za sledeče imenike koš ni na voljo. Datoteke bodo namesto tega dokončno izbrisane: + +An exception occurred +Zgodila se je napaka + +A directory path is expected after %x. +Za %x se pričakuje pot do imenika. + +Syntax error +Sintaktična napaka + +Cannot open file %x. +Ne morem odpreti datoteke %x. + +File %x does not contain a valid configuration. +Datoteka %x ne vsebuje veljavnih nastavitev + +Unequal number of left and right directories specified. +Vnešeno je neenako število levih in desnih imenikov. + +The config file must not contain settings at directory pair level when directories are set via command line. +Konfiguracijska datoteka ne sme vsebovati nastavitev na ravni imeniških parov, če so imeniki nastavljeni prek ukazne vrstice. + +Directories cannot be set for more than one configuration file. +Imeniki ne morejo biti nastavljeni za eč kot eno konfiguracijsko datoteko. + +Command line +Ukazna vrstica + +Syntax: +Sintaksa: + +global config file: +datoteka z globalnimi konfiguracijami + +config files: +konfiguracijske datoteke: + +directory +imenik + +Path to an alternate GlobalSettings.xml file. +Pot do alternativne datoteke GlobalSettings.xml. + +Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files. +Poljubno število FreeFileSync .ffs_gui in/ali .ffs_batch konfigracijskih datotek. + +Any number of alternative directory pairs for at most one config file. +Poljubno število alternativnih parov imenikov za največ eno nastavitveno datoteko. + +Open configuration for edit without executing. + + +Cannot find the following folders: +Ne morem najti naslednjih map: + +You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization. +To napako, ki smatra vsako mapo kot prazno, lahko ignorirate. Mape bodo potem samodejno ustvarjene med sinhronizacijo. + +A folder input field is empty. +Vnosno polje za mapo je prazno. + +The corresponding folder will be considered as empty. +Ustrezajoča mapa bo smatrana kot prazna. + +The following folder paths are dependent from each other: +Naslednje poti imenikov so med seboj odvisne: + +File %x has an invalid date. +Datoteka %x ima neveljaven datum. + +Date: +Datum: + +Files %x have the same date but a different size. +Datoteki %x imata enak datum ampak različno velikost. + +Size: +Velikost: + +Content comparison was skipped for excluded files %x. +Za izločene datoteke %x je bila primerjava vsebine izpuščena + +Items differ in attributes only +Elementi se razlikujejo samo v atributih + +Resolving symbolic link %x +Razrešujem simbolično povezavo %x + +Comparing content of files %x +Primerjam vsebino datotek %x + +Generating file list... +Ustvarjam seznam datotek... + +Starting comparison +Začenjam primerjavo + +Calculating sync directions... +Preračunavam sinhronizacijske smeri... + +Out of memory. +Zmanjkalo pomnilnika. + +Item exists on left side only +Element obstaja samo na levi strani + +Item exists on right side only +Element obstaja samo na desni strani + +Left side is newer +Leva stran je novejša + +Right side is newer +Desna stran je novejša + +Items have different content +Elementi imajo različno vsebino + +Both sides are equal +Obe strani sta enaki + +Conflict/item cannot be categorized +Spor/element ne more biti kategoriziran + +Copy new item to left +Kopiraj nov element na levo + +Copy new item to right +Kopiraj nov element na desno + +Delete left item +Izbriši levi element + +Delete right item +Izbriše desni element + +Move file on left +Premakni datoteko na levo + +Move file on right +Premakni datoteko na desno + +Update left item + + +Update right item + + +Do nothing +Ne naredi ničesar + +Update attributes on left +Posodobi atribute na levi + +Update attributes on right +Posodobi atribute na desni + + +1 byte +%x bytes + + +%x bajt +%x bajta +%x bajti +%x bajtov + + +%x MB +%x MB + +%x KB +%x KB + +%x GB +%x GB + +Cannot load file %x. +Ne morem naložiti datoteko %x. + +Database file %x is incompatible. +Datoteka podatkovne baze %x je nekompatibilna. + +Initial synchronization: +Začetna sinhronizacija: + +Database file %x does not yet exist. +Datoteka podatkovne baze %x še ne obstaja. + +Database file is corrupt: +Datoteka podatkovne baze je poškodovana: + +Cannot write file %x. +Ne morem zapisati datoteke %x. + +Cannot read file %x. +Ne morem prebrati datoteke %x. + +Database files do not share a common session. +Datoteke podatkovne baze si ne delijo skupne seje. + +Searching for folder %x... +Iskanje mape %x... + +Cannot read file attributes of %x. +Ne morem brati datotečnih atributov od %x. + +Cannot get process information. +Ne morem pridobiti informacij o procesu. + +Waiting while directory is locked: +Čakam dokler je imenik zaklenjen: + +Lock owner: +Lastnik zaklepa: + + +1 sec +%x sec + + +%x sek +%x sek +%x sek +%x sek + + +Detecting abandoned lock... +Zaznavanje opuščenega zaklepa... + +Creating file %x +Ustvarjam datoteko %x + +Saving file %x... + + +Items processed: +Obdelanih elementov: + +Items remaining: +Preostalih elementov: + +Total time: +Celoten čas: + +Error parsing file %x, row %y, column %z. +Napaka pri razčlenjevanju datoteke %x, vrstica %y, stolpec %z. + +Cannot set directory lock for %x. +Ne morem nastaviti zaklepanja imenikov za %x. + +Scanning: +Pregledujem: + + +1 thread +%x threads + + +%x nit +%x niti +%x niti +%x niti + + +/sec +/sek + +%x items/sec +%x elementov/s + +Show in Explorer +Prikaži v Raziskovalcu + +Open with default application +Odpri s privzeto aplikacijo + +Browse directory +Brskaj po imeniku + +Cannot access the Volume Shadow Copy Service. +Ne morem dostopati do Volume Shadov Copy servisa. + +Please use FreeFileSync 64-bit version to create shadow copies on this system. +Prosimo uporabite 64-bitno različico FreeFileSync za ustvarjanje senčnih kopij na tem sistemu. + +Cannot determine volume name for %x. +Ne morem določiti ime nosilca za %x. + +Volume name %x is not part of file path %y. +Ime nosilca %x ni del poti datoteke %y. + +Stop requested: Waiting for current operation to finish... +Zahteva za ustavitev: Čakam da se trenutni proces zaključi... + +Unable to create time stamp for versioning: +Časovnega žiga za verzioniranje ni bilo mogoče ustvariti: + +&Open... +&Odpri... + +Save &as... +Shr&ani kot... + +E&xit + + +&File +&Datoteka + +&View help +&Prikaži pomoč + +&About +&O programu + +&Help +&Pomoč + +Usage: +Uporaba: + +1. Select folders to watch. +1. Izberite imenike za opazovanje + +2. Enter a command line. +2. Vnesite ukazno-vrstico. + +3. Press 'Start'. +3. Pritisnite 'Začni'. + +To get started just import a .ffs_batch file. +Da začnete uvozite datoteko .ffs_batch + +Folders to watch: +Imeniki za pregled: + +Add folder +Dodaj imenik + +Remove folder +Odstrani v imenik + +Browse +Brskaj + +Select a folder +Izberite imenik + +Idle time (in seconds): +Nedejavni čas (v sekundah): + +Idle time between last detected change and execution of command +Čas nedejavnosti med zadnjo zaznano spremembo in izvršitvijo ukaza + +Command line: +Ukazna vrstica: + + +The command is triggered if: +- files or subfolders change +- new folders arrive (e.g. USB stick insert) + + +Ukaz se sproži če: +- se spremenijo datoteke ali podmape +- pridejo nove mape (npr. ob vstavitvi USB ključka) + + +&Start +&Zaženi + +About +O programu(1) + +Build: %x +Izgradnja: %x + +All files +Vse datoteke + +Automated Synchronization +Avtomatska sinhnorizacija + +Directory monitoring active +Nadzor imenikov je aktven + +Waiting until all directories are available... +Čakam da so vsi imeniki dostopni... + +Error +Napaka + +&Restore +&Obnovi + +&Show error +&Pokaži napako + +&Quit +&Zapri + +Incorrect command line: +Napačna ukazna vrstica: + +&Retry +&Ponovi + +File content +Vsebina datoteke + +File time and size +Čas in velikost datoteke + +Two way +Obojesmerno + +Mirror +Zrcalno + +Update +Posodobi + +Custom +Po meri + +Multiple... +Večkratno... + +Moving file %x to %y +Premikam datoteko %x v %y + +Moving folder %x to %y +Premikam mapo %x v %y + +Moving symbolic link %x to %y +Premikam simbolično povezavo %x v %y + +Removing old versions... +Odstranjujem stare različice... + +Creating symbolic link %x +Ustvarjam simbolično povezavo %x + +Creating folder %x +Ustvarjam mapo %x + +Updating file %x + + +Updating symbolic link %x + + +Verifying file %x +Preverjam datoteko %x + +Updating attributes of %x +Posodabljam atribute od %x + +Creating a Volume Shadow Copy for %x... +Ustvarjam Volume Shadow Copy za %x... + +Data verification error: %x and %y have different content. +Napaka pri preverjanju podatkov: %x in %y imata drugačno vsebino. + +Target folder %x already existing. +Ciljna mapa %x že obstaja. + +Cannot find folder %x. +Ne najdem mape %x. + +Target folder input field must not be empty. +Vnosno polje za ciljno mapo ne sme biti prazno. + +Source folder %x not found. +Izvorna mapa %x se ne najde. + +Please enter a target folder for versioning. +Prosimo vnesite ciljno mapo za verzioniranje. + +The following items have unresolved conflicts and will not be synchronized: +Naslednji elementi imajo nerešene konflikte in ne bodo sinhronizirani: + +The following folders are significantly different. Make sure you are matching the correct folders for synchronization. +Naslednji imeniki so občutno različni. Preverite, če primerjate pravilne imenike za sinhnorizacijo. + +Not enough free disk space available in: +Na voljo ni dovolj prostega prostora na disku v: + +Required: +Zahtevano: + +Available: +Na voljo: + +Multiple folder pairs write to a common subfolder. Please review your configuration. +Več parov map zapisuje v skupno podmapo. Prosimo, preverite svojo konfiguracijo. + +Synchronizing folder pair: +Sinhroniziram par map: + +Generating database... +Ustvarjam podatkovno bazo... + +job name +naziv opravila + +Synchronization stopped +Sinhnorizacija ustavljena + +Synchronization completed with errors +Sinhronizacija se je končala z napakami + +Synchronization completed with warnings +Sinhronizacija se je končala z opozorili + +Nothing to synchronize +Nič za sinhronizirati + +Synchronization completed successfully +Sinhronizacija se je uspešno končala + +Cleaning up old log files... + + +Stopped +Ustavljen + +You can switch to FreeFileSync's main window to resolve this issue. +Preklopite na FreeFileSync glavno okno za odpravo težave. + +&Don't show this warning again +&Ne pokaži več tega opozorila + +&Ignore +&Ignoriraj + +&Switch +&Preklopi + +Switching to FreeFileSync's main window +Preklopi na FreeFileSync glavno okno + + +Automatic retry in 1 second... +Automatic retry in %x seconds... + + +Ponovni poskus čez %x sekundo... +Ponovni poskus čez %x sekundi... +Ponovni poskus čez %x sekunde... +Ponovni poskus čez %x sekund... + + +&Ignore subsequent errors +&Ignoriraj nadaljnje napake + +Retrying operation... +Ponovni poizkus operacije... + +Serious Error +Resna napaka + +Check for Program Updates +Prevri obstoj nadgradnje programa + +A new version of FreeFileSync is available: +Nova različica FreeFileSync je na voljo: + +Download now? +Prenesem sedaj? + +&Download +&Prenesi + +FreeFileSync is up to date. +FreeFileSync je posodobljen. + +Unable to connect to FreeFileSync.org. + + +Cannot find current FreeFileSync version number online. Do you want to check manually? +Na omrežju ne najdem obstoječe verzije FreeFileSync-a. Ali želite preveriti lastnoročno? + +&Check +&Preveri + +Symlink +Simbolična povezava + +Folder +Mapa + +Full path +Polna pot + +Name +Ime + +Relative folder +Relativna mapa + +Base folder +Osnovna mapa + +Size +Velikost + +Date +Datum + +Extension +Razširitev + +Category +Kategorija + +Action +Ukrep + +Drag && drop +Povleci && spusti + +Local comparison settings +Lokalne primerjalne nastavitve + +Local synchronization settings +Lokalne sinhnorizacijske nastavitve + +Local filter +Lokalni filter + +Active +Aktivno + +None +Nič + +Remove local settings +Odstrani lokalne nastavitve + +Clear local filter +Počisti lokalni filter + +Copy +Kopiraj + +Paste +Prilepi + +Local Synchronization Settings +Lokalne sinhnorizacijske nastavitve + +&New +&Nova + +&Save +&Shrani + +Save as &batch job... +Shrani kot serijsko op&ravilo... + +Start &comparison +Začni &primerjavo + +C&omparison settings + + +&Filter settings + + +S&ynchronization settings + + +Start &synchronization +Začni &sinhnorizacijo + +&Actions + + +&Options +&Možnosti + +&Language +&Jezik + +&Find... +&Išči... + +&Reset layout +&Ponastavi razporeditev + +&Export file list... +&Izvozi seznam datotek... + +&Tools +&Orodja + +&Check for new version +&Preveri, če obstaja nova verzija + +&Check now +P&reveri zdaj + +Check &automatically once a week +S&amodejno preveri enkrat tedensko + +Cancel +Prekliči + +Compare +Primerjaj + +Synchronize +Sinhroniziraj + +Add folder pair +Dodaj par imenikov + +Remove folder pair +Odstrani par imenikov + +Swap sides +Zamenjaj strani + +Close search bar +Zapri iskalno vrstico + +Find: +Išči: + +Match case +Ujemaj se s primerom + +New +Nova + +Open... +Odpri... + +Save +Shrani + +Save as... +Shrani kot... + +View type: +Tip pogleda: + +Select view: +Izberi pogled: + +Statistics: +Statistika: + +Number of files and folders that will be deleted +Število datotek in map, ki bodo izbrisane + +Number of files that will be updated + + +Number of files and folders that will be created +Število datotek in map, ki bodo ustvarjene + +Total bytes to copy +Skupno bajtov za kopiranje + +Use local settings: +Uporabi lokalne nastavitve: + +Select a variant: +Izberi možnost: + +Identify equal files by comparing modification time and size. +Določi enake datoteke s primerjavo datuma spremembe in velikosti. + +Identify equal files by comparing the file content. +Določi enake datoteke s primerjavo vsebine. + +Ignore time shift (in hours) +Ignorirani časovni okvir (v urah) + +Consider file times with specified offset as equal +Čas datotek znotraj izbranga časovnega okvirja je upoštevan kot isti + +Handle daylight saving time +Upoštevaj poletni in zimski čas + +Include symbolic links: + + +Direct +Neposredno + +Follow +Sledi + +More information +Več informacij + +Local settings: +Lokalne nastavitve: + +Include: +Vključi: + +Exclude: +Izključi: + +Show examples +Pokaži primere + +Time span: +Časovno obdobje + +File size: +Velikost datoteke: + +Minimum: +Minimum: + +Maximum: +Maksimum: + +Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. +Izberi filtrirna pravila za izključitev določenih datotek iz sinhnorizacije. Vpiši pot datotek relativno na imenik v obdelavi + +C&lear +&Počisti + +Detect moved files +Zaznaj premaknjene datoteke + + +- Detection active after initial sync +- Requires and creates database files +- Not supported by all file systems + + + +Detect synchronization directions with the help of database files +Zaznaj smer sinhnorizacije s pomočjo datotek podatkovne baze + +Delete files: +Izbriši datoteke: + +&Permanent +&Dokončno + +Delete or overwrite files permanently +Trajno izbriši ali prepiši datoteke + +&Recycle bin +&Koš + +Back up deleted and overwritten files in the recycle bin +Naredi varnostno kopijo izbrisanih in prepisanih datotek v koš + +&Versioning +&Verzioniranje + +Move files to a user-defined folder +Premakni datoteke v izbran imenik + +Naming convention: +Konvencija poimenovanja: + +Handle errors: +Upravljanje napak: + +Hide all error and warning messages +Skrij vsa obvestila o napakah in opozorilih + +&Pop-up +&Pop-up + +Show pop-up on errors or warnings +Prikaži pojavne napaka ali opozorila + +On completion: +Ob zaključku: + +OK +V redu + +Start synchronization now? +Zaženem sinhnorizacijo takoj? + +Variant: +Možnost: + +&Don't show this dialog again +&Ne pokaži več tega sporočila + +Items found: +Najdenih elementov: + +Time remaining: +Preostali čas: + +Time elapsed: +Pretečeni čas: + +Synchronizing... +Sinhroniziram... + +Minimize to notification area +Pomanjšaj v območje obvestil + +Bytes copied: +Prepisanih bajtov: + +Close +Zapri + +&Pause +&Premor + +Stop +Ustavi + +Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x +Ustvari skriptno datoteko za samodejno sinhnorizacijo. Za zagon dvojno kliknite to datoteko ali pa jo umestite v razporejevalnik opravil: %x + +&Stop +&Ustavi + +Stop synchronization at first error +Ustavi sinhnorizacojo ob prvi napaki + +Run minimized +Zaženi minimizirano + +Save log: +Shrani dnevnik: + +Limit: +Omejitev: + +Limit maximum number of log files +Omeji maksimalno število datotek beleženja + +How can I schedule a batch job? +Kako nastavim urnik za serijsko opravilo? + +The following settings are used for all synchronization jobs. +Naslednje nastavitve se uporabljajo pri vseh sinhronizacijskih opravilih. + +Fail-safe file copy +Kopiranje datotek varno pred odpovedjo + + +Copy to a temporary file (*.ffs_tmp) before overwriting target. +This guarantees a consistent state even in case of a serious error. + + +Kopiraj v začasno datoteko (*.ffs_tmp) preden prepišeš cilj. +To zagotavlja konsistenco podatkov v primeru napake. + + +(recommended) +(priporočeno) + +Copy locked files +Kopiraj zaklenjene datoteke + +Copy shared or locked files using the Volume Shadow Copy Service. +Kopiraj zaklenjene in datoteke v skupni rabi s pomočjo Shadow Copy Service. + +(requires administrator rights) +(zahteva pravice administratorja) + +Copy file access permissions +Kopiraj dovoljenja dostopov datoteke + +Transfer file and folder permissions. +Prenesi pravice datotek in map. + +Automatic retry on error: +Ob napaki avtomatsko poskusi znova: + +Retry count: +Število poiskusov: + +Delay (in seconds): +Zakasnitev (v sekundah): + +Customize context menu: +Prilagodi vsebinski meni: + +Description +Opis + +Show hidden dialogs again +Zopet prikaži skrite dilaoge + +Show all permanently hidden dialogs and warning messages again +Znova prikaži vse dokončno skrite dialoge in opozorila + +&Default +&Privzeto + +Source code written in C++ using: +Izvorna koda napisana v C++ z uporabo: + +If you like FreeFileSync +Če vam je FreeFileSync všeč + +Donate with PayPal +Doniraj s PayPal + +Feedback and suggestions are welcome +Povratne informacije in predlogi so dobrodošli + +Homepage +Domača stran + +Email +Email + +Published under the GNU General Public License +Objavljeno pod licenco GNU General Public + +Many thanks for localization: +Zahvale za lokalizacijo: + +Save as Batch Job +Shrani kot serijsko opravilo + +Delete Items +Izbriši elemente + +Options +Možnosti + +Select Time Span +Izberi časovno obdobje + +&Preferences... +&Nastavitve... + +Folder Pairs +Pari imenikov + +Find +Najdi + +View Settings +Nastavitve pogleda + +Configuration +Konfiguracija + +Overview +Pregled + +Main Bar +Glavna vrstica + +Confirm +Potrdi + + +Do you really want to execute the command %y for one item? +Do you really want to execute the command %y for %x items? + + +Ali res želite izvesti ukaz %y za %x element? +Ali res želite izvesti ukaz %y za %x elementa? +Ali res želite izvesti ukaz %y za %x elemente? +Ali res želite izvesti ukaz %y za %x elementov? + + +&Execute +&Izvedi + + +1 directory +%x directories + + +%x imenik +%x imenika +%x imeniki +%x imenikov + + + +1 file +%x files + + +%x datoteka +%x datoteki +%x datoteke +%x datotek + + + +Showing %y of 1 row +Showing %y of %x rows + + +Prikazano %y od %x vrstice +Prikazano %y od %x vrstic +Prikazano %y od %x vrstic +Prikazano %y od %x vrstic + + +Set direction: +Nastavi smer: + +multiple selection +mnogokratna izbira + +Include via filter: +Vključi preko filtra: + +Exclude via filter: +Izključi preko filtra: + +Include temporarily +Trenutno vključi + +Exclude temporarily +Začasno izključi + +Delete +Izbriši + +Include all +Vključi vse + +Exclude all +Izključi vse + +Show icons: +Prikaži ikone: + +Small +Majhna + +Medium +Srednja + +Large +Velika + +Select time span... +Izberite časovni okvir... + +Show "%x" +Prikaži "%x" + +Last session +Zadnja seja + +Folder Comparison and Synchronization +Primerjava in sinhronizacija imenika + +Configuration saved +Konfiguracija shranjena + +FreeFileSync batch +FreeFileSync paket + +Do you want to save changes to %x? +Ali želite shraniti spremembe v %x? + +Never save &changes +Nikoli ne shrani &sprememb + +Do&n't save +Ne shra&ni + +Delete selected configurations +Izbriši izbrane konfiguracije + +Synchronization Settings +Nastavitve sinhnorizacije + +Clear filter +Počisti filter + +Show files that exist on left side only +Prikaži datoteke, ki obstajajo samo na levi + +Show files that exist on right side only +Prikaži datoteke, ki obstajajo samo na desni + +Show files that are newer on left +Prikaži datoteke, ki so novejše na levi + +Show files that are newer on right +Prikaži datoteke, ki so novejše na desni + +Show files that are equal +Prikaži datoteke, ki so enake + +Show files that are different +Prikaži datoteke, ki so različne + +Show conflicts +Prikaži spore + +Show files that will be created on the left side +Prikaži datoteke, ki bodo ustvarjene na levi strani + +Show files that will be created on the right side +Prikaži datoteke, ki bodo ustvarjene na desni strani + +Show files that will be deleted on the left side +Prikaži datoteke, ki bodo izbrisane na levi strani + +Show files that will be deleted on the right side +Prikaži datoteke, ki bodo izbrisane na desni strani + +Show files that will be updated on the left side + + +Show files that will be updated on the right side + + +Show files that won't be copied +Prikaži datoteke, ki ne bodo kopirane + +Show filtered or temporarily excluded files +Pokaži filtrirane ali začasno izključene datoteke + +Set as default +Nastavi kot privzeto + +Filter +Filter + +All files are in sync +Vse datoteke so sinhronizirane + +Cannot find %x +Ne najdem %x + +Comma-separated values +Vrednosti ločene z vejico + +File list exported +Seznam datotek je bil izvožen + +Searching for program updates... +Iščem posodobitve programa... + +Close progress dialog +Zapri pogovorno okno z napredkom + +Standby +V pripravljenost + +Log off +Odjavi + +Shut down +Ugasni + +Hibernate +Hibernacija + +Scanning... +Pregledujem... + +Comparing content... +Primerjam vsebino... + +Info +Info + +Warning +Pozor + +Select all +Izberi vse + +Paused +Na premoru + +Initializing... +Inicializiram... + +Completed +Zaključeno + +&Continue +&Nadaljuj + +Progress +Napredek + +Log +Dnevnik + + +Do you really want to move the following item to the recycle bin? +Do you really want to move the following %x items to the recycle bin? + + +Ali res želite premakniti sledeč %x element v koš? +Ali res želite premakniti sledeča %x elementa v koš? +Ali res želite premakniti sledeče %x elemente v koš? +Ali res želite premakniti sledečih %x elementov v koš? + + +Move +Premakni + + +Do you really want to delete the following item? +Do you really want to delete the following %x items? + + +Ali resnično želite izbrisati sledeči %x element? +Ali resnično želite izbrisati naslednja %x elementa? +Ali resnično želite izbrisati naslednje %x elemente? +Ali resnično želite izbrisati naslednjih %x elementov? + + +Preferences +Nastavitve + +Copy NTFS permissions +Kopiraj NTFS dovoljenja + +Integrate external applications into context menu. The following macros are available: +Integriraj zunanje aplikacije v kontekstni menu. Na voljo so naslednji makri: + +- full file or folder name +- polno ime datoteke ali mape + +- folder part only +- samo del glede mape + +- Other side's counterpart to %item_path% +- Na drugi strani nasprotno v %item_path% + +- Other side's counterpart to %item_folder% +- Na drugi strani nasprotno v %item_folder% + +Show hidden dialogs and warning messages again? +Znova prikaži skrite dialoge in obvestila + +&Show +&Prikaži + +Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database. +Identificiraj in razširjaj spremembe na obeh straneh. Izbrisi, premiki in spori so samodejno zaznani z uporabo podatkovne baze. + +Create a mirror backup of the left folder by adapting the right folder to match. +Ustvari zrcalno kopijo levega imenika s prilagoditvijo desnega imenika, tako da se ujemata. + +Copy new and updated files to the right folder. +Kopiraj nove in posodobljene datoteke v desni imenik. + +Configure your own synchronization rules. +Konfigurirajte vaša lastna sinhronizacijska pravila. + +Today +Danes + +This week +Ta teden + +This month +Ta mesec + +This year +To leto + +Last x days +Zadnjih x dni + +Byte +Bajt + +KB +KB + +MB +MB + +Replace +Zamenjaj + +Move files and replace if existing +Premakne datoteke in jih zamenja, če obstajajo + +Time stamp +Časovna oznaka + +Append a time stamp to each file name +Imenu vsake datoteke pripni časovni žig + +Comparison +Primerjava + +Synchronization +Sinhnorizacija + +Leave as unresolved conflict +Pusti kot nerešeni spor + +File +Datoteka + +YYYY-MM-DD hhmmss +LLLL-MM-DD hhmmss + +Files +Datoteke + +Items +Elementi + +Percentage +Odstotek + +Cannot monitor directory %x. +Ne morem nadzorovati imenika %x. + +Cannot delete file %x. +Ne morem izbrisati datoteke %x. + +The file is locked by another process: +Datoteka je zaklenjena s strani drugega procesa: + +Cannot move file %x to %y. +Ne morem premakniti datoteko %x v %y. + +Cannot delete directory %x. +Ne morem izbrisati imenika %x. + +Cannot write file attributes of %x. +Ne morem zapisati datotečnih atributov od %x. + +Cannot write modification time of %x. +Ne morem zapisati časa spremembe od %x. + +Cannot read security context of %x. +Ne morem prebrati varnostnega konteksta od %x. + +Cannot write security context of %x. +Ne morem zapisati varnostni kontekst od %x + +Cannot read permissions of %x. +Ne morem prebrati dovoljenja od %x. + +Cannot write permissions of %x. +Ne morem zapisati dovoljenj od %x. + +Cannot create directory %x. +Ne morem ustvariti imenika %x. + +Cannot copy symbolic link %x to %y. + + +Cannot find system function %x. +Ne morem najti sistemske funkcije %x. + +Cannot copy file %x to %y. +Ne morem kopirati datoteke %x v %y. + +Type of item %x is not supported: +Element tipa %x ni podprt: + +Cannot resolve symbolic link %x. +Ne morem razrešiti simbolične povezave %x. + +Cannot open directory %x. +Ne morem odpreti imenika %x. + +Cannot enumerate directory %x. +Ne morem oštevilčiti imenika %x. + +%x TB +%x TB + +%x PB +%x PB + + +1 min +%x min + + +%x min +%x min +%x min +%x min + + + +1 hour +%x hours + + +%x ura +%x uri +%x ure +%x ur + + + +1 day +%x days + + +%x dan +%x dneva +%x dnevi +%x dni + + +Unable to register to receive system messages. +Ne morem se registriratiza prejem sistemskih sporočil. + +Cannot set privilege %x. +Ne morem nastaviti privilegija %x. + +Unable to suspend system sleep mode. +Ne morem preprečiti mirovanja sistema. + +Cannot change process I/O priorities. +Ne morem spremeniti V/I prioritet procesa. + +Unable to move %x to the recycle bin. +Ne morem premakniti %x v koš- + +Checking recycle bin failed for folder %x. +Preverjanje koša za mapo %x ni uspelo. + +Cannot determine final path for %x. +Ne morem določiti končne poti za %x. + +Error Code %x: +Koda napake %x: + +Cannot read the following XML elements: +Ne morem brati naslednje XML elemente: + +Configuration file %x loaded partially only. +Nastavitvena datoteka %x naložena samo delno. + +Prepare installation +Pripravljam namestitev + +Choose which components you want to install. +Izberite komponente za inštalacijo + +Select installation type: + + +Local +Lokalna + +Portable +Prenosna + +recommended +priporočena + +Save settings to "%APPDATA%\FreeFileSync" +Shrani nastavitve v "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Registracija FreeFileSync datotečnih razširitev + +Create Explorer context menu entries + + +Save settings in installation directory +Shrani nastavitve v namestitveni imenik + +Do not write to Registry +Ne zapisuj v register + +Just copy the files +Kopiraj samo datoteke + +Choose a directory for installation: +Izberite imenik za namestitev: + +Create shortcuts: +Ustvari bližnjice: + +Desktop +Namizje + +Start menu +Start meni + +Registering FreeFileSync file extensions +Registriram FreeFileSync datotečne končnice + +Unregistering FreeFileSync file extensions +Odregistriram FreeFileSync datotečne končnice + +FreeFileSync Configuration + + +FreeFileSync Batch File + + +FreeFileSync Synchronization Database + + +RealtimeSync Configuration + + +Edit with FreeFileSync + + diff --git a/FreeFileSync/Build/Languages/outdated/ukrainian.lng b/FreeFileSync/Build/Languages/outdated/ukrainian.lng index e8314f07..65091b8f 100644 --- a/FreeFileSync/Build/Languages/outdated/ukrainian.lng +++ b/FreeFileSync/Build/Languages/outdated/ukrainian.lng @@ -7,81 +7,6 @@ n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2 -&Show - - -Show hidden dialogs and warning messages again? - - -Clear filter - - -Start comparison - - -Show all permanently hidden dialogs and warning messages again - - -Show hidden dialogs again - - -&Stop - - -Bytes copied: - - -&Pop-up - - -&Versioning - - -&Permanent - - -C&lear - - -Handle daylight saving time - - -Consider file times with specified offset as equal - - -Ignore time shift (in hours) - - -New - - -&Reset layout - - -Start &synchronization - - -Start &comparison - - -Clear local filter - - -Relative folder - - -Multiple folder pairs write to a common subfolder. Please review your configuration. - - -Cannot find folder %x. - - -&File - - -The following folder paths are dependent from each other: - - Both sides have changed since last synchronization. З моменту останньої синхронізації з обох сторін відбулися зміни. @@ -172,6 +97,9 @@ Any number of alternative directory pairs for at most one config file. Будь-яка кількість альтернативних пар каталогів для не більше одного конфігураційного файлу. +Open configuration for edit without executing. + + Cannot find the following folders: Не вдається знайти такі папки: @@ -184,6 +112,9 @@ The corresponding folder will be considered as empty. Відповідна папка буде вважатися порожньою. +The following folder paths are dependent from each other: + + File %x has an invalid date. Файл %x має неіснуючу дату. @@ -259,11 +190,11 @@ Move file on right Перемістити файли праворуч -Overwrite left item -Перезаписати елемент ліворуч +Update left item + -Overwrite right item -Перезаписати елемент праворуч +Update right item + Do nothing Нічого не робити @@ -348,6 +279,9 @@ Creating file %x Створення файлу %x +Saving file %x... + + Items processed: Елементів оброблено: @@ -376,9 +310,6 @@ %x нитей виконання -Encoding extended time information: %x -Кодування розширеної інформації про час: %x - /sec /сек @@ -418,8 +349,11 @@ Save &as... Зберегти &як... -&Quit -&Вихід +E&xit + + +&File + &View help &Перегляд довідки @@ -510,6 +444,9 @@ The command is triggered if: &Show error &Показати помилку +&Quit +&Вихід + Incorrect command line: Неправильний командний рядок: @@ -555,11 +492,11 @@ The command is triggered if: Creating folder %x Створення папки %x -Overwriting file %x -Перезапис файлу %x +Updating file %x + -Overwriting symbolic link %x -Перезапис символьного посилання %x +Updating symbolic link %x + Verifying file %x Перевірка файлу %x @@ -576,6 +513,9 @@ The command is triggered if: Target folder %x already existing. Цільова папка %x вже існує. +Cannot find folder %x. + + Target folder input field must not be empty. Поле цільової папки не повинно бути порожнім. @@ -600,6 +540,9 @@ The command is triggered if: Available: Доступно: +Multiple folder pairs write to a common subfolder. Please review your configuration. + + Synchronizing folder pair: Синхронізація пари папок: @@ -624,8 +567,8 @@ The command is triggered if: Synchronization completed successfully Синхронізація успішно завершена -Saving log file %x... -Збереження файла журналу %x... +Cleaning up old log files... + Stopped Зупинено @@ -679,8 +622,8 @@ The command is triggered if: FreeFileSync is up to date. У Вас найновіша версія FreeFileSync. -Unable to connect to sourceforge.net. -Не можна з’єднатися з sourceforge.net. +Unable to connect to FreeFileSync.org. + Cannot find current FreeFileSync version number online. Do you want to check manually? Не вдається знайти номер поточної версії FreeFileSync онлайн. Бажаєте перевірити вручну? @@ -700,6 +643,9 @@ The command is triggered if: Name Назва +Relative folder + + Base folder Базова папка @@ -739,6 +685,9 @@ The command is triggered if: Remove local settings Вилучити локальні налаштування +Clear local filter + + Copy Копіювати @@ -757,6 +706,24 @@ The command is triggered if: Save as &batch job... Зберегти як &пакетне завдання +Start &comparison + + +C&omparison settings + + +&Filter settings + + +S&ynchronization settings + + +Start &synchronization + + +&Actions + + &Options &Опції @@ -766,6 +733,9 @@ The command is triggered if: &Find... &Знайти... +&Reset layout + + &Export file list... &Експортувати список файлів... @@ -808,6 +778,9 @@ The command is triggered if: Match case Враховувати регістр +New + + Open... Відкрити... @@ -829,8 +802,8 @@ The command is triggered if: Number of files and folders that will be deleted Кількість файлів і папок, які будуть вилучені -Number of files that will be overwritten -Кількість файлів, які будуть перезаписані +Number of files that will be updated + Number of files and folders that will be created Кількість файлів і папок, які будуть створені @@ -850,8 +823,23 @@ The command is triggered if: Identify equal files by comparing the file content. Визначити однакові файли порівнюючи їх вміст. -Symbolic links: -Символьні посилання: +Ignore time shift (in hours) + + +Consider file times with specified offset as equal + + +Handle daylight saving time + + +Include symbolic links: + + +Direct +Прямо + +Follow +Послідовно More information Додаткова інформація @@ -883,19 +871,18 @@ The command is triggered if: Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Виберіть правила фільтрації для виключення деяких файлів із синхронізації. Введіть шляхи файлів відносно відповідної пари папок. +C&lear + + Detect moved files Виявляти переміщені файли -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems - -- Вимагає і створює файли бази даних -- Активне спостереження після первинної синхронізації -- Підтримується не всіма файловими системами - + Detect synchronization directions with the help of database files Визначити напрямок синхронізації за допомогою файлів баз даних @@ -903,6 +890,9 @@ The command is triggered if: Delete files: Вилучити файли: +&Permanent + + Delete or overwrite files permanently Вилучати чи перезаписати файли назавжди @@ -912,6 +902,9 @@ The command is triggered if: Back up deleted and overwritten files in the recycle bin Резервно зберегти вилучені та перезаисані файли в Корзині +&Versioning + + Move files to a user-defined folder Перемістити файли у визначену користувачем папку @@ -924,6 +917,9 @@ The command is triggered if: Hide all error and warning messages Приховати всі помилки і повідомлення з попередженнями +&Pop-up + + Show pop-up on errors or warnings Показувати виринаючі вікна при помилках та попередженнях @@ -957,6 +953,9 @@ The command is triggered if: Minimize to notification area Згорнути в область повідомлень +Bytes copied: + + Close Замкнути @@ -969,6 +968,9 @@ The command is triggered if: Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x Створити пакетний файл для автоматичної синхронізації. Щоб розпочати двічі клацніть цей файл або заплануйте в планувальнику завдань: %x +&Stop + + Stop synchronization at first error Зупинити синхронізацію при першій помилці @@ -1035,6 +1037,12 @@ This guarantees a consistent state even in case of a serious error. Description Опис +Show hidden dialogs again + + +Show all permanently hidden dialogs and warning messages again + + &Default &За замовчуванням @@ -1086,24 +1094,15 @@ This guarantees a consistent state even in case of a serious error. View Settings Налаштування перегляду -Overview -Огляд - Configuration Налаштування +Overview +Огляд + Main Bar Головна панель -Comparison settings -Налаштування порівнювання - -Synchronization settings -Налаштування синхронізації - -Start synchronization -Розпочати синхронізацію - Confirm Підтвердити @@ -1222,6 +1221,9 @@ This guarantees a consistent state even in case of a serious error. Synchronization Settings Налаштування Синхронізації +Clear filter + + Show files that exist on left side only Показати файли, які є тільки ліворуч @@ -1255,11 +1257,11 @@ This guarantees a consistent state even in case of a serious error. Show files that will be deleted on the right side Показати файли, які будуть вилучені праворуч -Show files that will be overwritten on left side -Показати файли, які будуть перезаписані ліворуч +Show files that will be updated on the left side + -Show files that will be overwritten on right side -Показати файли, які будуть перезаписані праворуч +Show files that will be updated on the right side + Show files that won't be copied Показати файли, які не будуть зкопійовані @@ -1380,6 +1382,12 @@ This guarantees a consistent state even in case of a serious error. - Other side's counterpart to %item_folder% - Елемент з протилежної сторони до %item_folder% +Show hidden dialogs and warning messages again? + + +&Show + + Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database. Виявити та поширити зміни на обидві сторони. Видалення, перейменування та конфлікти визначаються автоматично використовуючи базу даних. @@ -1392,15 +1400,6 @@ This guarantees a consistent state even in case of a serious error. Configure your own synchronization rules. Налаштувати власні правила синхронізації. -Exclude -Виключити - -Direct -Прямо - -Follow -Послідовно - Today Сьогодні @@ -1464,9 +1463,6 @@ This guarantees a consistent state even in case of a serious error. Cannot monitor directory %x. Не вдається контролювати каталог %x. -Conversion error: -Помилка перетворення: - Cannot delete file %x. Не вдається видалити файл %x. @@ -1500,8 +1496,8 @@ This guarantees a consistent state even in case of a serious error. Cannot create directory %x. Не вдається створити каталогу %x. -Cannot create symbolic link %x. -Не вдається створити символьного посилання %x. +Cannot copy symbolic link %x to %y. + Cannot find system function %x. Не вдається знайти системної функції %x. @@ -1587,3 +1583,72 @@ This guarantees a consistent state even in case of a serious error. Configuration file %x loaded partially only. Файл конфігурації %x завантажено лише частково. +Prepare installation +Підготовка інсталяції + +Choose which components you want to install. +Виберіть які компоненти ви хочете встановити. + +Select installation type: + + +Local +Локальна + +Portable +Портативна + +recommended +рекомендовано + +Save settings to "%APPDATA%\FreeFileSync" +Зберегти налаштування в "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Зареєструвати розширення файлів FreeFileSync + +Create Explorer context menu entries + + +Save settings in installation directory +Зберегти налаштування у каталозі встановлення + +Do not write to Registry +Не записувати у Реєстр + +Just copy the files +Просто зкопіювати файли + +Choose a directory for installation: +Виберіть каталог для встановлення: + +Create shortcuts: +Створити ярлики: + +Desktop +Робочий стіл + +Start menu +Меню Пуск + +Registering FreeFileSync file extensions +Реєструю розширення файлів FreeFileSync + +Unregistering FreeFileSync file extensions +Вилучаю реєстрацію розширення файлів FreeFileSync + +FreeFileSync Configuration + + +FreeFileSync Batch File + + +FreeFileSync Synchronization Database + + +RealtimeSync Configuration + + +Edit with FreeFileSync + + diff --git a/FreeFileSync/Build/Languages/polish.lng b/FreeFileSync/Build/Languages/polish.lng index 6aac661e..f5aac64e 100644 --- a/FreeFileSync/Build/Languages/polish.lng +++ b/FreeFileSync/Build/Languages/polish.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Dowolna liczba alternatywnych par katalogów dla najwyżej jednego pliku konfiguracyjnego. +Open configuration for edit without executing. +Otwórz konfigurację do edycji bez uruchamiania synchronizacji. + Cannot find the following folders: Nie można znaleźć następujących katalogów: @@ -184,11 +187,11 @@ Move file on right Przenieś plik na prawą stronę -Overwrite left item -Nadpisz lewy element +Update left item +Aktualizuj lewy element -Overwrite right item -Nadpisz prawy element +Update right item +Aktualizuj prawy element Do nothing Nie rób nic @@ -273,6 +276,9 @@ Creating file %x Tworzenie pliku %x +Saving file %x... +Zapisywanie pliku %x... + Items processed: Przetworzone elementy: @@ -301,9 +307,6 @@ %x wątków -Encoding extended time information: %x -Odkodowywanie rozszerzonych informacji o czasie: %x - /sec /sekundę @@ -343,8 +346,8 @@ Save &as... &Zapisz jako... -&Quit -Zam&knij +E&xit +&Wyjście &File &Plik @@ -438,6 +441,9 @@ Komenda jest wykonywana gdy: &Show error Pokaż &błędy +&Quit +Zam&knij + Incorrect command line: Niepoprawne polecenie: @@ -483,11 +489,11 @@ Komenda jest wykonywana gdy: Creating folder %x Tworzenie folderu %x -Overwriting file %x -Nadpisywanie pliku %x +Updating file %x +Aktualizowanie pliku %x -Overwriting symbolic link %x -Nadpisywanie dowiązania symbolicznego %x +Updating symbolic link %x +Aktualizowanie dowiązania symbolicznego %x Verifying file %x Weryfikowanie pliku %x @@ -544,7 +550,7 @@ Komenda jest wykonywana gdy: nazwa zadania Synchronization stopped -Synchronizacja zatrzymana +Synchronizacja przerwana Synchronization completed with errors Synchronizacja zakończona z błędami @@ -558,8 +564,8 @@ Komenda jest wykonywana gdy: Synchronization completed successfully Synchronizacja zakończona pomyślnie -Saving log file %x... -Zapisywanie pliku logów %x... +Cleaning up old log files... +Usuwanie starych plików logów... Stopped Zatrzymana @@ -613,8 +619,8 @@ Komenda jest wykonywana gdy: FreeFileSync is up to date. Posiadasz aktualną wersję FreeFileSync. -Unable to connect to sourceforge.net. -Nie można się połączyć z sourceforge.net. +Unable to connect to FreeFileSync.org. +Nie można połączyć się z FreeFileSync.org Cannot find current FreeFileSync version number online. Do you want to check manually? Nie można znaleźć obecnej wersji FreeFileSync. Czy chcesz sprawdzić ręcznie? @@ -700,9 +706,21 @@ Komenda jest wykonywana gdy: Start &comparison Rozpo&cznij porównywanie +C&omparison settings +Ustawienia &porównywania + +&Filter settings +Ustawienia &filtra + +S&ynchronization settings +U&stawienia synchronizacji + Start &synchronization Rozpocznij &synchronizację +&Actions +&akcje + &Options &Opcje @@ -781,8 +799,8 @@ Komenda jest wykonywana gdy: Number of files and folders that will be deleted Liczba plików i katalogów, które zostaną usunięte -Number of files that will be overwritten -Liczba plików, które zostaną nadpisane +Number of files that will be updated +Liczba plików, która będą zaktualizowane Number of files and folders that will be created Liczba plików i katalogów, które zostaną utworzone @@ -811,8 +829,14 @@ Komenda jest wykonywana gdy: Handle daylight saving time Uwzględniaj przesunięcie czasu -Symbolic links: -Dowiązania symboliczne: +Include symbolic links: +Uwzględniaj dowiązania symboliczne + +Direct +Bezpośrednio + +Follow +Podążaj More information Więcej informacji @@ -841,24 +865,24 @@ Komenda jest wykonywana gdy: Maximum: Maksymalny: -C&lear -&Wyczyść - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Określ reguły filtrowania w celu wykluczenia niektórych plików z synchronizacji. Ścieżki plików muszą być relatywne do podanych par katalogów. +C&lear +&Wyczyść + Detect moved files Wykryj przeniesione pliki. -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- Wymagane utworzenie pliku bazy danych -- Funkcja aktywna po pierwszej synchronizacji -- Niewspierany przez wszystkie systemy plików +- Wykrywanie aktywne po pierwszej synchronizacji +- Wymaga utworzenia plików bazy danych +- Nie jest wspierana przez wszystkie systemy plików Detect synchronization directions with the help of database files @@ -1071,27 +1095,15 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp View Settings Ustawienia widoku -Overview -Przegląd - Configuration Konfiguracja +Overview +Przegląd + Main Bar Główny pasek -Start comparison -Rozpocznij porównywanie - -Comparison settings -Ustawienia porównywania - -Synchronization settings -Ustawienia synchronizacji - -Start synchronization -Rozpocznij synchronizację - Confirm Potwierdź @@ -1246,11 +1258,11 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp Show files that will be deleted on the right side Pokaż pliki, które będą usunięte po prawej stronie -Show files that will be overwritten on left side -Pokaż pliki, które zostaną nadpisane po lewej stronie +Show files that will be updated on the left side +Pokaż pliki, które będą zaktualizowane po lewej stronie -Show files that will be overwritten on right side -Pokaż pliki, które zostaną nadpisane po prawej stronie +Show files that will be updated on the right side +Pokaż pliki, które będą zaktualizowane po prawej stronie Show files that won't be copied Pokaż pliki, które nie będą kopiowane @@ -1389,15 +1401,6 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp Configure your own synchronization rules. Skonfiguruj swoje własne reguły synchronizacji. -Exclude -Wyklucz - -Direct -Bezpośrednio - -Follow -Podążaj - Today Dzisiaj @@ -1461,9 +1464,6 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp Cannot monitor directory %x. Nie można monitorować katalogu %x. -Conversion error: -Błąd konwersji: - Cannot delete file %x. Nie można usunąć pliku %x. @@ -1497,8 +1497,8 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp Cannot create directory %x. Nie można utworzyć katalogu %x. -Cannot create symbolic link %x. -Nie można utworzyć dowiązania symbolicznego dla %x. +Cannot copy symbolic link %x to %y. +Nie można skopiować linku symbolicznego %x do %y. Cannot find system function %x. Nie można odnaleźć funkcji systemowej %x. @@ -1584,3 +1584,72 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp Configuration file %x loaded partially only. Plik konfiguracyjny %x został wczytany tylko częściowo. +Prepare installation +Przygotuj instalację + +Choose which components you want to install. +Określ komponenty do instalacji. + +Select installation type: +Typ instalacji: + +Local +Lokalna + +Portable +Przenośna + +recommended +rekomendowana + +Save settings to "%APPDATA%\FreeFileSync" +Zapisuje ustawienia do "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Tworzy powiązania plików z programem FreeFileSync + +Create Explorer context menu entries +Integracja z menu kontekstowym Windows Explorer + +Save settings in installation directory +Zapisz ustawienia w katalogu instalacyjnym + +Do not write to Registry +Nie tworzy wpisów w rejestrze + +Just copy the files +Kopiuje tylko pliki + +Choose a directory for installation: +Wybierz katalog docelowy: + +Create shortcuts: +Utwórz skróty: + +Desktop +Na Pulpicie + +Start menu +Menu Start + +Registering FreeFileSync file extensions +Rejestrowanie rozszerzeń plików FreeFileSync + +Unregistering FreeFileSync file extensions +Usuwanie rozszerzeń plików FreeFileSync + +FreeFileSync Configuration +Konfiguracja FreeFileSync + +FreeFileSync Batch File +Plik wsadowy FreeFileSync + +FreeFileSync Synchronization Database +Baza danych FreeFileSync + +RealtimeSync Configuration +Konfiguracja RealtimeSync + +Edit with FreeFileSync +Edytuj przy użyciu FreeFileSync + diff --git a/FreeFileSync/Build/Languages/portuguese.lng b/FreeFileSync/Build/Languages/portuguese.lng index 662c1cdf..306129ae 100644 --- a/FreeFileSync/Build/Languages/portuguese.lng +++ b/FreeFileSync/Build/Languages/portuguese.lng @@ -1,6 +1,6 @@
      Português - Carlos Balseiro + Miguel Balseiro pt_PT flag_portugal.png 2 @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Qualquer número de pares de directórios alternativos para apenas um ficheiro de configuração. +Open configuration for edit without executing. +Abrir a configuração para editar sem executar. + Cannot find the following folders: Não é possível encontrar as seguintes pastas: @@ -184,11 +187,11 @@ Move file on right Mover ficheiro à direita -Overwrite left item -Substituir item da esquerda +Update left item +Atualizar item esquerdo -Overwrite right item -Substituir item da direita +Update right item +Atualizar item direito Do nothing Não fazer nada @@ -217,6 +220,9 @@ %x GB %x GB +Cannot load file %x. +Não é possível carregar o ficheiro %x. + Database file %x is incompatible. Base de dados %x não é compatível. @@ -268,6 +274,9 @@ Creating file %x Criar ficheiro %x +Saving file %x... +Guardar ficheiro %x... + Items processed: Elementos processados: @@ -295,9 +304,6 @@ %x threads -Encoding extended time information: %x -A codificar dados temporais extendidos: %x - /sec /seg @@ -319,9 +325,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. Utilize a versão 64-bit do FreeFileSync para criar cópias sombra neste sistema. -Cannot load file %x. -Não é possível carregar o ficheiro %x. - Cannot determine volume name for %x. Não é possível determinar o nome do volume para %x. @@ -340,8 +343,8 @@ Save &as... Guardar &como... -&Quit -&Sair +E&xit +S&air &File &Ficheiro @@ -435,6 +438,9 @@ O comando é executado se: &Show error Mostrar &erro +&Quit +&Sair + Incorrect command line: Linha de comandos incorrecta: @@ -480,11 +486,11 @@ O comando é executado se: Creating folder %x Criar pasta %x -Overwriting file %x -Substituir ficheiro %x +Updating file %x +Atualizar ficheiro %x -Overwriting symbolic link %x -Substituir link simbólico %x +Updating symbolic link %x +Atualizar link simbólico %x Verifying file %x A verificar ficheiro %x @@ -498,21 +504,21 @@ O comando é executado se: Data verification error: %x and %y have different content. Erro de verificação de dados: %x e %y têm conteúdo diferente. -Cannot find folder %x. -Não é possível encontrar a pasta %x. - Target folder %x already existing. Directório de destino %x já existe. +Cannot find folder %x. +Não é possível encontrar a pasta %x. + Target folder input field must not be empty. Campo de directório de destino não deve estar vazio. -Please enter a target folder for versioning. -Introduza uma pasta de destino para o controlo de versões. - Source folder %x not found. Directório %x não encontrado. +Please enter a target folder for versioning. +Introduza uma pasta de destino para o controlo de versões. + The following items have unresolved conflicts and will not be synchronized: Os seguintes itens têm conflitos não resolvidos, e não serão sincronizados: @@ -555,8 +561,8 @@ O comando é executado se: Synchronization completed successfully Sincronização completa com sucesso -Saving log file %x... -A guardar ficheiro log %x... +Cleaning up old log files... +A limpar ficheiros log antigos... Stopped Parado @@ -609,8 +615,8 @@ O comando é executado se: FreeFileSync is up to date. FreeFileSync está actualizado. -Unable to connect to sourceforge.net. -Não é possível ligar a sourceforge.net. +Unable to connect to FreeFileSync.org. +Não é possível ligar a FreeFileSync.org. Cannot find current FreeFileSync version number online. Do you want to check manually? Não é possível encontrar a última versão do FreeFileSync online. Deseja verificar manualmente? @@ -696,9 +702,21 @@ O comando é executado se: Start &comparison Iniciar &comparaçao +C&omparison settings +Opções de c&omparação + +&Filter settings +Opções de &filtros + +S&ynchronization settings +Opções de s&incronização + Start &synchronization Iniciar &sincronização +&Actions +&Acções + &Options &Opções @@ -777,8 +795,8 @@ O comando é executado se: Number of files and folders that will be deleted Número de ficheiros e pastas a ser eliminados -Number of files that will be overwritten -Número de ficheiros substituidos +Number of files that will be updated +Número de ficheiros a ser atualizados Number of files and folders that will be created Número de ficheiros e pastas a ser criados @@ -807,8 +825,14 @@ O comando é executado se: Handle daylight saving time Lidar com horário de verão -Symbolic links: -Links simbólicos: +Include symbolic links: +Incluir links simbólicos: + +Direct +Direto + +Follow +Seguir More information Mais informação @@ -837,23 +861,23 @@ O comando é executado se: Maximum: Máximo -C&lear -&Limpar - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Seleccionar regras de filtro para excluir certos ficheiros da sincronização. Insira os caminhos relativos ao par de directórios correspondente. +C&lear +&Limpar + Detect moved files Detectar ficheiros movidos -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- Requer o uso de base de dados (cria ficheiro) -- Detecção activa após sincronização inicial +- Detecção ativa após sincronização inicial +- Requer e cria ficheiro de base de dados - Não é suportado por todos os sistemas de ficheiros @@ -1067,27 +1091,15 @@ Isto garante um estado consistente mesmo em caso de falha grave. View Settings Ver Opções -Overview -Vista - Configuration Configuração +Overview +Vista + Main Bar Barra principal -Start comparison -Iniciar comparação - -Comparison settings -Opções de comparação - -Synchronization settings -Parametros de sincronização - -Start synchronization -Iniciar a sincronização - Confirm Confirmar @@ -1238,11 +1250,11 @@ Isto garante um estado consistente mesmo em caso de falha grave. Show files that will be deleted on the right side Mostrar ficheiros a ser apagados à direita -Show files that will be overwritten on left side -Mostrar ficheiros a ser substituidos do lado esquerdo +Show files that will be updated on the left side +Mostrar ficheiros a ser atualizados à esquerda -Show files that will be overwritten on right side -Mostrar ficheiros a ser substituidos do lado direito +Show files that will be updated on the right side +Mostrar ficheiros a ser atualizados à direita Show files that won't be copied Mostrar ficheiros que não serão copiados @@ -1379,15 +1391,6 @@ Isto garante um estado consistente mesmo em caso de falha grave. Configure your own synchronization rules. Configure as suas regras de sincronização. -Exclude -Excluir - -Direct -Direto - -Follow -Seguir - Today Hoje @@ -1451,9 +1454,6 @@ Isto garante um estado consistente mesmo em caso de falha grave. Cannot monitor directory %x. Não é possível monitorizar o directório %x. -Conversion error: -Erro de conversão: - Cannot delete file %x. Não é possível eliminar o ficheiro %x. @@ -1487,8 +1487,8 @@ Isto garante um estado consistente mesmo em caso de falha grave. Cannot create directory %x. Não é possível criar o directório %x. -Cannot create symbolic link %x. -Não é possível criar link simbólico %x. +Cannot copy symbolic link %x to %y. +Não é possível criar o link simbólico de %x para %y. Cannot find system function %x. Não é possível encontrar a função do sistema %x. @@ -1571,3 +1571,72 @@ Isto garante um estado consistente mesmo em caso de falha grave. Configuration file %x loaded partially only. Ficheiro de configuração %x carregado parcialmente. +Prepare installation +A preparar a instalação + +Choose which components you want to install. +Escolha os componentes a instalar. + +Select installation type: +Selecionar tipo de instalação: + +Local +Local + +Portable +Portátil + +recommended +recomendada + +Save settings to "%APPDATA%\FreeFileSync" +Guardar as definições em "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Registar as extensões do FreeFileSync + +Create Explorer context menu entries +Criar entradas de menu de contexto no Explorer + +Save settings in installation directory +Guardar as definições no directório da instalação + +Do not write to Registry +Não escrever no Registo + +Just copy the files +Copiar apenas os ficheiros + +Choose a directory for installation: +Escolha um directório para a instalação: + +Create shortcuts: +Criar atalhos: + +Desktop +Área de trabalho + +Start menu +Menu Iniciar + +Registering FreeFileSync file extensions +A registar as extensões do FreeFileSync + +Unregistering FreeFileSync file extensions +A apagar o registo das extensões do FreeFileSync + +FreeFileSync Configuration +Configuração do FreeFileSync + +FreeFileSync Batch File +Ficheiro Batch FreeFileSync + +FreeFileSync Synchronization Database +Base de Dados de Sincronização FreeFileSync + +RealtimeSync Configuration +Configuração do RealtimeSync + +Edit with FreeFileSync +Editar com FreeFileSync + diff --git a/FreeFileSync/Build/Languages/portuguese_br.lng b/FreeFileSync/Build/Languages/portuguese_br.lng index 31d03fba..3bbda548 100644 --- a/FreeFileSync/Build/Languages/portuguese_br.lng +++ b/FreeFileSync/Build/Languages/portuguese_br.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Qualquer número de pares alternativos de diretórios para no máximo um arquivo de configuração. +Open configuration for edit without executing. +Abrir configuração para editar sem executar. + Cannot find the following folders: Não foi possível localizar as seguintes pastas: @@ -184,11 +187,11 @@ Move file on right Mover arquivo à direita -Overwrite left item -Sobrescrever item à esquerda +Update left item +Atualizar item da esquerda -Overwrite right item -Sobrescrever item à direita +Update right item +Atualizar item da direita Do nothing Não fazer nada @@ -217,6 +220,9 @@ %x GB %x GB +Cannot load file %x. +Não foi possível carregar o aquivo %x. + Database file %x is incompatible. O arquivo de banco de dados %x é incompatível. @@ -268,6 +274,9 @@ Creating file %x Criando arquivo %x +Saving file %x... +Salvando arquivo %x... + Items processed: Elementos processados: @@ -295,9 +304,6 @@ %x threads -Encoding extended time information: %x -Codificando informações adicionais de tempo: %x - /sec /seg @@ -319,9 +325,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. Por favor, utilize a versão 64 bits do FreeFileSync para criar cópias de sombra neste sistema. -Cannot load file %x. -Não foi possível carregar o aquivo %x. - Cannot determine volume name for %x. Não foi possível determinar o nome do volume para %x. @@ -340,7 +343,7 @@ Save &as... Salvar &como... -&Quit +E&xit Sai&r &File @@ -435,6 +438,9 @@ O comando é disparado se: &Show error &Mostrar erro +&Quit +Sai&r + Incorrect command line: Linha de comando incorreta: @@ -480,11 +486,11 @@ O comando é disparado se: Creating folder %x Criando pasta %x -Overwriting file %x -Substituindo arquivo %x +Updating file %x +Atualizando arquivo %x... -Overwriting symbolic link %x -Substituindo link simbólico %x +Updating symbolic link %x +Atualizando link simbólico %x Verifying file %x Verificando arquivo %x @@ -498,21 +504,21 @@ O comando é disparado se: Data verification error: %x and %y have different content. Erro na verificação dos dados: %x e %y têm conteúdo diferente. -Cannot find folder %x. -Não foi possível encontrar a pasta %x. - Target folder %x already existing. Pasta de destino %x já existe. +Cannot find folder %x. +Não foi possível encontrar a pasta %x. + Target folder input field must not be empty. Campo de entrada da pasta de destino não pode ficar vazio. -Please enter a target folder for versioning. -Por favor, entre com uma pasta destino para controle de versões. - Source folder %x not found. Pasta de origem %x não foi encontrada. +Please enter a target folder for versioning. +Por favor, entre com uma pasta destino para controle de versões. + The following items have unresolved conflicts and will not be synchronized: Os seguintes itens possuem conflitos não resolvidos e não serão sincronizados: @@ -555,8 +561,8 @@ O comando é disparado se: Synchronization completed successfully Sincronização finalizada com sucesso -Saving log file %x... -Salvando arquivo de log %x... +Cleaning up old log files... +Limpando arquivo de log antigo... Stopped Interrompido @@ -609,8 +615,8 @@ O comando é disparado se: FreeFileSync is up to date. FreeFileSync está atualizado. -Unable to connect to sourceforge.net. -Não foi possível conectar a sourceforge.net. +Unable to connect to FreeFileSync.org. +Não foi possível conectar a FreeFileSync.org. Cannot find current FreeFileSync version number online. Do you want to check manually? Não foi possível encontrar a versão atual do FreeFileSync online. Deseja verificar manualmente? @@ -694,10 +700,22 @@ O comando é disparado se: Salvar como &tarefa em lote... Start &comparison -Iniciar c&omparação +Iniciar &Comparação + +C&omparison settings +Configurações de C&omparação + +&Filter settings +Configurações de &Filtro + +S&ynchronization settings +Configurações de S&incronização Start &synchronization -Iniciar s&incronização +Iniciar &Sincronização + +&Actions +A&ções &Options &Opções @@ -777,8 +795,8 @@ O comando é disparado se: Number of files and folders that will be deleted Número de arquivos e pastas que serão apagados -Number of files that will be overwritten -Número de arquivos que serão substituídos +Number of files that will be updated +Número de arquivos que serão atualizados Number of files and folders that will be created Número de arquivos e pastas que serão criados @@ -807,8 +825,14 @@ O comando é disparado se: Handle daylight saving time Como lidar com horário de verão -Symbolic links: -Links simbólicos: +Include symbolic links: +Incluir links simbólicos: + +Direct +Direto + +Follow +Seguir More information Mais informação @@ -837,24 +861,24 @@ O comando é disparado se: Maximum: Máximo: -C&lear -&Limpar - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Selecione regras de filtro para exlcuir certos arquivos da sincronização. Entre com os caminhos relativos dos pares de pastas correspondentes. +C&lear +&Limpar + Detect moved files Detectar arquivos movidos -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems +- Detecção ativa após sincronização inicial - Requer e cria arquivos de banco de dados -- Detecção ativa após sincronismo incial -- Não suportado por todos os sistemas de arquivo +- Não suportado por todos os sistemas Detect synchronization directions with the help of database files @@ -1067,27 +1091,15 @@ Isto garante um estado consistente mesmo em caso de erro grave. View Settings Ver configurações -Overview -Parâmetros - Configuration Configuração +Overview +Parâmetros + Main Bar Barra Principal -Start comparison -Iniciar comparação - -Comparison settings -Parâmetros de comparação - -Synchronization settings -Parâmetros de sincronização - -Start synchronization -Iniciar a sincronização - Confirm Confirmar @@ -1238,11 +1250,11 @@ Isto garante um estado consistente mesmo em caso de erro grave. Show files that will be deleted on the right side Mostrar arquivos que serão apagados no lado direito -Show files that will be overwritten on left side -Mostrar arquivos que serão substituídos no lado esquerdo +Show files that will be updated on the left side +Mostrar arquivos que serão atualizados no lado esquerdo -Show files that will be overwritten on right side -Mostrar arquivos que serão substituídos no lado direito +Show files that will be updated on the right side +Mostrar arquivos que serão atualizados no lado direito Show files that won't be copied Mostrar arquivos que não serão copiados @@ -1379,15 +1391,6 @@ Isto garante um estado consistente mesmo em caso de erro grave. Configure your own synchronization rules. Configure as suas próprias regras de sincronização. -Exclude -Excluir - -Direct -Direto - -Follow -Seguir - Today Hoje @@ -1451,9 +1454,6 @@ Isto garante um estado consistente mesmo em caso de erro grave. Cannot monitor directory %x. Não foi possível monitorar o diretório %x. -Conversion error: -Erro de conversão: - Cannot delete file %x. Não foi possível apagar o arquivo %x. @@ -1487,8 +1487,8 @@ Isto garante um estado consistente mesmo em caso de erro grave. Cannot create directory %x. Não foi possível criar o diretório %x. -Cannot create symbolic link %x. -Não foi possível criar o link simbólico %x. +Cannot copy symbolic link %x to %y. +Não foi possível copiar o link simbólico %x para %y. Cannot find system function %x. Não foi possível localizar a função de sistema %x. @@ -1571,3 +1571,72 @@ Isto garante um estado consistente mesmo em caso de erro grave. Configuration file %x loaded partially only. O arquivo de configuração %x foi carregado parcialmente. +Prepare installation +Preparando a instalação + +Choose which components you want to install. +Escolha os componentes a serem instalados. + +Select installation type: +Selecione o tipo de instalação: + +Local +Local + +Portable +Portátil + +recommended +recomendada + +Save settings to "%APPDATA%\FreeFileSync" +Salva as configurações em "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Registra as extensões de arquivos do FreeFileSync + +Create Explorer context menu entries +Cria entrada no menu de contexto do Explorer + +Save settings in installation directory +Salva as configurações no diretório de instalação + +Do not write to Registry +Não escreve no Registro + +Just copy the files +Apenas copia os arquivos + +Choose a directory for installation: +Escolha um diretório para a instalação: + +Create shortcuts: +Criar atalhos: + +Desktop +Área de trabalho + +Start menu +Menu Iniciar + +Registering FreeFileSync file extensions +Registrando as extensões de arquivos do FreeFileSync + +Unregistering FreeFileSync file extensions +Desregistrando as extensões de arquivos do FreeFileSync + +FreeFileSync Configuration +Configuração do FreeFileSync + +FreeFileSync Batch File +Arquivo de lote do FreeFileSync + +FreeFileSync Synchronization Database +Banco de dados de sincronização do FreeFileSync + +RealtimeSync Configuration +Configuração do RealtimeSync + +Edit with FreeFileSync +Editar com FreeFileSync + diff --git a/FreeFileSync/Build/Languages/romanian.lng b/FreeFileSync/Build/Languages/romanian.lng index ee8e29ac..cfe2119f 100644 --- a/FreeFileSync/Build/Languages/romanian.lng +++ b/FreeFileSync/Build/Languages/romanian.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Orice număr de perechi alternative de dosare pentru cel mult o filă de configurare. +Open configuration for edit without executing. +Deschide configurația pentru editare fără executarea ei. + Cannot find the following folders: Nu pot găsi dosarele următoare: @@ -184,11 +187,11 @@ Move file on right Mută fila în dreapta -Overwrite left item -Suprascrie elementul stîng cu cel drept +Update left item +Actualizează elementul stîng -Overwrite right item -Suprascrie elementul drept cu cel stîng +Update right item +Actualizează elementul drept Do nothing Nici o acțiune @@ -218,6 +221,9 @@ %x GB %x GB +Cannot load file %x. +Nu pot deschide fila %x. + Database file %x is incompatible. Fila cu baza de date %x este incompatibilă. @@ -270,6 +276,9 @@ Creating file %x Creez fila %x +Saving file %x... +Salvez fila %x... + Items processed: Elemente Procesate: @@ -298,9 +307,6 @@ %x de fire -Encoding extended time information: %x -Codez informațiile extinse despre timp: %x - /sec /sec @@ -322,9 +328,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. Folosește versiunea pe 64-biți a FreeFileSync pentru a crea conservări (copii de rezervă) pe acest sistem. -Cannot load file %x. -Nu pot deschide fila %x. - Cannot determine volume name for %x. Nu pot determina numele volumului pentru %x. @@ -343,7 +346,7 @@ Save &as... Salvează c&a... -&Quit +E&xit &Ieși &File @@ -368,7 +371,7 @@ 2. Scrie calea. 3. Press 'Start'. -3. Apasă 'Pornește'. +3. Apasă pe 'Pornește'. To get started just import a .ffs_batch file. Pentru a începe, importă o filă de tipul .ffs_batch. @@ -438,6 +441,9 @@ Comanda este declanșată dacă: &Show error A&rată eroarea +&Quit +&Ieși + Incorrect command line: Linie de comandă incorectă: @@ -483,11 +489,11 @@ Comanda este declanșată dacă: Creating folder %x Creez dosarul %x -Overwriting file %x -Suprascriu fila %x +Updating file %x +Actualizez fila %x -Overwriting symbolic link %x -Suprascriu legătura simbolică %x +Updating symbolic link %x +Actualizez legătura simbolică %x Verifying file %x Verific fila %x @@ -501,21 +507,21 @@ Comanda este declanșată dacă: Data verification error: %x and %y have different content. Eroare la verificarea datelor: %x și %y au conținut diferit. -Cannot find folder %x. -Nu pot găsi dosarul %x. - Target folder %x already existing. Dosarul țintă %x există deja. +Cannot find folder %x. +Nu pot găsi dosarul %x. + Target folder input field must not be empty. Cîmpul de introducere a dosarului țintă nu trebuie să fie gol. -Please enter a target folder for versioning. -Introdu dosarul țintă pentru versionare. - Source folder %x not found. Dosarul sursă %x nu a fost găsit. +Please enter a target folder for versioning. +Introdu dosarul țintă pentru versionare. + The following items have unresolved conflicts and will not be synchronized: Există conflicte nerezolvate la elementele listate mai jos, deci ele nu vor fi sincronizate: @@ -558,8 +564,8 @@ Comanda este declanșată dacă: Synchronization completed successfully Sincronizare realizată cu succes -Saving log file %x... -Salvez fila jurnal %x... +Cleaning up old log files... +Curăț filele de jurnalizare vechi... Stopped Oprită @@ -613,8 +619,8 @@ Comanda este declanșată dacă: FreeFileSync is up to date. Ai deja ultima versiune a softului. -Unable to connect to sourceforge.net. -Conectarea la situl sourceforge.net nu poate fi realizată. +Unable to connect to FreeFileSync.org. +Nu pot face conectarea la FreeFileSync.org. Cannot find current FreeFileSync version number online. Do you want to check manually? Nu pot afla numărul versiunii FreeFileSync disponibile acum pe internet. Vrei să-l cauți manual? @@ -668,7 +674,7 @@ Comanda este declanșată dacă: Filtru Local Active -Activ +Activă None Nimic @@ -700,9 +706,21 @@ Comanda este declanșată dacă: Start &comparison Pornește &Compararea +C&omparison settings +Setările C&omparării + +&Filter settings +Setările &Filtrării + +S&ynchronization settings +Setările Sincroni&zării + Start &synchronization Pornește &Sincronizarea +&Actions +&Acțiuni + &Options &Opțiuni @@ -770,7 +788,7 @@ Comanda este declanșată dacă: Salvează ca... View type: -Tipul de Vedere: +Tipul Vederii: Select view: Selectează Vederea: @@ -781,8 +799,8 @@ Comanda este declanșată dacă: Number of files and folders that will be deleted Numărul de file și dosare care vor fi șterse -Number of files that will be overwritten -Numărul de file care vor fi suprascrise +Number of files that will be updated +Numărul filelor care vor fi actualizate Number of files and folders that will be created Numărul de file și dosare care vor fi create @@ -811,8 +829,14 @@ Comanda este declanșată dacă: Handle daylight saving time Gestionarea timpului de vară (DST) -Symbolic links: -Legături Simbolice: +Include symbolic links: +Include legăturile simbolice: + +Direct +Direcționează + +Follow +Urmărește More information Mai multe informații @@ -841,24 +865,24 @@ Comanda este declanșată dacă: Maximum: Maxim: -C&lear -C&urăță - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Selectează regulile filtrului pentru a exclude anumite file de la sincronizare. Introdu căile filelor relative la perechea lor de dosare corespondentă. +C&lear +C&urăță + Detect moved files Detectează filele mutate -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- Solicită și creează file cu baze de date - Detectare activă după sincronizarea inițială -- Nesuportat de toate sistemele de file +- Necesită și creează file cu bază de date +- Nu-i suportat de toate sistemele de file Detect synchronization directions with the help of database files @@ -1071,27 +1095,15 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției View Settings Setări de Vedere -Overview -Panoramă - Configuration Configurație +Overview +Panoramă + Main Bar Bara Principală -Start comparison -Pornește Compararea - -Comparison settings -Setările Comparării - -Synchronization settings -Setările Sincronizării - -Start synchronization -Pornește Sincronizarea - Confirm Confirmă @@ -1246,11 +1258,11 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției Show files that will be deleted on the right side Arată elementele (file/dosare) care vor fi șterse în dreapta -Show files that will be overwritten on left side -Arată elementele (file/dosare) care vor fi suprascrise în stînga +Show files that will be updated on the left side +Arată elementele (file/dosare) care vor fi actualizate în partea stîngă -Show files that will be overwritten on right side -Arată elementele (file/dosare) care vor fi suprascrise în dreapta +Show files that will be updated on the right side +Arată elementele (file/dosare) care vor fi actualizate în partea dreaptă Show files that won't be copied Arată elementele (file/dosare) care nu vor fi copiate @@ -1262,7 +1274,7 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției Setează ca implicit Filter -Filtru +Filtrare All files are in sync Toate filele sînt sincronizate @@ -1389,15 +1401,6 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției Configure your own synchronization rules. Reguli de sincronizare definite de utilizator pentru fiecare situație. -Exclude -Exclude - -Direct -Direcționează - -Follow -Urmărește - Today Azi @@ -1461,9 +1464,6 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției Cannot monitor directory %x. Nu pot monitoriza dosarul %x. -Conversion error: -Eroare de convertire: - Cannot delete file %x. Nu pot șterge fila %x. @@ -1497,8 +1497,8 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției Cannot create directory %x. Nu pot crea dosarul %x. -Cannot create symbolic link %x. -Nu pot crea legătura simbolică %x. +Cannot copy symbolic link %x to %y. +Nu pot copia legătura simbolică %x în %y. Cannot find system function %x. Nu pot găsi funcția de sistem %x. @@ -1584,3 +1584,72 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției Configuration file %x loaded partially only. Fila de configurație %x a fost deschisă doar parțial. +Prepare installation +Pregătirea Instalării + +Choose which components you want to install. +Alege ce componente vrei să instalezi. + +Select installation type: +Selectează tipul de instalare: + +Local +Locală + +Portable +Portabilă + +recommended +recomandată + +Save settings to "%APPDATA%\FreeFileSync" +Salvează setările în "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Înregistrează extensiile de file FreeFileSync + +Create Explorer context menu entries +Creează intrări în meniul contextual al Exploratorului de File + +Save settings in installation directory +Salvează setările în dosarul de instalare + +Do not write to Registry +Nu scrie în Registru + +Just copy the files +Copiază doar filele + +Choose a directory for installation: +Alege un dosar pentru instalare: + +Create shortcuts: +Creează scurtături: + +Desktop +Birou [Desktop] + +Start menu +Meniul de Start + +Registering FreeFileSync file extensions +Înregistrez extensiile de file FreeFileSync + +Unregistering FreeFileSync file extensions +Dezînregistrez extensiile de file FreeFileSync + +FreeFileSync Configuration +Configurație FreeFileSync + +FreeFileSync Batch File +Filă Set [Batch] FreeFileSync + +FreeFileSync Synchronization Database +Bază de Date pentru Sincronizare FreeFileSync + +RealtimeSync Configuration +Configurație a Sincronizării în Timp Real + +Edit with FreeFileSync +Editează cu FreeFileSync + diff --git a/FreeFileSync/Build/Languages/russian.lng b/FreeFileSync/Build/Languages/russian.lng index ca7d03f9..e052fbf9 100644 --- a/FreeFileSync/Build/Languages/russian.lng +++ b/FreeFileSync/Build/Languages/russian.lng @@ -97,6 +97,9 @@ Any number of alternative directory pairs for at most one config file. Любое количество альтернативных пар папок для не более одного конфигурационного файла. +Open configuration for edit without executing. +Открыть конфигурацию для редактирования без выполнения. + Cannot find the following folders: Невозможно найти следующие папки: @@ -187,11 +190,11 @@ Move file on right Переместить файл направо -Overwrite left item -Перезаписать элемент слева +Update left item +Обновить элемент слева -Overwrite right item -Перезаписать элемент справа +Update right item +Обновить элемент справа Do nothing Ничего не делать @@ -221,6 +224,9 @@ %x GB %x ГБ +Cannot load file %x. +Невозможно загрузить файл %x. + Database file %x is incompatible. Файл базы данных %x несовместим. @@ -273,6 +279,9 @@ Creating file %x Создание файла %x +Saving file %x... +Сохранение файла %x... + Items processed: Элементов обработано: @@ -301,9 +310,6 @@ %x потоков -Encoding extended time information: %x -Кодирование расширенной информации о времени: %x - /sec /с @@ -325,9 +331,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. Пожалуйста, используйте 64-разрядную версию FreeFileSync для создания теневых копий на этой системе. -Cannot load file %x. -Невозможно загрузить файл %x. - Cannot determine volume name for %x. Невозможно определить имя тома для %x. @@ -346,7 +349,7 @@ Save &as... Сохранить &как... -&Quit +E&xit &Выход &File @@ -441,6 +444,9 @@ The command is triggered if: &Show error &Показать ошибку +&Quit +&Выход + Incorrect command line: Неверная командная строка: @@ -486,11 +492,11 @@ The command is triggered if: Creating folder %x Создание папки %x -Overwriting file %x -Перезапись файла %x +Updating file %x +Обновление файла %x -Overwriting symbolic link %x -Перезапись символьной ссылки %x +Updating symbolic link %x +Обновление символьной ссылки %x Verifying file %x Проверка файла %x @@ -504,21 +510,21 @@ The command is triggered if: Data verification error: %x and %y have different content. Ошибка проверки данных: %x и %y имеют разное содержание! -Cannot find folder %x. -Невозможно найти папку %x. - Target folder %x already existing. Целевая папка %x уже существует. +Cannot find folder %x. +Невозможно найти папку %x. + Target folder input field must not be empty. Поле ввода целевой папки не должно быть пустым. -Please enter a target folder for versioning. -Пожалуйста, введите целевую папку для архивирования файлов. - Source folder %x not found. Исходная папка %x не найдена. +Please enter a target folder for versioning. +Пожалуйста, введите целевую папку для архивирования файлов. + The following items have unresolved conflicts and will not be synchronized: Следующие элементы имеют неурегулированные конфликты и не будут синхронизированы: @@ -564,8 +570,8 @@ The command is triggered if: Synchronization completed successfully Синхронизация завершена успешно -Saving log file %x... -Сохранение лог-файла %x... +Cleaning up old log files... +Очистка старых лог-файлов (журналов) Stopped Остановлено @@ -619,8 +625,8 @@ The command is triggered if: FreeFileSync is up to date. У Вас самая последняя версия FreeFileSync. -Unable to connect to sourceforge.net. -Невозможно соединиться с sourceforge.net. +Unable to connect to FreeFileSync.org. +Невозможно соединиться с FreeFileSync.org. Cannot find current FreeFileSync version number online. Do you want to check manually? Невозможно найти номер текущей версии FreeFileSync онлайн! Вы хотите проверить вручную? @@ -706,9 +712,21 @@ The command is triggered if: Start &comparison Начать с&равнение +C&omparison settings +Настройки сра&внения + +&Filter settings +Настройки &фильтра + +S&ynchronization settings +Настройки син&хронизации + Start &synchronization Начать с&инхронизацию +&Actions +&Действия + &Options &Настройки @@ -716,7 +734,7 @@ The command is triggered if: &Язык &Find... -&Найти... +Н&айти... &Reset layout &Сбросить расположение @@ -787,8 +805,8 @@ The command is triggered if: Number of files and folders that will be deleted Количество файлов и папок, которые будут удалены -Number of files that will be overwritten -Количество файлов, которые будут перезаписаны +Number of files that will be updated +Количество файлов, которые будут обновлены Number of files and folders that will be created Количество файлов и папок, которые будут созданы @@ -817,8 +835,14 @@ The command is triggered if: Handle daylight saving time Ручной переход на летнее время -Symbolic links: -Символьные ссылки: +Include symbolic links: +Включать символьные ссылки: + +Direct +Прямое + +Follow +Последовательное More information Больше информации @@ -847,28 +871,28 @@ The command is triggered if: Maximum: максимум: -C&lear -&Очистить - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Выберите правила фильтрации для исключения определенных файлов из синхронизации. Введите пути файлов относящиеся к соответствующим парам папок. +C&lear +&Очистить + Detect moved files Обнаруживать перемещенные файлы -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- Создает базу данных файлов -- Обнаруживает активность после начальной синхронизации +- Обнаружение активируется после первой синхронизации +- Требует и создает базы данных в синхронизируемых папках - Поддерживается не всеми файловыми системами Detect synchronization directions with the help of database files -Обнаружение направления синхронизации с помощью файлов баз данных +Обнаружение направления синхронизации с помощью базы данных Delete files: Удаление файлов: @@ -965,13 +989,13 @@ The command is triggered if: Запустить свернутым Save log: -Сохранить лог-файл: +Сохранять лог-файлы (журналы): Limit: Ограничение: Limit maximum number of log files -Ограничить максимальное количество лог-файлов +Ограничить максимальное количество лог-файлов (журналов) How can I schedule a batch job? Как запланировать пакетное задание? @@ -1081,27 +1105,15 @@ This guarantees a consistent state even in case of a serious error. View Settings Настройки просмотра -Overview -Главная - Configuration Конфигурация +Overview +Главная + Main Bar Главная панель -Start comparison -Начать сравнение - -Comparison settings -Настройки сравнения - -Synchronization settings -Настройки синхронизации - -Start synchronization -Начать синхронизацию - Confirm Подтвердить @@ -1256,11 +1268,11 @@ This guarantees a consistent state even in case of a serious error. Show files that will be deleted on the right side Показать файлы, которые будут удалены на правой стороне -Show files that will be overwritten on left side -Показать файлы, которые будут перезаписаны на левой стороне +Show files that will be updated on the left side +Показать файлы, которые будут обновлены на левой стороне -Show files that will be overwritten on right side -Показать файлы, которые будут перезаписаны на правой стороне +Show files that will be updated on the right side +Показать файлы, которые будут обновлены на правой стороне Show files that won't be copied Показать файлы, которые не будут скопированы @@ -1402,15 +1414,6 @@ This guarantees a consistent state even in case of a serious error. Configure your own synchronization rules. Настроить свои собственные правила синхронизации. -Exclude -Исключить - -Direct -Прямое - -Follow -Последовательное - Today сегодня @@ -1474,9 +1477,6 @@ This guarantees a consistent state even in case of a serious error. Cannot monitor directory %x. Невозможно наблюдать папку %x. -Conversion error: -Ошибка преобразования: - Cannot delete file %x. Невозможно удалить файл %x. @@ -1510,8 +1510,8 @@ This guarantees a consistent state even in case of a serious error. Cannot create directory %x. Невозможно создать папку %x. -Cannot create symbolic link %x. -Невозможно создать символьную ссылку %x. +Cannot copy symbolic link %x to %y. +Невозможно скопировать символьную ссылку %x в %y. Cannot find system function %x. Невозможно найти системную функцию %x. @@ -1597,3 +1597,72 @@ This guarantees a consistent state even in case of a serious error. Configuration file %x loaded partially only. Конфигурационный файл %x загрузился частично. +Prepare installation +Подготовка установки + +Choose which components you want to install. +Выберите, какие компоненты вы хотите установить. + +Select installation type: +Выберите тип установки: + +Local +Локальная + +Portable +Переносная + +recommended +рекомендуется + +Save settings to "%APPDATA%\FreeFileSync" +Сохраняет настройки в "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Регистрирует расширения файлов FreeFileSync + +Create Explorer context menu entries +Создать пункты контекстного меню в Проводнике + +Save settings in installation directory +Сохраняет настройки в папке установки + +Do not write to Registry +Ничего не пишет в Реестр + +Just copy the files +Только копирует файлы + +Choose a directory for installation: +Выберите папку для установки: + +Create shortcuts: +Создать ярлыки: + +Desktop +на рабочем столе + +Start menu +в меню Пуск + +Registering FreeFileSync file extensions +Регистрация расширений файлов FreeFileSync + +Unregistering FreeFileSync file extensions +Удаление регистрации расширений файлов FreeFileSync + +FreeFileSync Configuration +Конфигурация FreeFileSync + +FreeFileSync Batch File +Файл пакетного задания FreeFileSync + +FreeFileSync Synchronization Database +База данных синхронизации FreeFileSync + +RealtimeSync Configuration +Конфигурация RealtimeSync + +Edit with FreeFileSync +Редактировать с помощью FreeFileSync + diff --git a/FreeFileSync/Build/Languages/scottish_gaelic.lng b/FreeFileSync/Build/Languages/scottish_gaelic.lng deleted file mode 100644 index 14ff1dc5..00000000 --- a/FreeFileSync/Build/Languages/scottish_gaelic.lng +++ /dev/null @@ -1,1599 +0,0 @@ -
      - Gàidhlig - Michael Bauer aka Akerbeltz - gd - flag_scotland.png - 4 - (n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3 -
      - -Both sides have changed since last synchronization. -Chaidh an dà thaobh atharrachadh on t-sioncronachadh mu dheireadh. - -Cannot determine sync-direction: -Cha ghabh comhair an t-sioncronachaidh aithneachadh: - -No change since last synchronization. -Cha deach dad atharrachadh on t-sioncronachadh mu dheireadh. - -The database entry is not in sync considering current settings. -Chan eil innteart an stòir-dhàta sioncronaicht a-rèir nan roghainnean làithreach - -Setting default synchronization directions: Old files will be overwritten with newer files. -A’ suidheachadh comhair bhunaiteach an t-sioncronachaidh: Thèid faidhlichean nas ùire a sgrìobhadh thairis air seann-fhaidhlichean. - -Checking recycle bin availability for folder %x... -A’ toirt sùil a bheil am biona ri fhaighin airson a’ phasgain %x... - -Moving file %x to the recycle bin -A’ gluasad an fhaidhle %x dhan bhiona - -Moving folder %x to the recycle bin -A’ gluasad a’ phasgain %x dhan bhiona - -Moving symbolic link %x to the recycle bin -A’ gluasad an symbolic link %x dhan bhiona - -Deleting file %x -A’ sguabadh às an fhaidhle %x - -Deleting folder %x -A’ sguabadh às a’ phasgain %x - -Deleting symbolic link %x -A’ sguabadh às an symbolic link %x - -The recycle bin is not available for the following folders. Files will be deleted permanently instead: -Chan eil am biona ri làimh airson nam pasganan a leanas. Thèid an sguabadh às gu buan an àite sin: - -An exception occurred -Thachair eisgeachd - -A directory path is expected after %x. -Tha dùil ri slighe pasgain an dèidh %x - -Syntax error -Mearachd co-chàraidh - -Cannot open file %x. -Cha ghabh am faidhle %x fhosgladh. - -File %x does not contain a valid configuration. -Chan eil rèiteachadh dligheach san fhaidhle %x. - -Unequal number of left and right directories specified. -Chan eil àireamh nam pasganan air an taobh chlì ’s an taobh deas co-ionnann - -The config file must not contain settings at directory pair level when directories are set via command line. -Chan fhaod roghainnean aig ìre paidhrichean nam pasganan a bhith san fhaidhle rèiteachaidh nuair a thathar a’ cur pasganan slighe na loidhne-àithne. - -Directories cannot be set for more than one configuration file. -Cha ghabh pasganan a shuidheachadh airson barrachd air aon fhaidhle rèiteachaidh. - -Command line -Loidhne-àithne - -Syntax: -Co-chàradh: - -global config file: -faidhle uile-choitcheann an rèiteachaidh - -config files: -faidhlichean rèiteachaidh: - -directory -pasgan - -Path to an alternate GlobalSettings.xml file. -Slighe gu faidhle GlobalSettings.xml eile - -Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files. -Àireamh sam bith de dh’fhaidhlichean rèiteachaidh FreeFileSync .ffs_gui agus/no .ffs_batch - -Any number of alternative directory pairs for at most one config file. -Àireamh sam bith de phaidhrichean pasgain eile airson aon fhaidhle rèiteachaidh air a’ char as fhaide - -Cannot find the following folders: -Chan urrainn dhuinn na pasgain a leanas a lorg: - -You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization. -’S urrainn dhut a’ mhearachd seo a leigeil seachad ma tha thu airson ’s gun dèilig sinn ri gach pasgan mar gum biodh iad falamh. Thèid na pasgain a chruthachadh gu fèin-obrachail an uairsin rè an t-sioncronachaidh - -A folder input field is empty. -Tha co-dhiù aon raon pasgain ann a tha falamh. - -The corresponding folder will be considered as empty. -Thèid am pasgan a leanas a làimhseachadh mar phasgan falamh. - -The following folder paths are dependent from each other: -Tha slighean nam pasganan a leanas an eisimeil a chèile: - -File %x has an invalid date. -Tha ceann-là mì-dhligheach aig an fhaidhle %x. - -Date: -Ceann-là: - -Files %x have the same date but a different size. -Tha an dearbh cheann-là aig na faidhlichean %x ach chan eil am meud co-ionnann. - -Size: -Meud: - -Content comparison was skipped for excluded files %x. -Leumadh thairis air coimeas na susbaint mu choinneamh nam faidhlichean a chaidh an dùnadh às (%x). - -Items differ in attributes only -Chan eil diofar eatarra ach a thaobh an cuid bhuadhan - -Resolving symbolic link %x -Duilgheadas a’ rèiteachadh a’ symbolic link %x - -Comparing content of files %x -A’ dèanamh coimheas eadar na faidhlichean %x - -Generating file list... -A’ gintinn liosta nam faidhle... - -Starting comparison -A’ tòiseachadh air a’ choimeasadh - -Calculating sync directions... -Ag àireamhachadh comhairean an t-sioncronachaidh... - -Out of memory. -Chan eil cuimhne gu leòr ann. - -Item exists on left side only -Chan eil an nì seo ann ach air an taobh chlì - -Item exists on right side only -Chan eil an nì seo ann ach air an taobh deas - -Left side is newer -Tha an taobh clì nas ùire - -Right side is newer -Tha an taobh deas nas ùire - -Items have different content -Tha diofar susbaint sna nithean - -Both sides are equal -Tha an dà thaobh co-ionnann - -Conflict/item cannot be categorized -Tha còmhstri/nì ann nach urrainn dhuinn aithneachadh - -Copy new item to left -Cuir lethbhreac dhen nì ùr dhan taobh chlì - -Copy new item to right -Cuir lethbhreac dhen nì ùr dhan taobh deas - -Delete left item -Sguab às an nì air an taobh chlì - -Delete right item -Sguab às an nì air an taobh deas - -Move file on left -Gluais am faidhle a tha air an taobh chlì - -Move file on right -Gluais am faidhle a tha air an taobh deas - -Overwrite left item -Sgrìobh thairis air an nì chlì - -Overwrite right item -Sgrìobh thairis air an nì deas - -Do nothing -Na dèan dad - -Update attributes on left -Ùraich na buadhan air an taobh chlì - -Update attributes on right -Ùraich na buadhan air an taobh deas - - -1 byte -%x bytes - - -%x byte -%x bytes -%x bytes -%x bytes - - -%x MB -%x MB - -%x KB -%x KB - -%x GB -%x GB - -Database file %x is incompatible. -Chan eil am faidhle stòir-dhàta %x co-chòrdail. - -Initial synchronization: -A’ chiad sioncronachadh: - -Database file %x does not yet exist. -Chan eil am faidhle stòir-dhàta %x ann fhathast. - -Database file is corrupt: -Tha am faidhle stòir-dhàta coirbte: - -Cannot write file %x. -Cha ghabh am faidhle %x a sgrìobhadh. - -Cannot read file %x. -Cha ghabh am faidhle %x a leughadh. - -Database files do not share a common session. -Chan eil seisean an cumantas aig na faidhlichean stòir-dhàta. - -Searching for folder %x... -A’ lorg a’ phasgain %x... - -Cannot read file attributes of %x. -Cha ghabh buadhan an fhaidhle %x a leughadh. - -Cannot get process information. -Chan urrainn dhuinn greim fhaighinn air fiosrachadh a’ phròiseis. - -Waiting while directory is locked: -A’ feitheamh fhad ’s a thèid am pasgan a ghlasadh: - -Lock owner: -Glais an sealbhadair: - - -1 sec -%x sec - - -%x diog -%x dhiog -%x diogan -%x diog - - -Detecting abandoned lock... -A’ mothachadh ri glasan trèigte... - -Creating file %x -A’ cruthachadh an fhaidhle %x - -Items processed: -Nithean a tha deiseil: - -Items remaining: -Nithean a tha ri dhèanamh: - -Total time: -An ùine gu lèir: - -Error parsing file %x, row %y, column %z. -Mearachd le parsadh an fhaidhle %x, loidhne %y, colbh %z. - -Cannot set directory lock for %x. -Cha ghabh glas a’ phasgain airson %x a shuidheachadh. - -Scanning: -’Ga sganadh: - - -1 thread -%x threads - - -%x shnàithlean -%x shnàithlean -%x snàithleanan -%x snàithlean - - -Encoding extended time information: %x -A’ còdachadh fiosrachadh leudaichte an ama: %x - -/sec -/diog - -%x items/sec -%x nithean/diog - -Show in Explorer -Seall san taisgealaiche - -Open with default application -Fosgail leis an aplacaid bhunaiteach - -Browse directory -Rùraich am pasgan - -Cannot access the Volume Shadow Copy Service. -Chan fhaigh sinn cothrom air seirbheise lethbhreacan sgàil an draibh. - -Please use FreeFileSync 64-bit version to create shadow copies on this system. -Nach cleachd sibh an tionndadh 64 biot de FreeFileSync gus lethbhreacan-sgàile a chruthachadh air an t-siostam seo? - -Cannot load file %x. -Cha ghabh am faidhle %x a lorg. - -Cannot determine volume name for %x. -Chan urrainn dhuinn ainm an draibh airson %x a dhearbhadh. - -Volume name %x is not part of file path %y. -Chan eil ainm an draibh %x ’na phàirt de shlighe an fhaodhle %y. - -Stop requested: Waiting for current operation to finish... -Dh’iarr thu oirnn sgur: A’ feitheamh ri crìoch na h-obrach làithreach... - -Unable to create time stamp for versioning: -Cha ghabh stampa ama a chruthachadh airson versioning: - -&Open... -F&osgail... - -Save &as... -Sàbhail &mar... - -&Quit -&Fàg - -&File -&Faidhle - -&View help -&Faic a’ chobhair - -&About -&Mu dheidhinn - -&Help -&Cobhair - -Usage: -Cleachdadh: - -1. Select folders to watch. -1. Tagh na pasgain air an cumar sùil. - -2. Enter a command line. -2. Cuir a-steach àithne. - -3. Press 'Start'. -3. Briog air ”Tòisich”. - -To get started just import a .ffs_batch file. -Cha leig thu leas ach faidhle .ffs_batch ion-phortadh airson toiseach tòiseachaidh. - -Folders to watch: -Pasganan air an cumar sùil: - -Add folder -Cuir pasgan ris - -Remove folder -Thoir am pasgan air falbh - -Browse -Rùraich - -Select a folder -Tagh pasgan - -Idle time (in seconds): -Ùine ’na thàmh (ann an diogan): - -Idle time between last detected change and execution of command -An tàmh eadar an t-atharrachadh mu dheireadh agus gnìomhachadh na h-àithne - -Command line: -Loidhne-àithne: - - -The command is triggered if: -- files or subfolders change -- new folders arrive (e.g. USB stick insert) - - -Thèid an loidhne-àithne a chur gu dol: -- ma dh’atharraicheas faidhlichean no fo-phasgain -- ma nochdas pasgain ùra (m.e. ma chuireas tu a-steach bioran USB) - - -&Start -Tòi&sich - -About -Mu dheidhinn - -Build: %x -Build: %x - -All files -Gach faidhle - -Automated Synchronization -Sioncronachadh fèin-obrachail - -Directory monitoring active -Tha na pasganan ’gam marasgladh - -Waiting until all directories are available... -A’ feitheamh gus am bi gach pasgan ri làimh... - -Error -Mearachd - -&Restore -&Aisig - -&Show error -&Seall a’ mhearachd - -Incorrect command line: -Loidhne-àithne chearr: - -&Retry -&Feuch ris a-rithist - -File content -Susbaint an fhaidhle - -File time and size -Ceann-là is meud - -Two way -An dà chomhair - -Mirror -Sgàthanaich - -Update -Ùraich - -Custom -Gnàthaichte - -Multiple... -Iomadh fear... - -Moving file %x to %y -A’ gluasad an fhaidhle %x gu %y - -Moving folder %x to %y -A’ gluasad a’ phasgain %x gu %y - -Moving symbolic link %x to %y -A’ gluasad an symbolic link %x gu %y - -Removing old versions... -A’ toirt air falbh nan seann tionndaidhean... - -Creating symbolic link %x -A’ cruthachadh an symbolic link %x - -Creating folder %x -A’ cruthachadh a’ phasgain %x - -Overwriting file %x -A’ sgrìobhadh thairis air an fhaidhle %x - -Overwriting symbolic link %x -A’ sgrìobhadh thairis air an symbolic link %x - -Verifying file %x -A’ dearbhadh an fhaidhle %x - -Updating attributes of %x -Ag ùrachadh buadhan %x - -Creating a Volume Shadow Copy for %x... -A’ cruthachadh lethbhreac sgàil draibh airson %x... - -Data verification error: %x and %y have different content. -Mearachd le dearbhadh an dàta: tha susbaint eadar-dhealaichte ann an %x agus %y. - -Cannot find folder %x. -Chan urrainn dhuinn am pasgan %x a lorg - -Target folder %x already existing. -Tha am pasgan-uidhe %x ann mu thràth. - -Target folder input field must not be empty. -Chan fhaod raon a’ phasgain a bhith falamh. - -Please enter a target folder for versioning. -Cuir a-steach pasgan-targaide a chum versioning. - -Source folder %x not found. -Cha deach am pasgan tùsail %x a lorg. - -The following items have unresolved conflicts and will not be synchronized: -Tha còmstrithean aig na nithean a leanas fhathast is cha dèid an sioncronachadh: - -The following folders are significantly different. Make sure you are matching the correct folders for synchronization. -Tha diofar mòr eadar na pasganan a leanas. Dèan cinnteach gu bheil thu a’ maidseadh nam pasganan ceart airson sioncronachadh. - -Not enough free disk space available in: -Chan eil rùm saor gu leòr air an diosga: - -Required: -Na tha feum air: - -Available: -Na tha ri làimh: - -Multiple folder pairs write to a common subfolder. Please review your configuration. -Tha grunnan a phaidhrichean phasganan a’ sgrìobhadh anns an aon fho-phasgan. Thoir sùil air an rèiteachadh - -Synchronizing folder pair: -A’ sioncronachadh paidhir nam pasgan: - -Generating database... -A’ gintinn an stòir-dhàta... - -job name -ainm na h-obrach - -Synchronization stopped -Sguireadh dhen t-sioncronachadh - -Synchronization completed with errors -Chaidh an sioncronachadh a choileanadh ach bha mearachdan ann - -Synchronization completed with warnings -Chaidh a shioncronachadh ach bha rabhaidhean ann - -Nothing to synchronize -Chan eil dad ri shioncronachadh - -Synchronization completed successfully -Chaidh a shioncronachadh - -Saving log file %x... -A’ sàbhaladh faidhle an loga %x... - -Stopped -Chaidh stad a chur air - -You can switch to FreeFileSync's main window to resolve this issue. -’S urrainn dhut leum a ghearradh gu prìomh-uinneag FreeFileSync gus an duilgheadas seo fhuasgladh. - -&Don't show this warning again -Na seall an rabha&dh seo a-rithist - -&Ignore -&Leig seachad - -&Switch -&Dèan suids - -Switching to FreeFileSync's main window -A’ gearradh leum gu prìomh-uinneag FreeFileSync - - -Automatic retry in 1 second... -Automatic retry in %x seconds... - - -A’ feuchainn ris às ùr gu fèin-obrachail ann an %x diog... -A’ feuchainn ris às ùr gu fèin-obrachail ann an %x dhiog... -A’ feuchainn ris às ùr gu fèin-obrachail ann an %x diogan... -A’ feuchainn ris às ùr gu fèin-obrachail ann an %x diog... - - -&Ignore subsequent errors -Le&ig seachad mearachdan às a dhèidh seo - -Retrying operation... -A’ feuchainn ris a-rithist... - -Serious Error -Mearachd mhòr - -Check for Program Updates -Thoir sùil ach a bheil ùrachadh ann airson a’ phrògraim - -A new version of FreeFileSync is available: -Tha tionndadh ùr de FreeFileSync ann: - -Download now? -A bheil thu airson a luchdadh a-nuas an-dràsta? - -&Download -&Luchdaich a-nuas - -FreeFileSync is up to date. -Tha FreeFileSync cho ùr ’s a ghabhas. - -Unable to connect to sourceforge.net. -Cha b’ urrainn dhuinn ceangal a dhèanamh ri Sourceforge.net. - -Cannot find current FreeFileSync version number online. Do you want to check manually? -Chan urrainn dhuinn àireamh an tionndaidh làithrich aig FreeFileSync a lorg air loidhne. A bheil thu airson sùil a thoirt thu fhèin? - -&Check -&Sgrùd - -Symlink -Symlink - -Folder -Pasgan - -Full path -Slighe shlan - -Name -Ainm - -Relative folder -Pasgan dàimheach - -Base folder -Bun-phasgan - -Size -Meud - -Date -Ceann-là - -Extension -Leudachan - -Category -Roinn seòrsa - -Action -Gnìomh - -Drag && drop -Slaod ⁊ leig às - -Local comparison settings -Roghainnean coimeis ionadail - -Local synchronization settings -Roghainnean sioncronachaidh ionadail - -Local filter -Criathrag ionadail - -Active -Gnìomhach - -None -Chan eil gin - -Remove local settings -Thoir air falbh na roghainnean ionadail - -Clear local filter -Falamhaich a’ chriathrag iondail - -Copy -Dèan lethbhreac - -Paste -Cuir ann - -Local Synchronization Settings -Roghainnean sioncronachaidh ionadail - -&New -Ù&r - -&Save -&Sàbhail - -Save as &batch job... -Sàbhail mar obair &baidse... - -Start &comparison -Tòisich air a’ &choimheas - -Start &synchronization -Tòisich air an t-&sioncronachadh - -&Options -R&oghainnean - -&Language -&Cànan - -&Find... -L&org... - -&Reset layout -&Ath-shuidhich a’ cho-dhealbhachd - -&Export file list... -Às-p&hortaich liosta nam faidhle... - -&Tools -&Innealan - -&Check for new version -Thoir sùil a&ch a bheil tionndadh ùr ann - -&Check now -&Thoir sùil an-dràsta - -Check &automatically once a week -Thoir sùil gu &fèin-obrachail turas san t-seachdain - -Cancel -Sguir dheth - -Compare -Dèan coimeas - -Synchronize -Dèan sioncronachadh - -Add folder pair -Cuir paidhir de phasgain ris - -Remove folder pair -Thoir air falbh am paidhir seo de phasgain - -Swap sides -Cuir an dà thaobh an àite a chèile - -Close search bar -Dùin bàr an luirg - -Find: -Lorg: - -Match case -An aire do litrichean mòra ’s beaga - -New -Ùr - -Open... -Fosgail... - -Save -Sàbhail - -Save as... -Sàbhail mar... - -View type: -Seall an seòrsa: - -Select view: -Tagh an seòrsa: - -Statistics: -Stats: - -Number of files and folders that will be deleted -Àireamh nam faidhle ’s nam pasgan a thèid a sguabadh às - -Number of files that will be overwritten -Àireamh nam faidhle a thèid sgrìobhadh thairis orra - -Number of files and folders that will be created -Àireamh nam faidhle ’s nam pasgan a thèid a chruthachadh - -Total bytes to copy -Co mheud baidht a thèid lethbhreac a dhèanamh dhiubh - -Use local settings: -Cleachd na roghainnean ionadail - -Select a variant: -Tagh eug-samhail: - -Identify equal files by comparing modification time and size. -Lorg faidhlichean a tha co-ionnann le bhith a’ dèanamh coimeas eadar an cuid meud is ama. - -Identify equal files by comparing the file content. -Lorg faidhlichean a tha co-ionnann le bhith a’ dèanamh coimeas eadar susbaint nam faidhlichean. - -Ignore time shift (in hours) -Leig seachad sioft an ama (ann an uairean a thìde) - -Consider file times with specified offset as equal -Làimhsich amannan fhaidhlichean aig a bheil an offset sin mar gum biodh iad co-ionnann - -Handle daylight saving time -Aire ri tìde an t-samhraidh - -Symbolic links: -Ceanglaichean samhlachail: - -More information -Barrachd fiosrachaidh - -Local settings: -Roghainnean ionadail - -Include: -Gabh a-staigh: - -Exclude: -Dùin a-mach: - -Show examples -Seall buill-eisimpleir - -Time span: -An rainse ama: - -File size: -Meud an fhaidhle: - -Minimum: -Air a’ char as lugha: - -Maximum: -Air a’ char as motha: - -C&lear -Fala&mhaich - -Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. -Tagh riaghailteach criathraidh gus seòrsachan àraidh de dh’fhaidhlichean fhàgail às an t-sioncronachadh. Cuir a-steach slighean fhaidhlichean a-rèir paidhir an dà phasgan aca. - -Detect moved files -Mothaich do dh’fhaidhlichean a chaidh a ghluasad - - -- Requires and creates database files -- Detection active after initial sync -- Not supported by all file systems - - -- Feumaidh seo faidhlichean stòir-dhàta ’s cruthaichidh seo faidhlichean mar sin -- Bidh am mothachadh an gnìomh an dèidh a’ chiad sioncronachaidh -- Chan eil gach siostam fhaidhlichean a’ cur taic ris - - -Detect synchronization directions with the help of database files -Mothaich do chomhair an t-sioncronachaidh le taic o fhaidhlichean stòir-dhàta - -Delete files: -Sguab às na faidhlichean: - -&Permanent -&Buan - -Delete or overwrite files permanently -Sguab às no sgrìobh thairis air faidhlichean gu buan - -&Recycle bin -A&m biona - -Back up deleted and overwritten files in the recycle bin -Dèan lethbhreac-glèidhidh de dh’fhaidhlichean sa bhiona a chaidh a sguabadh às no a chaidh sgrìobhadh thairis orra - -&Versioning -&Versioning - -Move files to a user-defined folder -Gluais na faidhlichean gu àite a shònraich an cleachdaiche - -Naming convention: -Gnàthas nan ainmean: - -Handle errors: -Mearachdan làimhseachaidh: - -Hide all error and warning messages -Falaich gach teachdaireachd mu mhearachdan no rabhaidhean - -&Pop-up -&Priob-uinneag - -Show pop-up on errors or warnings -Seall priob-uinneagan a thaobh mhearachdan no rabhaidhean - -On completion: -An dèidh coileanaidh: - -OK -Ceart ma-thà - -Start synchronization now? -A bheil thu airson tòiseachadh air an t-sioncronachadh an-dràsta? - -Variant: -Eug-samhail: - -&Don't show this dialog again -&Na seall an còmhradh seo a-rithist - -Items found: -Rudan a chaidh a lorg: - -Time remaining: -An ùine a tha air fhàgail: - -Time elapsed: -An ùine a dh’fhalbh: - -Synchronizing... -A’ sioncronachadh... - -Minimize to notification area -Lùghdach ’s gluais gu raon nam brathan - -Bytes copied: -Bytes a chaidh lethbhreac a dhèanamh dhiubh - -Close -Dùin - -&Pause -&Cuir ’na stad - -Stop -Sguir dheth - -Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x -Cruthaich faidhle batch airson sioncronachadh a dh’obraicheas gun thusa a bhith an làthair. Gus a thòiseachadh, dèan briogadh dùbailte air an fhaidhle seo ann am planadair shaothraichean: %x - -&Stop -&Sguir dheth - -Stop synchronization at first error -Sguir dhen t-sioncronachadh aig a’ chiad mhearachd - -Run minimized -Ruith e sa mhodh lùghdaichte - -Save log: -Sàbhail an loga: - -Limit: -Crìoch: - -Limit maximum number of log files -Cuingich an àireamh as motha de dh’fhaidhlichean an loga - -How can I schedule a batch job? -Ciamar a chuireas mi obair baidse air an sgeideal? - -The following settings are used for all synchronization jobs. -Thèid na roghainnean a leanas a chleachdadh airson a h-uile obair sioncronachaidh. - -Fail-safe file copy -Dèan lethbhreac nach gabh fàilligeadh - - -Copy to a temporary file (*.ffs_tmp) before overwriting target. -This guarantees a consistent state even in case of a serious error. - - -Cuir lethbhreac dheth ann am faidhle sealach (*.ffs_tmp) mus sgrìobhar thairis air an targaid. -Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. - - -(recommended) -(mholamaid seo) - -Copy locked files -Dèan lethbhreac de dh’fhaidhlichean glaiste - -Copy shared or locked files using the Volume Shadow Copy Service. -Dèan lethbhreac de dh’fhaidhlichean co-roinnte no glaiste le seirbheis lethbhreacan sgàil an draibh. - -(requires administrator rights) -(feumaidh seo còraichean rianadair) - -Copy file access permissions -Dèan lethbhreac de cheadan-inntrigidh nam faidhle - -Transfer file and folder permissions. -Tar-chuir am faidhle ’s ceadan a’ phasgain - -Automatic retry on error: -Feuch ris a-rithist gu fèin-obrachail ri linn mearachd: - -Retry count: -Co mheud turas a dh’fheudadh ris a-rithist: - -Delay (in seconds): -An dàil (ann an diogan): - -Customize context menu: -Gnàthaich an clàr-taice co-theacsail - -Description -Tuairisgeul - -Show hidden dialogs again -Seall na còmraidhean falaichte a-rithist - -Show all permanently hidden dialogs and warning messages again -Seall na còmraidhean is rabhaidhean falaichte uile a-rithist - -&Default -&Bun-roghainn - -Source code written in C++ using: -Chaidh an còd tùsail a sgrìobhadh ann an C++ le taic: - -If you like FreeFileSync -Ma tha FreeFileSync a’ còrdadh riut - -Donate with PayPal -Nach doir sibh tabhartas le PayPal? - -Feedback and suggestions are welcome -Tha sinn a’ cur fàilte mhòr air beachd is moladh sam bith - -Homepage -An duilleag-dhachaigh - -Email -Post-d - -Published under the GNU General Public License -Air fhoillseachadh fo GNU General Public License - -Many thanks for localization: -Tha sinn fada an comain nan daoine a leanas airson eadar-theangachadh: - -Save as Batch Job -Sàbhail mar obair baidse - -Delete Items -Sguab às na nithean - -Options -Roghainnean - -Select Time Span -Tagh an rainse ama - -&Preferences... -&Roghainnean - -Folder Pairs -Paidhrichean nam pasganan - -Find -Lorg - -View Settings -Seall na roghainnean - -Overview -Foir-shealladh - -Configuration -Rèiteachadh - -Main Bar -Am prìomh-bhàr - -Start comparison -Tòisich air a’ choimeasadh - -Comparison settings -Roghainnean a’ choimeasaidh - -Synchronization settings -Roghainnean an t-sioncronachaidh - -Start synchronization -Tòisich air an t-sioncronachadh - -Confirm -Dearbh - - -Do you really want to execute the command %y for one item? -Do you really want to execute the command %y for %x items? - - -A bheil thu cinnteach gu bheil thu airson an àithne seo (%y) a ruith air %x nì? -A bheil thu cinnteach gu bheil thu airson an àithne seo (%y) a ruith air %x nì? -A bheil thu cinnteach gu bheil thu airson an àithne seo (%y) a ruith air %x nithean? -A bheil thu cinnteach gu bheil thu airson an àithne seo (%y) a ruith air %x nì? - - -&Execute -&Cuir an gnìomh - - -1 directory -%x directories - - -%x phasgan -%x phasgan -%x pasgain -%x pasgan - - - -1 file -%x files - - -%x fhaidhle -%x fhaidhle -%x faidhlichean -%x faidhle - - - -Showing %y of 1 row -Showing %y of %x rows - - -A’ sealltainn %y à %x ràgh -A’ sealltainn %y à %x ràgh -A’ sealltainn %y à %x ràghan -A’ sealltainn %y à %x ràgh - - -Set direction: -Suidhich a’ chomhair: - -multiple selection -Ioma-thaghadh - -Include via filter: -Gach a-steach slighe na criathraige: - -Exclude via filter: -Dùin a-mach le criathrag: - -Include temporarily -Gabh a-steach gu sealach - -Exclude temporarily -Dùin a-mach gu sealach - -Delete -Sguab às - -Include all -Gabh a-steach na h-uile - -Exclude all -Dùin a-mach na h-uile - -Show icons: -Meud nan ìomhaigheagan: - -Small -Beag - -Medium -Meadhanach - -Large -Mòr - -Select time span... -Tagh an raon-ama... - -Show "%x" -Seall “%x” - -Last session -An seisean mu dheireadh - -Folder Comparison and Synchronization -Coimeas eadar na pasgain is sioncronachadh - -Configuration saved -Chaidh an rèiteachadh a shàbhaladh - -FreeFileSync batch -FreeFileSync batch - -Do you want to save changes to %x? -An sàbhail sinn dhut na h-atharraichean air %x? - -Never save &changes -Na sàbhail atharrai&chean idir - -Do&n't save -&Na sàbhail - -Delete selected configurations -Sguab às na rèiteachaidhean a thagh thu - -Synchronization Settings -Roghainnean an t-sioncronachaidh - -Clear filter -Falamhaich a’ chriathrag - -Show files that exist on left side only -Na seall ach faidhlichean a tha air an taobh chlì a-mhàin - -Show files that exist on right side only -Na seall ach faidhlichean a tha air an taobh deas a-mhàin - -Show files that are newer on left -Seall faidhlichean a tha nas ùire air an taobh chlì - -Show files that are newer on right -Seall faidhlichean a tha nas ùire air an taobh deas - -Show files that are equal -Seall faidhlichean a tha co-ionnann - -Show files that are different -Seall faidhlichean a tha eadar-dhealaichte - -Show conflicts -Seall còmhstrithean - -Show files that will be created on the left side -Seall faidhlichean a thèid a chruthachadh air an taobh chlì - -Show files that will be created on the right side -Seall faidhlichean a thèid a chruthachadh air an taobh deas - -Show files that will be deleted on the left side -Seall faidhlichean a thèid a sguabadh às air an taobh chlì - -Show files that will be deleted on the right side -Seall faidhlichean a thèid a sguabadh às air an taobh deas - -Show files that will be overwritten on left side -Seall faidhlichean a thèid a thar-sgrìobhadh air an taobh chlì - -Show files that will be overwritten on right side -Seall faidhlichean a thèid a thar-sgrìobhadh air an taobh deas - -Show files that won't be copied -Seall faidhlichean nach dèid lethbhreac a dhèanamh dhiubh - -Show filtered or temporarily excluded files -Seall faidhlichean a tha ’gan dùnadh a-mach no air an criathradh a-mach an-dràsta fhèin - -Set as default -Suidhich mar a’ bhun-roghainn - -Filter -Criathrag - -All files are in sync -Tha gach faidhle sioncronaichte - -Cannot find %x -Chan urrainn dhuinn %x a lorg. - -Comma-separated values -Luachan le cromagan eatarra - -File list exported -Chaidh liosta nam faidhle às-phortadh - -Searching for program updates... -A’ lorg ùrachaidhean a’ phrògraim... - -Close progress dialog -Dùin còmhradh an adhartais - -Standby -Cuir ’na fhuireachas - -Log off -Clàraich a-mach - -Shut down -Dùin sìos an siostam - -Hibernate -Geamhraich - -Scanning... -’Ga sganadh... - -Comparing content... -A’ dèanamh coimeas eadar an cuid susbaint... - -Info -Fiosrachadh - -Warning -Rabhadh - -Select all -Tagh na h-uile - -Paused -’Na stad - -Initializing... -A’ tòiseachadh... - -Completed -Deiseil - -&Continue -Lean air adhar&t - -Progress -Adhartas - -Log -Logaich - - -Do you really want to move the following item to the recycle bin? -Do you really want to move the following %x items to the recycle bin? - - -A bheil thu cinnteach gu bheil thu airson an %x nì seo a chur dhan bhiona? -A bheil thu cinnteach gu bheil thu airson an %x nì seo a chur dhan bhiona? -A bheil thu cinnteach gu bheil thu airson na %x nithean seo a chur dhan bhiona? -A bheil thu cinnteach gu bheil thu airson an %x nì seo a chur dhan bhiona? - - -Move -Gluais - - -Do you really want to delete the following item? -Do you really want to delete the following %x items? - - -A bheil thu cinnteach gu bheil thu airson an %x nì seo a sguabadh às? -A bheil thu cinnteach gu bheil thu airson na %x nì seo a sguabadh às? -A bheil thu cinnteach gu bheil thu airson na %x nithean seo a sguabadh às? -A bheil thu cinnteach gu bheil thu airson na %x nì seo a sguabadh às? - - -Preferences -Roghainnean - -Copy NTFS permissions -Dèan lethbhreac de cheadan NTFS - -Integrate external applications into context menu. The following macros are available: -Amalaichidh seo aplacaidean air an taobh a-muigh dhan chlàr-taice cho-theacsail. Tha na macrothan a leanas ri làimh: - -- full file or folder name -- ainm slàn dhen fhaidhle no dhen phasgan - -- folder part only -- cuid a’ phasgain a-mhàin - -- Other side's counterpart to %item_path% -- Seise %item_folder% aig a’ choimpiutair eile - -- Other side's counterpart to %item_folder% -- Seise %item_folder% aig a’ choimpiutair eile - -Show hidden dialogs and warning messages again? -A bheil thu airson na còmhraidhean is rabhaidhean falaichte a shealltainn a-rithist? - -&Show -&Seall - -Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database. -Lorg is sìolaich na h-atharraichean air an dà thaobh. Mothaichidh sinn do rudan a chaidh a sguabadh às, a ghluasad no còmhstrithean gu fèin-obrachail le stòr-dàta. - -Create a mirror backup of the left folder by adapting the right folder to match. -Cruthaich lethbhreac-glèidhidh sgàthanaichte dhen phasgan air an taobh clì ’s am pasgan air an taobh deas ’ga atharrachadh d’ a rèir. - -Copy new and updated files to the right folder. -Cuir lethbhreac de dh’fhaidhlichean ùra ’s ùraichte dhan phasgan air an taobh deas. - -Configure your own synchronization rules. -Sònraich riaghailtean sioncronachaidh thu fhèin. - -Exclude -Dùin a-mach - -Direct -Dìreach - -Follow -Lean - -Today -An-diugh - -This week -An t-seachdain seo - -This month -Am mìos seo - -This year -Am bliadhna - -Last x days -Na x làithean seo chaidh - -Byte -Baidht - -KB -KB - -MB -MB - -Replace -Cuir ’na àite - -Move files and replace if existing -Gluais na faidhlichean ’s cuir iad an àite na feadhainn làithreach ma tha gin ann - -Time stamp -Stampa ama - -Append a time stamp to each file name -Cuir stampa ama ri gach ainm faidhle - -Comparison -Coimeas - -Synchronization -Sioncronachadh - -Leave as unresolved conflict -Fàg mar còmhstri gun rèiteachadh - -File -Faidhle - -YYYY-MM-DD hhmmss -BBBB-MM-LL uummdd - -Files -Faidhlichean - -Items -Nithean - -Percentage -Ceudad - -Cannot monitor directory %x. -Chan urrainn dhuinn sùil a chumail air %x. - -Conversion error: -Mearachd iompachaidh: - -Cannot delete file %x. -Cha ghabh am faidhle %x a sguabadh às. - -The file is locked by another process: -Tha am faidhle glaiste aig pròiseas eile: - -Cannot move file %x to %y. -Cha ghabh am faidhle %x a ghluasad dha %y. - -Cannot delete directory %x. -Cha ghabh am pasgan %x a sguabadh às. - -Cannot write file attributes of %x. -Chan urrainn dhuinn buadhan an fhaidhle %x a sgrìobhadh. - -Cannot write modification time of %x. -Cha ghabh àm atharrachaidh %x a sgrìobhadh. - -Cannot read security context of %x. -Cha ghabh susbaint tèarainteachd %x a leughadh. - -Cannot write security context of %x. -Cha ghabh susbaint tèarainteachd %x a sgrìobhadh. - -Cannot read permissions of %x. -Cha ghabh ceadan %x a leughadh. - -Cannot write permissions of %x. -Cha ghabh ceadan %x a sgrìobhadh. - -Cannot create directory %x. -Cha ghabh am pasgan %x a chruthachadh. - -Cannot create symbolic link %x. -Cha ghabh an symbolic link %x a chruthachadh - -Cannot find system function %x. -Chan urrainn dhuinn foincsean an t-siostaim %x a lorg. - -Cannot copy file %x to %y. -Cha ghabh lethbhreac an fhaidhle %x a chur gu %y. - -Type of item %x is not supported: -Chan eil taic ri nì dhen t-seòrsa %x: - -Cannot resolve symbolic link %x. -Cha ghabh an symbolic link %x fhuasgladh. - -Cannot open directory %x. -Cha ghabh am pasgan %x fhosgladh. - -Cannot enumerate directory %x. -Cha ghabh am pasgan %x àireamhachadh. - -%x TB -%x TB - -%x PB -%x PB - - -1 min -%x min - - -%x mhionaid -%x mhionaid -%x mionaidean -%x mionaid - - - -1 hour -%x hours - - -%x uair a thìde -%x uair a thìde -%x uairean a thìde -%x uair a thìde - - - -1 day -%x days - - -%x latha -%x latha -%x làithean -%x latha - - -Unable to register to receive system messages. -Chan urrainn dhuinn clàradh gus teachdaireachdan an t-siostaim fhaighinn. - -Cannot set privilege %x. -Cha ghabh a’ phribhleid %x a shuidheachadh. - -Unable to suspend system sleep mode. -Chan urrainn dhuinn modh cadal an t-siostaim a chur dheth. - -Cannot change process I/O priorities. -Chan urrainn dhuinn na prìomhachasan I/O atharrachadh. - -Unable to move %x to the recycle bin. -Cha ghabh %x a ghluasad dhan bhiona. - -Checking recycle bin failed for folder %x. -Dh’fhàillig sgrùdadh a’ bhiona airson a’ phasgain %x. - -Cannot determine final path for %x. -Chan urrainn dhuinn an t-slighe dheireannach airson %x a dhearbhadh. - -Error Code %x: -Còd na mearachd %x: - -Cannot read the following XML elements: -Chan urrainn dhuinn na h-eileamaidean XML a leanas a leughadh: - -Configuration file %x loaded partially only. -Cha deach faidhle an rèiteachaidh %x a luchdadh gu tur. - diff --git a/FreeFileSync/Build/Languages/serbian.lng b/FreeFileSync/Build/Languages/serbian.lng index be37ffa6..cf1a15d0 100644 --- a/FreeFileSync/Build/Languages/serbian.lng +++ b/FreeFileSync/Build/Languages/serbian.lng @@ -7,9 +7,6 @@ n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2
      -Unable to set application identifier. - - Both sides have changed since last synchronization. Обе су стране промењене од последње синхронизације. @@ -97,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Било који број алтернативних фолдерских парова за бар једну конфигурациону датотеку. +Open configuration for edit without executing. +Отвори конфигурацију за уређивање без покретања. + Cannot find the following folders: Не могу пронаћи следеће фолдере: @@ -187,11 +187,11 @@ Move file on right Премести датотеку десно -Overwrite left item -Замени леву ставку +Update left item +Ажурирај леву ставку -Overwrite right item -Замени десну ставку +Update right item +Ажурирај десну ставку Do nothing Не ради ништа @@ -276,6 +276,9 @@ Creating file %x Правим датотеку %x +Saving file %x... +Уписујем датотеку %x... + Items processed: Обрађени елементи: @@ -304,9 +307,6 @@ %x нити -Encoding extended time information: %x -Кодирам проширене информације о времену: %x - /sec /сек @@ -346,8 +346,8 @@ Save &as... Сачувај &као... -&Quit -&Излаз +E&xit +И&зађи &File &Датотека @@ -441,6 +441,9 @@ The command is triggered if: &Show error &Прикажи грешку +&Quit +&Излаз + Incorrect command line: Нетачна командна линија: @@ -486,11 +489,11 @@ The command is triggered if: Creating folder %x Креирам фолдер %x -Overwriting file %x -Замењујем датотеку %x +Updating file %x +Ажурирам датотеку %x -Overwriting symbolic link %x -Замењујем симболичну везу %x +Updating symbolic link %x +Ажурирам симболичну везу %x Verifying file %x Проверавам датотеку %x @@ -504,21 +507,21 @@ The command is triggered if: Data verification error: %x and %y have different content. Грешка при провери података: %x и %y имају различит садржај. -Cannot find folder %x. -Не могу пронаћи фолдер %x. - Target folder %x already existing. Одредишни фолдер %x већ постоји. +Cannot find folder %x. +Не могу пронаћи фолдер %x. + Target folder input field must not be empty. Поље за одабир одредишног фолдера не може бити празно. -Please enter a target folder for versioning. -Молим унесите одредишни фолдер за верзионирање. - Source folder %x not found. Изворни фолдер %x није пронађен. +Please enter a target folder for versioning. +Молим унесите одредишни фолдер за верзионирање. + The following items have unresolved conflicts and will not be synchronized: Следеће ставке имају неразрешених конфликата и неће бити синхронизоване: @@ -561,8 +564,8 @@ The command is triggered if: Synchronization completed successfully Синхронизација успешно завршена -Saving log file %x... -Уписујем лог датотеку %x... +Cleaning up old log files... +Уклањање старих датотека лога... Stopped Заустављено @@ -616,8 +619,8 @@ The command is triggered if: FreeFileSync is up to date. FreeFileSync је ажуриран. -Unable to connect to sourceforge.net. -Не могу се повезати на sourceforge.net. +Unable to connect to FreeFileSync.org. +Не може се успоставити веза са FreeFileSync.org. Cannot find current FreeFileSync version number online. Do you want to check manually? Не могу на мрежи пронаћи тренутни број верзије FreeFileSync-а. Да ли желите да проверите ручно? @@ -703,9 +706,21 @@ The command is triggered if: Start &comparison Почни &упоређивање +C&omparison settings +Подешавања уп&оређивања + +&Filter settings +Подешавања &филтера + +S&ynchronization settings +Подешавања &синхронизације + Start &synchronization Почни &синхронизацију +&Actions +&Акције + &Options &Опције @@ -784,8 +799,8 @@ The command is triggered if: Number of files and folders that will be deleted Број датотека и фолдера који ће бити избрисани -Number of files that will be overwritten -Број датотека које ће бити замењене у садржају +Number of files that will be updated +Број датотека које ће бити ажуриране Number of files and folders that will be created Број датотека и фолдера који ће бити креирани @@ -814,8 +829,14 @@ The command is triggered if: Handle daylight saving time Руковођење сезонским рачунањем времена -Symbolic links: -Симболичне везе: +Include symbolic links: +Укључи симболичне везе: + +Direct +Непосредно + +Follow +Следи More information Више информација @@ -844,24 +865,24 @@ The command is triggered if: Maximum: Максимум: -C&lear -О&бриши - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Одаберите филтерска подешавања да би искључили одређене датотеке из синхронизације. Унесите путање датотека релативно према њиховим одговарајућим фолдерским паровима. +C&lear +О&бриши + Detect moved files Уочи премештене датотеке -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- Потребује и креира датотеке база -- Детекција активна после иницијалног синка -- Није подржано за све системе датотека +- Детекција активна после почетне синхронизације +- Потребује и креира датотеке базе +- Није подржано од свих система датотека Detect synchronization directions with the help of database files @@ -1074,27 +1095,15 @@ This guarantees a consistent state even in case of a serious error. View Settings Подешавања приказа -Overview -Преглед - Configuration Подешавања +Overview +Преглед + Main Bar Главна трака -Start comparison -Почни упоређивање - -Comparison settings -Подешавања упоређивања - -Synchronization settings -Подешавања синхронизације - -Start synchronization -Почни синхронизацију - Confirm Потврди @@ -1249,11 +1258,11 @@ This guarantees a consistent state even in case of a serious error. Show files that will be deleted on the right side Прикажи датотеке које ће бити избрисане на десној страни -Show files that will be overwritten on left side -Прикажи датотеке које ће бити замењене на левој страни +Show files that will be updated on the left side +Прикажи датотеке које ће бити ажуриране на левој страни -Show files that will be overwritten on right side -Прикажи датотеке које ће бити замењене на десној страни +Show files that will be updated on the right side +Прикажи датотеке које ће бити ажуриране на десној страни Show files that won't be copied Прикажи датотеке које неће бити копиране @@ -1392,15 +1401,6 @@ This guarantees a consistent state even in case of a serious error. Configure your own synchronization rules. Конфигуришите ваша властита синхронизациона правила. -Exclude -Искључи - -Direct -Непосредно - -Follow -Следи - Today Данас @@ -1464,9 +1464,6 @@ This guarantees a consistent state even in case of a serious error. Cannot monitor directory %x. Не могу надгледати фолдер %x. -Conversion error: -Грешка при претварању: - Cannot delete file %x. Не могу избрисати датотеку %x. @@ -1500,8 +1497,8 @@ This guarantees a consistent state even in case of a serious error. Cannot create directory %x. Не могу креирати фолдер %x. -Cannot create symbolic link %x. -Не могу креирати симболичну везу %x. +Cannot copy symbolic link %x to %y. +Не могу копирати симболичну везу %x у %y. Cannot find system function %x. Не могу пронаћи системску функцију %x. @@ -1587,3 +1584,72 @@ This guarantees a consistent state even in case of a serious error. Configuration file %x loaded partially only. Датотека подешавања %x учитана само делимично. +Prepare installation +Припремање инсталације + +Choose which components you want to install. +Одаберите које компоненте желите да инсталирате. + +Select installation type: +Одаберите тип инсталације: + +Local +Локални + +Portable +Преносни + +recommended +препоручени + +Save settings to "%APPDATA%\FreeFileSync" +Сачувај подешавања у "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Региструј FreeFileSync екстензије датотека + +Create Explorer context menu entries +Направи уносе Експлореровог контекстног менија + +Save settings in installation directory +Сачувај подешавања у инсталационом фолдеру + +Do not write to Registry +Не уписуј у Регистар бази + +Just copy the files +Само копирај датотеке + +Choose a directory for installation: +Одабери фолдер за инсталацију: + +Create shortcuts: +Направи пречице: + +Desktop +Десктоп + +Start menu +Старт мени + +Registering FreeFileSync file extensions +Регистрација FreeFileSync екстензија датотека + +Unregistering FreeFileSync file extensions +Дерегистрација FreeFileSync екстензија датотека + +FreeFileSync Configuration +Конфигурација FreeFileSync-а + +FreeFileSync Batch File +Беч датотека FreeFileSync-а + +FreeFileSync Synchronization Database +База података FreeFileSync синхронизације + +RealtimeSync Configuration +Конфигурација RealtimeSync-а + +Edit with FreeFileSync +Уреди са FreeFileSync-ом + diff --git a/FreeFileSync/Build/Languages/slovenian.lng b/FreeFileSync/Build/Languages/slovenian.lng deleted file mode 100644 index 5832b3f7..00000000 --- a/FreeFileSync/Build/Languages/slovenian.lng +++ /dev/null @@ -1,1599 +0,0 @@ -
      - Slovenščina - Matej Badalič, Tine Mlakar - sl_SI - flag_slovenia.png - 4 - n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3 -
      - -Both sides have changed since last synchronization. -Obe strani sta se spremenili od zadnje sinhronizacije. - -Cannot determine sync-direction: -Ne morem določiti sinhronizacijske smeri. - -No change since last synchronization. -Ni sprememb od zadnje sinhronizacije. - -The database entry is not in sync considering current settings. -Glede na trenutne nastavitve vnos v podatkovni bazi ni sinhroniziran. - -Setting default synchronization directions: Old files will be overwritten with newer files. -Nastavljanje privzetih smeri sinhronizacije: Stare datoteke bodo prepisane z novimi datotekami. - -Checking recycle bin availability for folder %x... -Preverjam razpoložljivost koša za mapo %x... - -Moving file %x to the recycle bin -Premikam datoteko %x koš - -Moving folder %x to the recycle bin -Premikam imenik %x v koš - -Moving symbolic link %x to the recycle bin -Premikam simbolično povezavo %x v koš - -Deleting file %x -Brisanje datoteke %x - -Deleting folder %x -Brisanje mape %x - -Deleting symbolic link %x -Brisanje simboličnih povezav %x - -The recycle bin is not available for the following folders. Files will be deleted permanently instead: -Za sledeče imenike koš ni na voljo. Datoteke bodo namesto tega dokončno izbrisane: - -An exception occurred -Zgodila se je napaka - -A directory path is expected after %x. -Za %x se pričakuje pot do imenika. - -Syntax error -Sintaktična napaka - -Cannot open file %x. -Ne morem odpreti datoteke %x. - -File %x does not contain a valid configuration. -Datoteka %x ne vsebuje veljavnih nastavitev - -Unequal number of left and right directories specified. -Vnešeno je neenako število levih in desnih imenikov. - -The config file must not contain settings at directory pair level when directories are set via command line. -Konfiguracijska datoteka ne sme vsebovati nastavitev na ravni imeniških parov, če so imeniki nastavljeni prek ukazne vrstice. - -Directories cannot be set for more than one configuration file. -Imeniki ne morejo biti nastavljeni za eč kot eno konfiguracijsko datoteko. - -Command line -Ukazna vrstica - -Syntax: -Sintaksa: - -global config file: -datoteka z globalnimi konfiguracijami - -config files: -konfiguracijske datoteke: - -directory -imenik - -Path to an alternate GlobalSettings.xml file. -Pot do alternativne datoteke GlobalSettings.xml. - -Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files. -Poljubno število FreeFileSync .ffs_gui in/ali .ffs_batch konfigracijskih datotek. - -Any number of alternative directory pairs for at most one config file. -Poljubno število alternativnih parov imenikov za največ eno nastavitveno datoteko. - -Cannot find the following folders: -Ne morem najti naslednjih map: - -You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization. -To napako, ki smatra vsako mapo kot prazno, lahko ignorirate. Mape bodo potem samodejno ustvarjene med sinhronizacijo. - -A folder input field is empty. -Vnosno polje za mapo je prazno. - -The corresponding folder will be considered as empty. -Ustrezajoča mapa bo smatrana kot prazna. - -The following folder paths are dependent from each other: -Naslednje poti imenikov so med seboj odvisne: - -File %x has an invalid date. -Datoteka %x ima neveljaven datum. - -Date: -Datum: - -Files %x have the same date but a different size. -Datoteki %x imata enak datum ampak različno velikost. - -Size: -Velikost: - -Content comparison was skipped for excluded files %x. -Za izločene datoteke %x je bila primerjava vsebine izpuščena - -Items differ in attributes only -Elementi se razlikujejo samo v atributih - -Resolving symbolic link %x -Razrešujem simbolično povezavo %x - -Comparing content of files %x -Primerjam vsebino datotek %x - -Generating file list... -Ustvarjam seznam datotek... - -Starting comparison -Začenjam primerjavo - -Calculating sync directions... -Preračunavam sinhronizacijske smeri... - -Out of memory. -Zmanjkalo pomnilnika. - -Item exists on left side only -Element obstaja samo na levi strani - -Item exists on right side only -Element obstaja samo na desni strani - -Left side is newer -Leva stran je novejša - -Right side is newer -Desna stran je novejša - -Items have different content -Elementi imajo različno vsebino - -Both sides are equal -Obe strani sta enaki - -Conflict/item cannot be categorized -Spor/element ne more biti kategoriziran - -Copy new item to left -Kopiraj nov element na levo - -Copy new item to right -Kopiraj nov element na desno - -Delete left item -Izbriši levi element - -Delete right item -Izbriše desni element - -Move file on left -Premakni datoteko na levo - -Move file on right -Premakni datoteko na desno - -Overwrite left item -Prepiši levi element - -Overwrite right item -Prepiši desni element - -Do nothing -Ne naredi ničesar - -Update attributes on left -Posodobi atribute na levi - -Update attributes on right -Posodobi atribute na desni - - -1 byte -%x bytes - - -%x bajt -%x bajta -%x bajti -%x bajtov - - -%x MB -%x MB - -%x KB -%x KB - -%x GB -%x GB - -Database file %x is incompatible. -Datoteka podatkovne baze %x je nekompatibilna. - -Initial synchronization: -Začetna sinhronizacija: - -Database file %x does not yet exist. -Datoteka podatkovne baze %x še ne obstaja. - -Database file is corrupt: -Datoteka podatkovne baze je poškodovana: - -Cannot write file %x. -Ne morem zapisati datoteke %x. - -Cannot read file %x. -Ne morem prebrati datoteke %x. - -Database files do not share a common session. -Datoteke podatkovne baze si ne delijo skupne seje. - -Searching for folder %x... -Iskanje mape %x... - -Cannot read file attributes of %x. -Ne morem brati datotečnih atributov od %x. - -Cannot get process information. -Ne morem pridobiti informacij o procesu. - -Waiting while directory is locked: -Čakam dokler je imenik zaklenjen: - -Lock owner: -Lastnik zaklepa: - - -1 sec -%x sec - - -%x sek -%x sek -%x sek -%x sek - - -Detecting abandoned lock... -Zaznavanje opuščenega zaklepa... - -Creating file %x -Ustvarjam datoteko %x - -Items processed: -Obdelanih elementov: - -Items remaining: -Preostalih elementov: - -Total time: -Celoten čas: - -Error parsing file %x, row %y, column %z. -Napaka pri razčlenjevanju datoteke %x, vrstica %y, stolpec %z. - -Cannot set directory lock for %x. -Ne morem nastaviti zaklepanja imenikov za %x. - -Scanning: -Pregledujem: - - -1 thread -%x threads - - -%x nit -%x niti -%x niti -%x niti - - -Encoding extended time information: %x -Podrobne informacije o času enkodiranja: %x - -/sec -/sek - -%x items/sec -%x elementov/s - -Show in Explorer -Prikaži v Raziskovalcu - -Open with default application -Odpri s privzeto aplikacijo - -Browse directory -Brskaj po imeniku - -Cannot access the Volume Shadow Copy Service. -Ne morem dostopati do Volume Shadov Copy servisa. - -Please use FreeFileSync 64-bit version to create shadow copies on this system. -Prosimo uporabite 64-bitno različico FreeFileSync za ustvarjanje senčnih kopij na tem sistemu. - -Cannot load file %x. -Ne morem naložiti datoteko %x. - -Cannot determine volume name for %x. -Ne morem določiti ime nosilca za %x. - -Volume name %x is not part of file path %y. -Ime nosilca %x ni del poti datoteke %y. - -Stop requested: Waiting for current operation to finish... -Zahteva za ustavitev: Čakam da se trenutni proces zaključi... - -Unable to create time stamp for versioning: -Časovnega žiga za verzioniranje ni bilo mogoče ustvariti: - -&Open... -&Odpri... - -Save &as... -Shr&ani kot... - -&Quit -&Zapri - -&File -&Datoteka - -&View help -&Prikaži pomoč - -&About -&O programu - -&Help -&Pomoč - -Usage: -Uporaba: - -1. Select folders to watch. -1. Izberite imenike za opazovanje - -2. Enter a command line. -2. Vnesite ukazno-vrstico. - -3. Press 'Start'. -3. Pritisnite 'Začni'. - -To get started just import a .ffs_batch file. -Da začnete uvozite datoteko .ffs_batch - -Folders to watch: -Imeniki za pregled: - -Add folder -Dodaj imenik - -Remove folder -Odstrani v imenik - -Browse -Brskaj - -Select a folder -Izberite imenik - -Idle time (in seconds): -Nedejavni čas (v sekundah): - -Idle time between last detected change and execution of command -Čas nedejavnosti med zadnjo zaznano spremembo in izvršitvijo ukaza - -Command line: -Ukazna vrstica: - - -The command is triggered if: -- files or subfolders change -- new folders arrive (e.g. USB stick insert) - - -Ukaz se sproži če: -- se spremenijo datoteke ali podmape -- pridejo nove mape (npr. ob vstavitvi USB ključka) - - -&Start -&Zaženi - -About -O programu(1) - -Build: %x -Izgradnja: %x - -All files -Vse datoteke - -Automated Synchronization -Avtomatska sinhnorizacija - -Directory monitoring active -Nadzor imenikov je aktven - -Waiting until all directories are available... -Čakam da so vsi imeniki dostopni... - -Error -Napaka - -&Restore -&Obnovi - -&Show error -&Pokaži napako - -Incorrect command line: -Napačna ukazna vrstica: - -&Retry -&Ponovi - -File content -Vsebina datoteke - -File time and size -Čas in velikost datoteke - -Two way -Obojesmerno - -Mirror -Zrcalno - -Update -Posodobi - -Custom -Po meri - -Multiple... -Večkratno... - -Moving file %x to %y -Premikam datoteko %x v %y - -Moving folder %x to %y -Premikam mapo %x v %y - -Moving symbolic link %x to %y -Premikam simbolično povezavo %x v %y - -Removing old versions... -Odstranjujem stare različice... - -Creating symbolic link %x -Ustvarjam simbolično povezavo %x - -Creating folder %x -Ustvarjam mapo %x - -Overwriting file %x -Prepisujem datoteko %x - -Overwriting symbolic link %x -Prepisujem simbolično povezavo %x - -Verifying file %x -Preverjam datoteko %x - -Updating attributes of %x -Posodabljam atribute od %x - -Creating a Volume Shadow Copy for %x... -Ustvarjam Volume Shadow Copy za %x... - -Data verification error: %x and %y have different content. -Napaka pri preverjanju podatkov: %x in %y imata drugačno vsebino. - -Cannot find folder %x. -Ne najdem mape %x. - -Target folder %x already existing. -Ciljna mapa %x že obstaja. - -Target folder input field must not be empty. -Vnosno polje za ciljno mapo ne sme biti prazno. - -Please enter a target folder for versioning. -Prosimo vnesite ciljno mapo za verzioniranje. - -Source folder %x not found. -Izvorna mapa %x se ne najde. - -The following items have unresolved conflicts and will not be synchronized: -Naslednji elementi imajo nerešene konflikte in ne bodo sinhronizirani: - -The following folders are significantly different. Make sure you are matching the correct folders for synchronization. -Naslednji imeniki so občutno različni. Preverite, če primerjate pravilne imenike za sinhnorizacijo. - -Not enough free disk space available in: -Na voljo ni dovolj prostega prostora na disku v: - -Required: -Zahtevano: - -Available: -Na voljo: - -Multiple folder pairs write to a common subfolder. Please review your configuration. -Več parov map zapisuje v skupno podmapo. Prosimo, preverite svojo konfiguracijo. - -Synchronizing folder pair: -Sinhroniziram par map: - -Generating database... -Ustvarjam podatkovno bazo... - -job name -naziv opravila - -Synchronization stopped -Sinhnorizacija ustavljena - -Synchronization completed with errors -Sinhronizacija se je končala z napakami - -Synchronization completed with warnings -Sinhronizacija se je končala z opozorili - -Nothing to synchronize -Nič za sinhronizirati - -Synchronization completed successfully -Sinhronizacija se je uspešno končala - -Saving log file %x... -Shranjujem datoteko beleženja %x... - -Stopped -Ustavljen - -You can switch to FreeFileSync's main window to resolve this issue. -Preklopite na FreeFileSync glavno okno za odpravo težave. - -&Don't show this warning again -&Ne pokaži več tega opozorila - -&Ignore -&Ignoriraj - -&Switch -&Preklopi - -Switching to FreeFileSync's main window -Preklopi na FreeFileSync glavno okno - - -Automatic retry in 1 second... -Automatic retry in %x seconds... - - -Ponovni poskus čez %x sekundo... -Ponovni poskus čez %x sekundi... -Ponovni poskus čez %x sekunde... -Ponovni poskus čez %x sekund... - - -&Ignore subsequent errors -&Ignoriraj nadaljnje napake - -Retrying operation... -Ponovni poizkus operacije... - -Serious Error -Resna napaka - -Check for Program Updates -Prevri obstoj nadgradnje programa - -A new version of FreeFileSync is available: -Nova različica FreeFileSync je na voljo: - -Download now? -Prenesem sedaj? - -&Download -&Prenesi - -FreeFileSync is up to date. -FreeFileSync je posodobljen. - -Unable to connect to sourceforge.net. -Ne morem se povezati na sourceforge.net. - -Cannot find current FreeFileSync version number online. Do you want to check manually? -Na omrežju ne najdem obstoječe verzije FreeFileSync-a. Ali želite preveriti lastnoročno? - -&Check -&Preveri - -Symlink -Simbolična povezava - -Folder -Mapa - -Full path -Polna pot - -Name -Ime - -Relative folder -Relativna mapa - -Base folder -Osnovna mapa - -Size -Velikost - -Date -Datum - -Extension -Razširitev - -Category -Kategorija - -Action -Ukrep - -Drag && drop -Povleci && spusti - -Local comparison settings -Lokalne primerjalne nastavitve - -Local synchronization settings -Lokalne sinhnorizacijske nastavitve - -Local filter -Lokalni filter - -Active -Aktivno - -None -Nič - -Remove local settings -Odstrani lokalne nastavitve - -Clear local filter -Počisti lokalni filter - -Copy -Kopiraj - -Paste -Prilepi - -Local Synchronization Settings -Lokalne sinhnorizacijske nastavitve - -&New -&Nova - -&Save -&Shrani - -Save as &batch job... -Shrani kot serijsko op&ravilo... - -Start &comparison -Začni &primerjavo - -Start &synchronization -Začni &sinhnorizacijo - -&Options -&Možnosti - -&Language -&Jezik - -&Find... -&Išči... - -&Reset layout -&Ponastavi razporeditev - -&Export file list... -&Izvozi seznam datotek... - -&Tools -&Orodja - -&Check for new version -&Preveri, če obstaja nova verzija - -&Check now -P&reveri zdaj - -Check &automatically once a week -S&amodejno preveri enkrat tedensko - -Cancel -Prekliči - -Compare -Primerjaj - -Synchronize -Sinhroniziraj - -Add folder pair -Dodaj par imenikov - -Remove folder pair -Odstrani par imenikov - -Swap sides -Zamenjaj strani - -Close search bar -Zapri iskalno vrstico - -Find: -Išči: - -Match case -Ujemaj se s primerom - -New -Nova - -Open... -Odpri... - -Save -Shrani - -Save as... -Shrani kot... - -View type: -Tip pogleda: - -Select view: -Izberi pogled: - -Statistics: -Statistika: - -Number of files and folders that will be deleted -Število datotek in map, ki bodo izbrisane - -Number of files that will be overwritten -Število datotek, ki bodo prepisane - -Number of files and folders that will be created -Število datotek in map, ki bodo ustvarjene - -Total bytes to copy -Skupno bajtov za kopiranje - -Use local settings: -Uporabi lokalne nastavitve: - -Select a variant: -Izberi možnost: - -Identify equal files by comparing modification time and size. -Določi enake datoteke s primerjavo datuma spremembe in velikosti. - -Identify equal files by comparing the file content. -Določi enake datoteke s primerjavo vsebine. - -Ignore time shift (in hours) -Ignorirani časovni okvir (v urah) - -Consider file times with specified offset as equal -Čas datotek znotraj izbranga časovnega okvirja je upoštevan kot isti - -Handle daylight saving time -Upoštevaj poletni in zimski čas - -Symbolic links: -Simbolične povezave: - -More information -Več informacij - -Local settings: -Lokalne nastavitve: - -Include: -Vključi: - -Exclude: -Izključi: - -Show examples -Pokaži primere - -Time span: -Časovno obdobje - -File size: -Velikost datoteke: - -Minimum: -Minimum: - -Maximum: -Maksimum: - -C&lear -&Počisti - -Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. -Izberi filtrirna pravila za izključitev določenih datotek iz sinhnorizacije. Vpiši pot datotek relativno na imenik v obdelavi - -Detect moved files -Zaznaj premaknjene datoteke - - -- Requires and creates database files -- Detection active after initial sync -- Not supported by all file systems - - -- Zahteva in ustvari datoteke podatkovne baze -- Zaznavane je aktivno po začetnem sinhnoriziranju -- Ni podprto s strani vseh datotečnih sistemov - - -Detect synchronization directions with the help of database files -Zaznaj smer sinhnorizacije s pomočjo datotek podatkovne baze - -Delete files: -Izbriši datoteke: - -&Permanent -&Dokončno - -Delete or overwrite files permanently -Trajno izbriši ali prepiši datoteke - -&Recycle bin -&Koš - -Back up deleted and overwritten files in the recycle bin -Naredi varnostno kopijo izbrisanih in prepisanih datotek v koš - -&Versioning -&Verzioniranje - -Move files to a user-defined folder -Premakni datoteke v izbran imenik - -Naming convention: -Konvencija poimenovanja: - -Handle errors: -Upravljanje napak: - -Hide all error and warning messages -Skrij vsa obvestila o napakah in opozorilih - -&Pop-up -&Pop-up - -Show pop-up on errors or warnings -Prikaži pojavne napaka ali opozorila - -On completion: -Ob zaključku: - -OK -V redu - -Start synchronization now? -Zaženem sinhnorizacijo takoj? - -Variant: -Možnost: - -&Don't show this dialog again -&Ne pokaži več tega sporočila - -Items found: -Najdenih elementov: - -Time remaining: -Preostali čas: - -Time elapsed: -Pretečeni čas: - -Synchronizing... -Sinhroniziram... - -Minimize to notification area -Pomanjšaj v območje obvestil - -Bytes copied: -Prepisanih bajtov: - -Close -Zapri - -&Pause -&Premor - -Stop -Ustavi - -Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x -Ustvari skriptno datoteko za samodejno sinhnorizacijo. Za zagon dvojno kliknite to datoteko ali pa jo umestite v razporejevalnik opravil: %x - -&Stop -&Ustavi - -Stop synchronization at first error -Ustavi sinhnorizacojo ob prvi napaki - -Run minimized -Zaženi minimizirano - -Save log: -Shrani dnevnik: - -Limit: -Omejitev: - -Limit maximum number of log files -Omeji maksimalno število datotek beleženja - -How can I schedule a batch job? -Kako nastavim urnik za serijsko opravilo? - -The following settings are used for all synchronization jobs. -Naslednje nastavitve se uporabljajo pri vseh sinhronizacijskih opravilih. - -Fail-safe file copy -Kopiranje datotek varno pred odpovedjo - - -Copy to a temporary file (*.ffs_tmp) before overwriting target. -This guarantees a consistent state even in case of a serious error. - - -Kopiraj v začasno datoteko (*.ffs_tmp) preden prepišeš cilj. -To zagotavlja konsistenco podatkov v primeru napake. - - -(recommended) -(priporočeno) - -Copy locked files -Kopiraj zaklenjene datoteke - -Copy shared or locked files using the Volume Shadow Copy Service. -Kopiraj zaklenjene in datoteke v skupni rabi s pomočjo Shadow Copy Service. - -(requires administrator rights) -(zahteva pravice administratorja) - -Copy file access permissions -Kopiraj dovoljenja dostopov datoteke - -Transfer file and folder permissions. -Prenesi pravice datotek in map. - -Automatic retry on error: -Ob napaki avtomatsko poskusi znova: - -Retry count: -Število poiskusov: - -Delay (in seconds): -Zakasnitev (v sekundah): - -Customize context menu: -Prilagodi vsebinski meni: - -Description -Opis - -Show hidden dialogs again -Zopet prikaži skrite dilaoge - -Show all permanently hidden dialogs and warning messages again -Znova prikaži vse dokončno skrite dialoge in opozorila - -&Default -&Privzeto - -Source code written in C++ using: -Izvorna koda napisana v C++ z uporabo: - -If you like FreeFileSync -Če vam je FreeFileSync všeč - -Donate with PayPal -Doniraj s PayPal - -Feedback and suggestions are welcome -Povratne informacije in predlogi so dobrodošli - -Homepage -Domača stran - -Email -Email - -Published under the GNU General Public License -Objavljeno pod licenco GNU General Public - -Many thanks for localization: -Zahvale za lokalizacijo: - -Save as Batch Job -Shrani kot serijsko opravilo - -Delete Items -Izbriši elemente - -Options -Možnosti - -Select Time Span -Izberi časovno obdobje - -&Preferences... -&Nastavitve... - -Folder Pairs -Pari imenikov - -Find -Najdi - -View Settings -Nastavitve pogleda - -Overview -Pregled - -Configuration -Konfiguracija - -Main Bar -Glavna vrstica - -Start comparison -Začni primerjavo - -Comparison settings -Nastavitve primerjanja - -Synchronization settings -Nastavitve sinhronizacije - -Start synchronization -Začni sinhronizacijo - -Confirm -Potrdi - - -Do you really want to execute the command %y for one item? -Do you really want to execute the command %y for %x items? - - -Ali res želite izvesti ukaz %y za %x element? -Ali res želite izvesti ukaz %y za %x elementa? -Ali res želite izvesti ukaz %y za %x elemente? -Ali res želite izvesti ukaz %y za %x elementov? - - -&Execute -&Izvedi - - -1 directory -%x directories - - -%x imenik -%x imenika -%x imeniki -%x imenikov - - - -1 file -%x files - - -%x datoteka -%x datoteki -%x datoteke -%x datotek - - - -Showing %y of 1 row -Showing %y of %x rows - - -Prikazano %y od %x vrstice -Prikazano %y od %x vrstic -Prikazano %y od %x vrstic -Prikazano %y od %x vrstic - - -Set direction: -Nastavi smer: - -multiple selection -mnogokratna izbira - -Include via filter: -Vključi preko filtra: - -Exclude via filter: -Izključi preko filtra: - -Include temporarily -Trenutno vključi - -Exclude temporarily -Začasno izključi - -Delete -Izbriši - -Include all -Vključi vse - -Exclude all -Izključi vse - -Show icons: -Prikaži ikone: - -Small -Majhna - -Medium -Srednja - -Large -Velika - -Select time span... -Izberite časovni okvir... - -Show "%x" -Prikaži "%x" - -Last session -Zadnja seja - -Folder Comparison and Synchronization -Primerjava in sinhronizacija imenika - -Configuration saved -Konfiguracija shranjena - -FreeFileSync batch -FreeFileSync paket - -Do you want to save changes to %x? -Ali želite shraniti spremembe v %x? - -Never save &changes -Nikoli ne shrani &sprememb - -Do&n't save -Ne shra&ni - -Delete selected configurations -Izbriši izbrane konfiguracije - -Synchronization Settings -Nastavitve sinhnorizacije - -Clear filter -Počisti filter - -Show files that exist on left side only -Prikaži datoteke, ki obstajajo samo na levi - -Show files that exist on right side only -Prikaži datoteke, ki obstajajo samo na desni - -Show files that are newer on left -Prikaži datoteke, ki so novejše na levi - -Show files that are newer on right -Prikaži datoteke, ki so novejše na desni - -Show files that are equal -Prikaži datoteke, ki so enake - -Show files that are different -Prikaži datoteke, ki so različne - -Show conflicts -Prikaži spore - -Show files that will be created on the left side -Prikaži datoteke, ki bodo ustvarjene na levi strani - -Show files that will be created on the right side -Prikaži datoteke, ki bodo ustvarjene na desni strani - -Show files that will be deleted on the left side -Prikaži datoteke, ki bodo izbrisane na levi strani - -Show files that will be deleted on the right side -Prikaži datoteke, ki bodo izbrisane na desni strani - -Show files that will be overwritten on left side -Prikaži datoteke, ki bodo prepisane na levi strani - -Show files that will be overwritten on right side -Prikaži datoteke, ki bodo prepisane na desni strani - -Show files that won't be copied -Prikaži datoteke, ki ne bodo kopirane - -Show filtered or temporarily excluded files -Pokaži filtrirane ali začasno izključene datoteke - -Set as default -Nastavi kot privzeto - -Filter -Filter - -All files are in sync -Vse datoteke so sinhronizirane - -Cannot find %x -Ne najdem %x - -Comma-separated values -Vrednosti ločene z vejico - -File list exported -Seznam datotek je bil izvožen - -Searching for program updates... -Iščem posodobitve programa... - -Close progress dialog -Zapri pogovorno okno z napredkom - -Standby -V pripravljenost - -Log off -Odjavi - -Shut down -Ugasni - -Hibernate -Hibernacija - -Scanning... -Pregledujem... - -Comparing content... -Primerjam vsebino... - -Info -Info - -Warning -Pozor - -Select all -Izberi vse - -Paused -Na premoru - -Initializing... -Inicializiram... - -Completed -Zaključeno - -&Continue -&Nadaljuj - -Progress -Napredek - -Log -Dnevnik - - -Do you really want to move the following item to the recycle bin? -Do you really want to move the following %x items to the recycle bin? - - -Ali res želite premakniti sledeč %x element v koš? -Ali res želite premakniti sledeča %x elementa v koš? -Ali res želite premakniti sledeče %x elemente v koš? -Ali res želite premakniti sledečih %x elementov v koš? - - -Move -Premakni - - -Do you really want to delete the following item? -Do you really want to delete the following %x items? - - -Ali resnično želite izbrisati sledeči %x element? -Ali resnično želite izbrisati naslednja %x elementa? -Ali resnično želite izbrisati naslednje %x elemente? -Ali resnično želite izbrisati naslednjih %x elementov? - - -Preferences -Nastavitve - -Copy NTFS permissions -Kopiraj NTFS dovoljenja - -Integrate external applications into context menu. The following macros are available: -Integriraj zunanje aplikacije v kontekstni menu. Na voljo so naslednji makri: - -- full file or folder name -- polno ime datoteke ali mape - -- folder part only -- samo del glede mape - -- Other side's counterpart to %item_path% -- Na drugi strani nasprotno v %item_path% - -- Other side's counterpart to %item_folder% -- Na drugi strani nasprotno v %item_folder% - -Show hidden dialogs and warning messages again? -Znova prikaži skrite dialoge in obvestila - -&Show -&Prikaži - -Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database. -Identificiraj in razširjaj spremembe na obeh straneh. Izbrisi, premiki in spori so samodejno zaznani z uporabo podatkovne baze. - -Create a mirror backup of the left folder by adapting the right folder to match. -Ustvari zrcalno kopijo levega imenika s prilagoditvijo desnega imenika, tako da se ujemata. - -Copy new and updated files to the right folder. -Kopiraj nove in posodobljene datoteke v desni imenik. - -Configure your own synchronization rules. -Konfigurirajte vaša lastna sinhronizacijska pravila. - -Exclude -Izključi - -Direct -Neposredno - -Follow -Sledi - -Today -Danes - -This week -Ta teden - -This month -Ta mesec - -This year -To leto - -Last x days -Zadnjih x dni - -Byte -Bajt - -KB -KB - -MB -MB - -Replace -Zamenjaj - -Move files and replace if existing -Premakne datoteke in jih zamenja, če obstajajo - -Time stamp -Časovna oznaka - -Append a time stamp to each file name -Imenu vsake datoteke pripni časovni žig - -Comparison -Primerjava - -Synchronization -Sinhnorizacija - -Leave as unresolved conflict -Pusti kot nerešeni spor - -File -Datoteka - -YYYY-MM-DD hhmmss -LLLL-MM-DD hhmmss - -Files -Datoteke - -Items -Elementi - -Percentage -Odstotek - -Cannot monitor directory %x. -Ne morem nadzorovati imenika %x. - -Conversion error: -Napaka pri pretvorbi: - -Cannot delete file %x. -Ne morem izbrisati datoteke %x. - -The file is locked by another process: -Datoteka je zaklenjena s strani drugega procesa: - -Cannot move file %x to %y. -Ne morem premakniti datoteko %x v %y. - -Cannot delete directory %x. -Ne morem izbrisati imenika %x. - -Cannot write file attributes of %x. -Ne morem zapisati datotečnih atributov od %x. - -Cannot write modification time of %x. -Ne morem zapisati časa spremembe od %x. - -Cannot read security context of %x. -Ne morem prebrati varnostnega konteksta od %x. - -Cannot write security context of %x. -Ne morem zapisati varnostni kontekst od %x - -Cannot read permissions of %x. -Ne morem prebrati dovoljenja od %x. - -Cannot write permissions of %x. -Ne morem zapisati dovoljenj od %x. - -Cannot create directory %x. -Ne morem ustvariti imenika %x. - -Cannot create symbolic link %x. -Ne morem ustvariti simbolične povezave %x. - -Cannot find system function %x. -Ne morem najti sistemske funkcije %x. - -Cannot copy file %x to %y. -Ne morem kopirati datoteke %x v %y. - -Type of item %x is not supported: -Element tipa %x ni podprt: - -Cannot resolve symbolic link %x. -Ne morem razrešiti simbolične povezave %x. - -Cannot open directory %x. -Ne morem odpreti imenika %x. - -Cannot enumerate directory %x. -Ne morem oštevilčiti imenika %x. - -%x TB -%x TB - -%x PB -%x PB - - -1 min -%x min - - -%x min -%x min -%x min -%x min - - - -1 hour -%x hours - - -%x ura -%x uri -%x ure -%x ur - - - -1 day -%x days - - -%x dan -%x dneva -%x dnevi -%x dni - - -Unable to register to receive system messages. -Ne morem se registriratiza prejem sistemskih sporočil. - -Cannot set privilege %x. -Ne morem nastaviti privilegija %x. - -Unable to suspend system sleep mode. -Ne morem preprečiti mirovanja sistema. - -Cannot change process I/O priorities. -Ne morem spremeniti V/I prioritet procesa. - -Unable to move %x to the recycle bin. -Ne morem premakniti %x v koš- - -Checking recycle bin failed for folder %x. -Preverjanje koša za mapo %x ni uspelo. - -Cannot determine final path for %x. -Ne morem določiti končne poti za %x. - -Error Code %x: -Koda napake %x: - -Cannot read the following XML elements: -Ne morem brati naslednje XML elemente: - -Configuration file %x loaded partially only. -Nastavitvena datoteka %x naložena samo delno. - diff --git a/FreeFileSync/Build/Languages/spanish.lng b/FreeFileSync/Build/Languages/spanish.lng index 3c142c1c..e2145d1d 100644 --- a/FreeFileSync/Build/Languages/spanish.lng +++ b/FreeFileSync/Build/Languages/spanish.lng @@ -7,9 +7,6 @@ n == 1 ? 0 : 1 -Unable to set application identifier. - - Both sides have changed since last synchronization. Ambos lados han cambiado desde la última sincronización. @@ -44,7 +41,7 @@ Borrar carpeta %x Deleting symbolic link %x -Borrar vínculo simbólico %x +Borrando vínculo simbólico %x The recycle bin is not available for the following folders. Files will be deleted permanently instead: La papelera de reciclaje no está disponible para las carpetas siguientes. Los archivos se borrarán de forma permanente: @@ -97,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Cualquier número de pares de directorios alternativos para un archivo de configuración como máximo. +Open configuration for edit without executing. +Abrir en edición sin ejecutar la configuración. + Cannot find the following folders: No se pudieron encontrar las siguiente carpetas: @@ -187,11 +187,11 @@ Move file on right Mover archivo a la derecha -Overwrite left item -Sobrescribir elemento izquierdo +Update left item +Actualizar elemento izquierdo -Overwrite right item -Sobrescribir elemento derecho +Update right item +Actualizar elemento derecho Do nothing No hacer nada @@ -274,6 +274,9 @@ Creating file %x Creando archivo %x +Saving file %x... +Guardando archivo %x… + Items processed: Elementos procesados: @@ -301,9 +304,6 @@ %x hilos -Encoding extended time information: %x -Codificando información de hora extendida: %x - /sec /seg @@ -343,8 +343,8 @@ Save &as... Guardar &como… -&Quit -&Salir +E&xit +Sal&ir &File &Archivo @@ -438,6 +438,9 @@ El comando es disparado si: &Show error Mo&strar error +&Quit +&Salir + Incorrect command line: Línea de comandos incorrecta: @@ -478,16 +481,16 @@ El comando es disparado si: Eliminando versiones antiguas… Creating symbolic link %x -Creando vínculo simbólico %x +Creando el vínculo simbólico %x Creating folder %x Creando carpeta %x -Overwriting file %x -Sobrescribir archivo %x +Updating file %x +Actualizando archivo %x -Overwriting symbolic link %x -Sobrescribir vínculo simbólico %x +Updating symbolic link %x +Actualizando el vínculo simbólico %x Verifying file %x Verificación del archivo %x @@ -501,21 +504,21 @@ El comando es disparado si: Data verification error: %x and %y have different content. Error al comprobar los datos: %x y %y tienen contenidos diferentes. -Cannot find folder %x. -No se puede encontrar la carpeta %x - Target folder %x already existing. La carpeta de destino %x ya existe. +Cannot find folder %x. +No se puede encontrar la carpeta %x + Target folder input field must not be empty. El campo de entrada de la carpeta de destino no debe estar vacío. -Please enter a target folder for versioning. -Indique una carpeta de destino para la versión. - Source folder %x not found. El archivo de origen %x no ha sido encontrado. +Please enter a target folder for versioning. +Indique una carpeta de destino para la versión. + The following items have unresolved conflicts and will not be synchronized: Los siguientes elementos tienen conflictos sin resolver y no serán sincronizados: @@ -558,8 +561,8 @@ El comando es disparado si: Synchronization completed successfully Sincronización completada satisfactoriamente -Saving log file %x... -Guardando registro %x… +Cleaning up old log files... +Limpiando antiguos archivos de registro… Stopped Detenido @@ -612,8 +615,8 @@ El comando es disparado si: FreeFileSync is up to date. FreeFileSync está actualizado. -Unable to connect to sourceforge.net. -No se puede conectar con sourceforge.net. +Unable to connect to FreeFileSync.org. +No se puede conectar al sitio FreeFileSync.org. Cannot find current FreeFileSync version number online. Do you want to check manually? No se encuentra el número de versión actual de FreeFileSync en línea. ¿Desea comprobarla manualmente? @@ -699,9 +702,21 @@ El comando es disparado si: Start &comparison Iniciar la &comparación +C&omparison settings +Opciones de c&omparación + +&Filter settings +Opciones de &filtro + +S&ynchronization settings +Opciones de s&incronización + Start &synchronization Iniciar la &sincronización +&Actions +&Acciones + &Options &Opciones @@ -712,7 +727,7 @@ El comando es disparado si: &Buscar… &Reset layout -&Reiniciar la presentación +&Reiniciar la disposición &Export file list... &Exportar lista de archivos… @@ -780,8 +795,8 @@ El comando es disparado si: Number of files and folders that will be deleted Número de archivos y carpetas que serán eliminados -Number of files that will be overwritten -Número de archivos que serán sobrescritos +Number of files that will be updated +Número de archivos que serán actualizados Number of files and folders that will be created Número de archivos y carpetas que serán creados @@ -810,8 +825,14 @@ El comando es disparado si: Handle daylight saving time Tener en cuenta la hora de verano -Symbolic links: -Vínculos simbólicos: +Include symbolic links: +Incluir vínculos simbólicos: + +Direct +Directo + +Follow +Seguir More information Más información @@ -840,23 +861,23 @@ El comando es disparado si: Maximum: Máximo: -C&lear -B&orrar - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Seleccione reglas para excluir archivos durante la sincronización. Indique rutas relativas a la carpeta emparejada correspondiente. +C&lear +B&orrar + Detect moved files Detectar archivos movidos -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- Requiere y crea archivos de bases de datos -- Detección activa tras syncronización inicial +- Detección activa tras sync. inicial +- Requiere y crea archivos de base de datos - No compatible con todos los sistemas de archivos @@ -1023,7 +1044,7 @@ Se garantiza un estado coherente incluso en caso de error grave. &Configuración predeterminada Source code written in C++ using: -Código fuente original en C++ con apoyo de: +Código fuente C++ con soporte de : If you like FreeFileSync ¿Te gusta FreeFileSync? : @@ -1032,7 +1053,7 @@ Se garantiza un estado coherente incluso en caso de error grave. Haz una donación por PayPal Feedback and suggestions are welcome -Comentarios y sugerencias bienvenidos : +Sus comentarios y sugerencias son bienvenidos : Homepage Página de inicio @@ -1044,7 +1065,7 @@ Se garantiza un estado coherente incluso en caso de error grave. Publicado con derechos GNU General Public License : Many thanks for localization: -Agradecimientos por las traducciones a: +Agradecimientos a los traductores : Save as Batch Job Guardar como tarea por lotes @@ -1070,27 +1091,15 @@ Se garantiza un estado coherente incluso en caso de error grave. View Settings Ver opciones -Overview -Vista general - Configuration Configuración +Overview +Vista general + Main Bar Barra principal -Start comparison -Iniciar la comparación - -Comparison settings -Opciones de comparación - -Synchronization settings -Opciones de sincronización - -Start synchronization -Iniciar sincronización - Confirm Confirmar @@ -1241,11 +1250,11 @@ Se garantiza un estado coherente incluso en caso de error grave. Show files that will be deleted on the right side Mostrar archivos que serán eliminados en el lado derecho -Show files that will be overwritten on left side -Mostrar archivos que serán sobrescritos en el lado izquierdo +Show files that will be updated on the left side +Mostrar archivos que serán actualizados en el lado izquierdo -Show files that will be overwritten on right side -Mostrar archivos que serán sobrescritos en el lado derecho +Show files that will be updated on the right side +Mostrar archivos que serán actualizados en el lado derecho Show files that won't be copied Mostrar archivos que no serán copiados @@ -1382,15 +1391,6 @@ Se garantiza un estado coherente incluso en caso de error grave. Configure your own synchronization rules. Configurar reglas de sincronización personalizadas. -Exclude -Excluir - -Direct -Directo - -Follow -Seguir - Today Hoy @@ -1454,9 +1454,6 @@ Se garantiza un estado coherente incluso en caso de error grave. Cannot monitor directory %x. No se puede monitorizar el directorio %x. -Conversion error: -Error de conversión: - Cannot delete file %x. No se puede eliminar el archivo %x. @@ -1490,8 +1487,8 @@ Se garantiza un estado coherente incluso en caso de error grave. Cannot create directory %x. No se puede crear el directorio %x. -Cannot create symbolic link %x. -No se puede crear el vínculo simbólico %x. +Cannot copy symbolic link %x to %y. +No se puede copiar el vínculo simbólico %x a %y. Cannot find system function %x. No se puede encontrar la función del sistema %x. @@ -1574,3 +1571,72 @@ Se garantiza un estado coherente incluso en caso de error grave. Configuration file %x loaded partially only. Archivo de configuración %x cargado sólo parcialmente. +Prepare installation +Preparar la instalación + +Choose which components you want to install. +Elija los components que desea instalar. + +Select installation type: +Elija el tipo de instalación: + +Local +Local + +Portable +Portable + +recommended +recomendado + +Save settings to "%APPDATA%\FreeFileSync" +Guardar cambios en "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Registrar las extensiones de archivos de FreeFileSync + +Create Explorer context menu entries +Crear entradas en el menú contextual del Explorador + +Save settings in installation directory +Guardar preferencias en el directorio de instalación + +Do not write to Registry +No escribir en el registro + +Just copy the files +Copiar archivos + +Choose a directory for installation: +Elegir directorio para la instalación: + +Create shortcuts: +Crear acceso directo: + +Desktop +Escritorio + +Start menu +Menú Inicio + +Registering FreeFileSync file extensions +Registrando las extensiones de archivo de FreeFileSync + +Unregistering FreeFileSync file extensions +Borrando las extensiones de archivo de FreeFileSync + +FreeFileSync Configuration +Configuración de FreeFileSync + +FreeFileSync Batch File +Archivo por lotes de FreeFileSync + +FreeFileSync Synchronization Database +Base de datos de sincronización de FreeFileSync + +RealtimeSync Configuration +Configuración de RealtimeSync + +Edit with FreeFileSync +Modificar con FreeFileSync + diff --git a/FreeFileSync/Build/Languages/swedish.lng b/FreeFileSync/Build/Languages/swedish.lng index 3b7ba35a..1afef2d8 100644 --- a/FreeFileSync/Build/Languages/swedish.lng +++ b/FreeFileSync/Build/Languages/swedish.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Valfritt antal alternativa katalogpar för som mest, en konfigurationsfil +Open configuration for edit without executing. +Öppna konfigurationen för redigering utan exekvering + Cannot find the following folders: Kan inte hitta följande mappar: @@ -184,11 +187,11 @@ Move file on right Flytta fil på höger sida -Overwrite left item -Skriv över vänster objekt +Update left item +Uppdatera objekt på vänster sida -Overwrite right item -Skriv över höger objekt +Update right item +Uppdatera objekt på höger sida Do nothing Gör ingenting @@ -217,6 +220,9 @@ %x GB %x GB +Cannot load file %x. +Kan inte läsa in %x + Database file %x is incompatible. Databasfilen %x är inkompatibel @@ -268,6 +274,9 @@ Creating file %x Skapar fil %x +Saving file %x... +Sparar %x... + Items processed: Processade poster @@ -295,9 +304,6 @@ %x trådar -Encoding extended time information: %x -Kodar utökad tidsinformation: %x - /sec /s @@ -319,9 +325,6 @@ Please use FreeFileSync 64-bit version to create shadow copies on this system. Använd FreeFileSync 64-bitarsversion för att skapa skuggkopior på detta system. -Cannot load file %x. -Kan inte läsa in %x - Cannot determine volume name for %x. Kan inte utläsa volymnamn för %x @@ -340,8 +343,8 @@ Save &as... S¶ som... -&Quit -&Avsluta +E&xit +A&vsluta &File &Arkiv @@ -435,6 +438,9 @@ Kommandot triggas om: &Show error &Visa fel +&Quit +&Avsluta + Incorrect command line: Felaktig kommandorad: @@ -480,11 +486,11 @@ Kommandot triggas om: Creating folder %x Skapar mappen %x -Overwriting file %x -Skriver över filen %x +Updating file %x +Uppdaterar %x -Overwriting symbolic link %x -Skriver över den symboliska länken %x +Updating symbolic link %x +Uppdaterar symbolisk länk för %x Verifying file %x Verifierar %x @@ -498,21 +504,21 @@ Kommandot triggas om: Data verification error: %x and %y have different content. Dataverifieringsfel: %x och %y har olika innehåll. -Cannot find folder %x. -Kan inte hitta mappen %x - Target folder %x already existing. Målmappen %x finns redan. +Cannot find folder %x. +Kan inte hitta mappen %x + Target folder input field must not be empty. Indatafältet för målmapp får inte vara tomt. -Please enter a target folder for versioning. -Ange en målmapp för versionshantering. - Source folder %x not found. Källmappen %x kan inte hittas. +Please enter a target folder for versioning. +Ange en målmapp för versionshantering. + The following items have unresolved conflicts and will not be synchronized: Följande objekt har olösta konflikter, och kommer inte att synkroniseras: @@ -555,8 +561,8 @@ Kommandot triggas om: Synchronization completed successfully Synkronisering slutförd -Saving log file %x... -Sparar loggfil %x... +Cleaning up old log files... +Rensar ut gamla loggfiler... Stopped Stoppad @@ -609,8 +615,8 @@ Kommandot triggas om: FreeFileSync is up to date. FreeFileSync är uppdaterad. -Unable to connect to sourceforge.net. -Kan inte ansluta sourceforge.net. +Unable to connect to FreeFileSync.org. +Kan inte ansluta till FreeFileSync.org. Cannot find current FreeFileSync version number online. Do you want to check manually? Kan inte hitta aktuellt versionsnummer online. Vill du kontrollera manuellt? @@ -696,9 +702,21 @@ Kommandot triggas om: Start &comparison &Jämför +C&omparison settings +I&nställningar för jämförelse + +&Filter settings +&Filterinställningar + +S&ynchronization settings +&Inställningar för synkronisering + Start &synchronization &Synkronisera +&Actions +&Åtgärder + &Options &Alternativ @@ -777,8 +795,8 @@ Kommandot triggas om: Number of files and folders that will be deleted Antal filer och mappar som kommer att tas bort -Number of files that will be overwritten -Antal filer som kommer att skrivas över +Number of files that will be updated +Antal filer som kommer att uppdateras Number of files and folders that will be created Antal filer och mappar som kommer att skapas @@ -807,8 +825,14 @@ Kommandot triggas om: Handle daylight saving time Hantera sommartid -Symbolic links: -Symboliska länkar: +Include symbolic links: +Inkludera symboliska länkar: + +Direct +Direkt + +Follow +Följ More information Mer information @@ -837,24 +861,24 @@ Kommandot triggas om: Maximum: Max: -C&lear -&Rensa - Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. Skapa filtreringsregler för att undanta vissa filer från synkronisering. Sökvägar relateras till motsvarande katalogpar +C&lear +&Rensa + Detect moved files Hitta flyttade filer -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems +- Detektion aktiv efter inledande synkronisering - Kräver och skapar databasfiler -- Övervakning aktiv efter initial synkronisering -- Stöds ej av alla filsystem +- Stöds inte av alla filsystem Detect synchronization directions with the help of database files @@ -1067,27 +1091,15 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. View Settings Visningsinställningar -Overview -Översikt - Configuration Inställningar +Overview +Översikt + Main Bar Primärt verktygsfält -Start comparison -Jämför - -Comparison settings -Jämförelseinställningar - -Synchronization settings -Synkroniseringsinställningar - -Start synchronization -Starta synkronisering - Confirm Bekräfta @@ -1238,11 +1250,11 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. Show files that will be deleted on the right side Visa filer som kommer att tas bort till höger -Show files that will be overwritten on left side -Visa filer som skrivas över till vänster +Show files that will be updated on the left side +Visa filer som kommer att uppdateras på vänster sida -Show files that will be overwritten on right side -Visa filer som skrivas över till höger +Show files that will be updated on the right side +Visa filer som kommer att uppdateras på höger sida Show files that won't be copied Visa filer som inte kommer att kopieras @@ -1379,15 +1391,6 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. Configure your own synchronization rules. Konfigurera dina egna synkroniseringsregler. -Exclude -Undanta - -Direct -Direkt - -Follow -Följ - Today Idag @@ -1451,9 +1454,6 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. Cannot monitor directory %x. Mappen %x kan inte övervakas. -Conversion error: -Konversionsfel: - Cannot delete file %x. Filen %x kan inte tas bort. @@ -1487,14 +1487,14 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. Cannot create directory %x. Kan inte skapa mappen %x. -Cannot create symbolic link %x. -Kan inte skapa den symboliska länken, %x +Cannot copy symbolic link %x to %y. +Kan inte kopiera den symboliska länken %x till %y Cannot find system function %x. Kan inte hitta systemfunktion %x Cannot copy file %x to %y. -Kan inte kopiera filen %x till %y. +Kan inte kopiera %x till %y. Type of item %x is not supported: Objekttyp %x stöds ej: @@ -1551,7 +1551,7 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. Det går inte att avbryta systemets viloläge Cannot change process I/O priorities. -Kan inte ändra process I/O-prioritet +Kan inte ändra I/O-prioritet. Unable to move %x to the recycle bin. Kan inte att flytta %x till papperskorgen @@ -1571,3 +1571,72 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. Configuration file %x loaded partially only. Konfigurationsfilen %x lästes bara delvis in. +Prepare installation +Förbered installation + +Choose which components you want to install. +Välj vilka komponenter du vill installera + +Select installation type: +Välj installationstyp: + +Local +Lokal + +Portable +Portabel + +recommended +rekommenderas + +Save settings to "%APPDATA%\FreeFileSync" +Sparar inställningar i "%APPDATA%\FreeFileSync" + +Register FreeFileSync file extensions +Registrerar filformat för FreeFileSync + +Create Explorer context menu entries +Skapar kontextmeny för Utforskaren + +Save settings in installation directory +Sparar inställningar i programmappen + +Do not write to Registry +Skriver inte till registret + +Just copy the files +Kopierar endast programfiler till valfri mapp + +Choose a directory for installation: +Välj installationsmapp: + +Create shortcuts: +Skapa genvägar: + +Desktop +Skrivbord + +Start menu +Startmeny + +Registering FreeFileSync file extensions +Registrerar filformat för FreeFileSync + +Unregistering FreeFileSync file extensions +Avregistrerar filformat för FreeFileSync + +FreeFileSync Configuration +FreeFileSync Konfiguration + +FreeFileSync Batch File +FreeFileSync Batch-fil + +FreeFileSync Synchronization Database +FreeFileSync Synkroniseringsdatabas + +RealtimeSync Configuration +RealtimeSync Konfiguration + +Edit with FreeFileSync +Redigera med FreeFileSync + diff --git a/FreeFileSync/Build/Languages/turkish.lng b/FreeFileSync/Build/Languages/turkish.lng index 3dc44c4c..66552031 100644 --- a/FreeFileSync/Build/Languages/turkish.lng +++ b/FreeFileSync/Build/Languages/turkish.lng @@ -94,6 +94,9 @@ Any number of alternative directory pairs for at most one config file. Bir ayar dosyasındaki en fazla alternatif klasör çifti sayısı. +Open configuration for edit without executing. +Ayarları çalıştırmadan düzenlemek için açın. + Cannot find the following folders: Aşağıdaki klasörler bulunamadı: @@ -184,11 +187,11 @@ Move file on right Sağdaki dosya taşınsın -Overwrite left item -Soldaki ögenin üzerine yazılsın +Update left item +Soldaki öge güncellensin -Overwrite right item -Sağdaki ögenin üzerine yazılsın +Update right item +Sağdaki öge güncellensin Do nothing Hiçbir işlem yapılmasın @@ -271,6 +274,9 @@ Creating file %x %x dosyası ekleniyor +Saving file %x... +%x dosyası kaydediliyor... + Items processed: İşlenen öge: @@ -298,9 +304,6 @@ %x iş parçacığı -Encoding extended time information: %x -Uzatılmış zaman bilgisi kodlanıyor: %x - /sec /saniye @@ -340,8 +343,8 @@ Save &as... F&arklı kaydedin... -&Quit -Çı&kın +E&xit +Çı&kış &File &Dosya @@ -435,6 +438,9 @@ Komut şu durumlarda yürütülür: &Show error Hataya &bakın +&Quit +Çı&kın + Incorrect command line: Geçersiz komut satırı: @@ -480,11 +486,11 @@ Komut şu durumlarda yürütülür: Creating folder %x %x klasörü ekleniyor -Overwriting file %x -%x dosyasının üzerine yazılıyor +Updating file %x +%x dosyası güncelleniyor -Overwriting symbolic link %x -%x sembolik bağlantısının üzerine yazılıyor +Updating symbolic link %x +%x sembolik bağlantısı güncelleniyor Verifying file %x %x dosyası doğrulanıyor @@ -555,8 +561,8 @@ Komut şu durumlarda yürütülür: Synchronization completed successfully Eşleştirme tamamlandı -Saving log file %x... -%x günlük dosyası kaydediliyor... +Cleaning up old log files... +Eski günlük dosyaları temizleniyor... Stopped Durduruldu @@ -609,8 +615,8 @@ Komut şu durumlarda yürütülür: FreeFileSync is up to date. FreeFileSync güncel. -Unable to connect to sourceforge.net. -sourceforge.net sitesine bağlanılamıyor. +Unable to connect to FreeFileSync.org. +FreeFileSync.org sitesine bağlanılamadı. Cannot find current FreeFileSync version number online. Do you want to check manually? Geçerli FreeFileSync sürüm numarası çevrimiçi olarak bulunamıyor. El ile denetlemek ister misiniz? @@ -696,9 +702,21 @@ Komut şu durumlarda yürütülür: Start &comparison &Karşılaştırmayı başlatın +C&omparison settings +Ka&rşılaştırma ayarları + +&Filter settings +&Süzme ayarları + +S&ynchronization settings +Eşleştirme a&yarları + Start &synchronization &Eşleştirmeyi başlatın +&Actions +İş&lemler + &Options A&yarlar @@ -777,8 +795,8 @@ Komut şu durumlarda yürütülür: Number of files and folders that will be deleted Silinecek dosya ve klasör sayısı -Number of files that will be overwritten -Üzerine yazılacak dosya sayısı +Number of files that will be updated +Güncellenecek dosya sayısı Number of files and folders that will be created Eklenecek dosya ve klasör sayısı @@ -805,10 +823,16 @@ Komut şu durumlarda yürütülür: Belirtilen saat kadar zaman farkı yoksayılır Handle daylight saving time -Yaz saati hesaba katılsın +Yaz saati uygulamasına bakın + +Include symbolic links: +Katılacak sembolik bağlantılar: -Symbolic links: -Sembolik bağlantılar: +Direct +Doğrudan + +Follow +Hedefler More information Ek bilgilere bakın @@ -837,23 +861,23 @@ Komut şu durumlarda yürütülür: Maximum: En büyük: +Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. +Eşleştirilmeyecek dosyaları süzecek kuralları belirleyin. Dosya yollarını bulundukları klasör çiftine göre yazın. + C&lear &Temizleyin -Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair. -Eşleştirmeye katılmayacak dosyaların süzülme kurallarını belirleyin. Dosya yollarını bulundukları klasör çiftine göre yazın. - Detect moved files Taşınmış dosyalar algılansın -- Requires and creates database files - Detection active after initial sync +- Requires and creates database files - Not supported by all file systems -- Veritabanı dosyalarını kullanılır ve oluşturulur -- Algılama, ilk eşleştirmeden sonra kullanılabilir +- İlk eşleştirmeden sonra algılama etkinleştirilir +- Veritabanı dosyalarının kullanılması gerekir - Tüm dosya sistemleri tarafından desteklenmez @@ -1067,27 +1091,15 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya View Settings Görünüm Ayarları -Overview -Genel - Configuration İşlemler +Overview +Genel + Main Bar Ana Çubuk -Start comparison -Karşılaştırmayı başlatın - -Comparison settings -Karşılaştırma ayarları - -Synchronization settings -Eşleştirme ayarları - -Start synchronization -Eşleştirmeyi başlatın - Confirm Onaylayın @@ -1238,11 +1250,11 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya Show files that will be deleted on the right side Sağ tarafta silinecek dosyalar görüntülensin -Show files that will be overwritten on left side -Sol tarafta üzerine yazılacak dosyalar görüntülensin +Show files that will be updated on the left side +Sol tarafta güncellenecek dosyalar görüntülensin -Show files that will be overwritten on right side -Sağ tarafta üzerine yazılacak dosyalar görüntülensin +Show files that will be updated on the right side +Sağ tarafta güncellenecek dosyalar görüntülensin Show files that won't be copied Kopyalanmayacak dosyalar görüntülensin @@ -1379,15 +1391,6 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya Configure your own synchronization rules. Eşleştirme kuralları kullanıcının isteğine göre belirlenir. -Exclude -Katılmasın - -Direct -Doğrudan - -Follow -Hedefler - Today Bugün @@ -1451,9 +1454,6 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya Cannot monitor directory %x. %x klasörü izlenemiyor. -Conversion error: -Dönüştürme hatası: - Cannot delete file %x. %x dosyası silinemiyor. @@ -1487,8 +1487,8 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya Cannot create directory %x. %x klasörü eklenemedi. -Cannot create symbolic link %x. -%x sembolik bağlantısı oluşturulamadı. +Cannot copy symbolic link %x to %y. +%x sembolik bağlantısı %y olarak kopyalanamıyor. Cannot find system function %x. %x sistem işlevi bulunamadı. @@ -1571,3 +1571,72 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya Configuration file %x loaded partially only. %x ayarlar dosyası kısmen yüklendi. +Prepare installation +Yüklemeye hazırlanılıyor + +Choose which components you want to install. +Yüklenecek bileşenleri seçin. + +Select installation type: +Yükleme tipini seçin: + +Local +Yerel + +Portable +Portable + +recommended +önerilir + +Save settings to "%APPDATA%\FreeFileSync" +Ayarlar "%APPDATA%\FreeFileSync" klasörüne kaydedilir + +Register FreeFileSync file extensions +Kayıt defterine FreeFileSync dosya eklentileri eklenir + +Create Explorer context menu entries +Dosya yöneticisi sağ tık menü kayıtları eklensin + +Save settings in installation directory +Ayarlar yükleme klasörüne kaydedilir + +Do not write to Registry +Kayıt defterine herhangi bir bilgi eklenmez + +Just copy the files +Yalnızca dosyalar kopyalanır + +Choose a directory for installation: +Yükleme klasörünü seçin: + +Create shortcuts: +Şuralarda kısayollar oluşturulsun: + +Desktop +Masaüstü + +Start menu +Başlat menüsü + +Registering FreeFileSync file extensions +FreeFileSync eklentileri kayıt defterine ekleniyor + +Unregistering FreeFileSync file extensions +FreeFileSync eklentileri kayıt defterinden siliniyor + +FreeFileSync Configuration +FreeFileSync Ayarları + +FreeFileSync Batch File +FreeFileSync Toplu İşlem Dosyası + +FreeFileSync Synchronization Database +FreeFileSync Eşleştirme Veritabanı + +RealtimeSync Configuration +Gerçek Zamanlı Eşleştirme Ayarları + +Edit with FreeFileSync +FreeFileSync ile düzenleyin + diff --git a/FreeFileSync/Source/RealtimeSync/app_icon.h b/FreeFileSync/Source/RealtimeSync/app_icon.h index fcd2b548..1a2a3e32 100644 --- a/FreeFileSync/Source/RealtimeSync/app_icon.h +++ b/FreeFileSync/Source/RealtimeSync/app_icon.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/RealtimeSync/application.cpp b/FreeFileSync/Source/RealtimeSync/application.cpp index 85c89f6b..c8461724 100644 --- a/FreeFileSync/Source/RealtimeSync/application.cpp +++ b/FreeFileSync/Source/RealtimeSync/application.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -8,7 +8,6 @@ #include "main_dlg.h" #include #include -#include #include #include #include @@ -22,11 +21,12 @@ #include "../lib/error_log.h" #ifdef ZEN_WIN -#include -#include "../lib/app_user_mode_id.h" + #include +#include + #include "../lib/app_user_mode_id.h" #elif defined ZEN_LINUX -#include + #include #endif using namespace zen; diff --git a/FreeFileSync/Source/RealtimeSync/application.h b/FreeFileSync/Source/RealtimeSync/application.h index 90180d23..2d2bd4c2 100644 --- a/FreeFileSync/Source/RealtimeSync/application.h +++ b/FreeFileSync/Source/RealtimeSync/application.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/RealtimeSync/gui_generated.cpp b/FreeFileSync/Source/RealtimeSync/gui_generated.cpp index 6a70d57d..696ef5be 100644 --- a/FreeFileSync/Source/RealtimeSync/gui_generated.cpp +++ b/FreeFileSync/Source/RealtimeSync/gui_generated.cpp @@ -29,7 +29,7 @@ MainDlgGenerated::MainDlgGenerated( wxWindow* parent, wxWindowID id, const wxStr m_menuFile->AppendSeparator(); wxMenuItem* m_menuItem4; - m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("&Quit") ) , wxEmptyString, wxITEM_NORMAL ); + m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ) , wxEmptyString, wxITEM_NORMAL ); m_menuFile->Append( m_menuItem4 ); m_menubar1->Append( m_menuFile, _("&File") ); diff --git a/FreeFileSync/Source/RealtimeSync/main_dlg.cpp b/FreeFileSync/Source/RealtimeSync/main_dlg.cpp index 121f5486..a68cb742 100644 --- a/FreeFileSync/Source/RealtimeSync/main_dlg.cpp +++ b/FreeFileSync/Source/RealtimeSync/main_dlg.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -22,13 +22,13 @@ #include "../lib/ffs_paths.h" #ifdef ZEN_WIN -#include + #include #elif defined ZEN_LINUX -#include + #include #elif defined ZEN_MAC -#include -#include + #include + #include #endif using namespace zen; @@ -422,9 +422,9 @@ void MainDialog::OnRemoveTopFolder(wxCommandEvent& event) #ifdef ZEN_WIN -static const size_t MAX_ADD_FOLDERS = 8; + static const size_t MAX_ADD_FOLDERS = 8; #elif defined ZEN_LINUX || defined ZEN_MAC -static const size_t MAX_ADD_FOLDERS = 6; + static const size_t MAX_ADD_FOLDERS = 6; #endif diff --git a/FreeFileSync/Source/RealtimeSync/main_dlg.h b/FreeFileSync/Source/RealtimeSync/main_dlg.h index b77ee045..a6071c1b 100644 --- a/FreeFileSync/Source/RealtimeSync/main_dlg.h +++ b/FreeFileSync/Source/RealtimeSync/main_dlg.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/RealtimeSync/monitor.cpp b/FreeFileSync/Source/RealtimeSync/monitor.cpp index 4c17467e..1cf09740 100644 --- a/FreeFileSync/Source/RealtimeSync/monitor.cpp +++ b/FreeFileSync/Source/RealtimeSync/monitor.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/RealtimeSync/monitor.h b/FreeFileSync/Source/RealtimeSync/monitor.h index 77fe4740..87915b41 100644 --- a/FreeFileSync/Source/RealtimeSync/monitor.h +++ b/FreeFileSync/Source/RealtimeSync/monitor.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/RealtimeSync/tray_menu.cpp b/FreeFileSync/Source/RealtimeSync/tray_menu.cpp index 2a59902f..f70acc70 100644 --- a/FreeFileSync/Source/RealtimeSync/tray_menu.cpp +++ b/FreeFileSync/Source/RealtimeSync/tray_menu.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/RealtimeSync/tray_menu.h b/FreeFileSync/Source/RealtimeSync/tray_menu.h index 1f71a017..1b906c54 100644 --- a/FreeFileSync/Source/RealtimeSync/tray_menu.h +++ b/FreeFileSync/Source/RealtimeSync/tray_menu.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/RealtimeSync/xml_proc.cpp b/FreeFileSync/Source/RealtimeSync/xml_proc.cpp index 04edbf86..b60cf0a6 100644 --- a/FreeFileSync/Source/RealtimeSync/xml_proc.cpp +++ b/FreeFileSync/Source/RealtimeSync/xml_proc.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/RealtimeSync/xml_proc.h b/FreeFileSync/Source/RealtimeSync/xml_proc.h index 9fe4e620..e86ec5c0 100644 --- a/FreeFileSync/Source/RealtimeSync/xml_proc.h +++ b/FreeFileSync/Source/RealtimeSync/xml_proc.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/algorithm.cpp b/FreeFileSync/Source/algorithm.cpp index 37f627ee..dae18933 100644 --- a/FreeFileSync/Source/algorithm.cpp +++ b/FreeFileSync/Source/algorithm.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -627,11 +627,8 @@ std::vector zen::extractDirectionCfg(const MainConfiguration& m mainCfg.additionalPairs.end()); std::vector output; - std::for_each(allPairs.begin(), allPairs.end(), - [&](const FolderPairEnh& fp) - { + for (const FolderPairEnh& fp : allPairs) output.push_back(fp.altSyncConfig.get() ? fp.altSyncConfig->directionCfg : mainCfg.syncCfg.directionCfg); - }); return output; } diff --git a/FreeFileSync/Source/algorithm.h b/FreeFileSync/Source/algorithm.h index 64d10160..398d0def 100644 --- a/FreeFileSync/Source/algorithm.h +++ b/FreeFileSync/Source/algorithm.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/application.cpp b/FreeFileSync/Source/application.cpp index 3ca0c53c..12737071 100644 --- a/FreeFileSync/Source/application.cpp +++ b/FreeFileSync/Source/application.cpp @@ -1,13 +1,12 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** #include "application.h" #include #include -#include #include #include #include @@ -24,11 +23,12 @@ #include "lib/error_log.h" #ifdef ZEN_WIN -#include -#include "lib/app_user_mode_id.h" + #include + #include + #include "lib/app_user_mode_id.h" #elif defined ZEN_LINUX -#include + #include #endif using namespace zen; @@ -204,30 +204,30 @@ void Application::onEnterEventLoop(wxEvent& event) #ifdef ZEN_MAC -/* -wxWidgets initialization sequence on OS X is a mess: ----------------------------------------------------- -1. double click FFS app bundle or execute from command line without arguments - OnInit() - OnRun() - onEnterEventLoop() - MacNewFile() - -2. double-click .ffs_gui file - OnInit() - OnRun() - onEnterEventLoop() - MacOpenFiles() - -3. start from command line with .ffs_gui file as first argument - OnInit() - OnRun() - MacOpenFiles() -> WTF!? - onEnterEventLoop() - MacNewFile() -> yes, wxWidgets screws up once again: http://trac.wxwidgets.org/ticket/14558 - -=> solution: map Apple events to regular command line via launcher -*/ + /* + wxWidgets initialization sequence on OS X is a mess: + ---------------------------------------------------- + 1. double click FFS app bundle or execute from command line without arguments + OnInit() + OnRun() + onEnterEventLoop() + MacNewFile() + + 2. double-click .ffs_gui file + OnInit() + OnRun() + onEnterEventLoop() + MacOpenFiles() + + 3. start from command line with .ffs_gui file as first argument + OnInit() + OnRun() + MacOpenFiles() -> WTF!? + onEnterEventLoop() + MacNewFile() -> yes, wxWidgets screws up once again: http://trac.wxwidgets.org/ticket/14558 + + => solution: map Apple events to regular command line via launcher + */ #endif diff --git a/FreeFileSync/Source/application.h b/FreeFileSync/Source/application.h index ce0284e8..c866fe67 100644 --- a/FreeFileSync/Source/application.h +++ b/FreeFileSync/Source/application.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/comparison.cpp b/FreeFileSync/Source/comparison.cpp index 08d5ee71..30f97b05 100644 --- a/FreeFileSync/Source/comparison.cpp +++ b/FreeFileSync/Source/comparison.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -724,9 +724,11 @@ std::shared_ptr ComparisonBuffer::performComparison(const ResolvedF fpCfg.compareVar, fpCfg.fileTimeTolerance, fpCfg.optTimeShiftHours); + //PERF_START; - MergeSides(undefinedFiles, undefinedLinks).execute(bufValueLeft ? bufValueLeft ->dirCont : DirContainer(), - bufValueRight ? bufValueRight->dirCont : DirContainer(), *output); + DirContainer emptyDirCont; //WTF!!! => using a temporary in the ternary conditional would implicitly call the DirContainer copy-constructor!!!!!! + MergeSides(undefinedFiles, undefinedLinks).execute(bufValueLeft ? bufValueLeft ->dirCont : emptyDirCont, + bufValueRight ? bufValueRight->dirCont : emptyDirCont, *output); //PERF_STOP; //##################### in/exclude rows according to filtering ##################### diff --git a/FreeFileSync/Source/comparison.h b/FreeFileSync/Source/comparison.h index 6fcd3c29..0aa5dd38 100644 --- a/FreeFileSync/Source/comparison.h +++ b/FreeFileSync/Source/comparison.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/file_hierarchy.cpp b/FreeFileSync/Source/file_hierarchy.cpp index 0fd50191..16b02a21 100644 --- a/FreeFileSync/Source/file_hierarchy.cpp +++ b/FreeFileSync/Source/file_hierarchy.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -319,9 +319,9 @@ std::wstring zen::getSyncOpDescription(SyncOperation op) case SO_MOVE_RIGHT_TARGET: return _("Move file on right"); case SO_OVERWRITE_LEFT: - return _("Overwrite left item"); + return _("Update left item"); case SO_OVERWRITE_RIGHT: - return _("Overwrite right item"); + return _("Update right item"); case SO_DO_NOTHING: return _("Do nothing"); case SO_EQUAL: diff --git a/FreeFileSync/Source/file_hierarchy.h b/FreeFileSync/Source/file_hierarchy.h index 1468750e..5c473466 100644 --- a/FreeFileSync/Source/file_hierarchy.h +++ b/FreeFileSync/Source/file_hierarchy.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -105,6 +105,10 @@ struct DirContainer typedef std::map LinkList; // //------------------------------------------------------------------ + DirContainer() = default; + DirContainer (const DirContainer&) = delete; //catch accidental (and unnecessary) copying + DirContainer& operator=(const DirContainer&) = delete; // + DirList dirs; FileList files; LinkList links; //non-followed symlinks @@ -541,7 +545,7 @@ class SymlinkPair : public FileSystemObject //this class models a TRUE symbolic friend class HierarchyObject; //construction public: - virtual void accept(FSObjectVisitor& visitor) const; + void accept(FSObjectVisitor& visitor) const override; template std::int64_t getLastWriteTime() const; //write time of the link, NOT target! diff --git a/FreeFileSync/Source/lib/binary.cpp b/FreeFileSync/Source/lib/binary.cpp index 5fb1d176..0b365621 100644 --- a/FreeFileSync/Source/lib/binary.cpp +++ b/FreeFileSync/Source/lib/binary.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/binary.h b/FreeFileSync/Source/lib/binary.h index c9c479ac..774c6767 100644 --- a/FreeFileSync/Source/lib/binary.h +++ b/FreeFileSync/Source/lib/binary.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/db_file.cpp b/FreeFileSync/Source/lib/db_file.cpp index c1bc5478..22bd2424 100644 --- a/FreeFileSync/Source/lib/db_file.cpp +++ b/FreeFileSync/Source/lib/db_file.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -14,8 +14,8 @@ #include #ifdef ZEN_WIN -#include //includes "windows.h" -#include + #include //includes "windows.h" + #include #endif using namespace zen; diff --git a/FreeFileSync/Source/lib/db_file.h b/FreeFileSync/Source/lib/db_file.h index 9998bbc3..9ceacf51 100644 --- a/FreeFileSync/Source/lib/db_file.h +++ b/FreeFileSync/Source/lib/db_file.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/dir_exist_async.h b/FreeFileSync/Source/lib/dir_exist_async.h index a7e9b0b7..0d8340b2 100644 --- a/FreeFileSync/Source/lib/dir_exist_async.h +++ b/FreeFileSync/Source/lib/dir_exist_async.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/dir_lock.cpp b/FreeFileSync/Source/lib/dir_lock.cpp index 1d1ce2ae..b486c730 100644 --- a/FreeFileSync/Source/lib/dir_lock.cpp +++ b/FreeFileSync/Source/lib/dir_lock.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** #include "dir_lock.h" @@ -18,18 +18,18 @@ #include #ifdef ZEN_WIN -#include -#include //includes "windows.h" -#include -#include //login sid -#include //UNLEN + #include + #include //includes "windows.h" + #include + #include //login sid + #include //UNLEN #elif defined ZEN_LINUX || defined ZEN_MAC -#include //open() -#include // -#include //getsid() -#include //kill() -#include //getpwuid_r() + #include //open() + #include // + #include //getsid() + #include //kill() + #include //getpwuid_r() #endif using namespace zen; @@ -205,11 +205,11 @@ Zstring getLoginSid() //throw FileError #ifdef ZEN_WIN -typedef DWORD ProcessId; -typedef DWORD SessionId; + typedef DWORD ProcessId; + typedef DWORD SessionId; #elif defined ZEN_LINUX || defined ZEN_MAC -typedef pid_t ProcessId; -typedef pid_t SessionId; + typedef pid_t ProcessId; + typedef pid_t SessionId; #endif //return ppid on Windows, sid on Linux/Mac, "no value" if process corresponding to "processId" is not existing diff --git a/FreeFileSync/Source/lib/dir_lock.h b/FreeFileSync/Source/lib/dir_lock.h index 2eacc6af..8fd43fcf 100644 --- a/FreeFileSync/Source/lib/dir_lock.h +++ b/FreeFileSync/Source/lib/dir_lock.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** #ifndef DIR_LOCK_H_INCLUDED diff --git a/FreeFileSync/Source/lib/error_log.h b/FreeFileSync/Source/lib/error_log.h index f9e351c6..465f2aa5 100644 --- a/FreeFileSync/Source/lib/error_log.h +++ b/FreeFileSync/Source/lib/error_log.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/ffs_paths.cpp b/FreeFileSync/Source/lib/ffs_paths.cpp index 32026b25..b094fd5b 100644 --- a/FreeFileSync/Source/lib/ffs_paths.cpp +++ b/FreeFileSync/Source/lib/ffs_paths.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -11,11 +11,11 @@ #include #ifdef ZEN_MAC -#include -#include -#include -//keep in .cpp file to not pollute global namespace! -#include //LSFindApplicationForInfo + #include + #include + #include + //keep in .cpp file to not pollute global namespace! + #include //LSFindApplicationForInfo #endif using namespace zen; @@ -42,7 +42,11 @@ Zstring getInstallDir() //root install directory WITH path separator at end #ifdef ZEN_WIN inline -bool isPortableVersion() { return !fileExists(getInstallDir() + L"uninstall.exe"); } //this check is a bit lame... +bool isPortableVersion() +{ + return !(fileExists(getInstallDir() + L"uninstall.exe") || //created by NSIS + dirExists (getInstallDir() + L"Uninstall")); //created by Inno Setup +} #elif defined ZEN_LINUX inline bool isPortableVersion() { return !endsWith(getExecutableDir(), "/bin/"); } //this check is a bit lame... diff --git a/FreeFileSync/Source/lib/ffs_paths.h b/FreeFileSync/Source/lib/ffs_paths.h index 28516a3f..d4f2a0f8 100644 --- a/FreeFileSync/Source/lib/ffs_paths.h +++ b/FreeFileSync/Source/lib/ffs_paths.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/generate_logfile.h b/FreeFileSync/Source/lib/generate_logfile.h index af8d05a9..e77aa11e 100644 --- a/FreeFileSync/Source/lib/generate_logfile.h +++ b/FreeFileSync/Source/lib/generate_logfile.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -44,7 +44,7 @@ Zstring getLastSyncsLogfilePath(); struct OnUpdateLogfileStatusNoThrow { OnUpdateLogfileStatusNoThrow(ProcessCallback& pc, const Zstring& logfilePath) : pc_(pc), logfilePath_(logfilePath), bytesWritten(), - msg(replaceCpy(_("Saving log file %x..."), L"%x", fmtFileName(logfilePath_))) {} + msg(replaceCpy(_("Saving file %x..."), L"%x", fmtFileName(logfilePath_))) {} void operator()(std::int64_t bytesDelta) { diff --git a/FreeFileSync/Source/lib/hard_filter.cpp b/FreeFileSync/Source/lib/hard_filter.cpp index ca1005d1..3f153821 100644 --- a/FreeFileSync/Source/lib/hard_filter.cpp +++ b/FreeFileSync/Source/lib/hard_filter.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/hard_filter.h b/FreeFileSync/Source/lib/hard_filter.h index 19e7003b..f86306ec 100644 --- a/FreeFileSync/Source/lib/hard_filter.h +++ b/FreeFileSync/Source/lib/hard_filter.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/help_provider.h b/FreeFileSync/Source/lib/help_provider.h index 8ddc34c7..ecfa1e5e 100644 --- a/FreeFileSync/Source/lib/help_provider.h +++ b/FreeFileSync/Source/lib/help_provider.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -8,11 +8,11 @@ #define HELPPROVIDER_H_INCLUDED #ifdef ZEN_WIN -#include -#include + #include + #include #elif defined ZEN_LINUX || defined ZEN_MAC -#include + #include #endif #include "ffs_paths.h" diff --git a/FreeFileSync/Source/lib/icon_buffer.cpp b/FreeFileSync/Source/lib/icon_buffer.cpp index df0bee8b..b3b6f943 100644 --- a/FreeFileSync/Source/lib/icon_buffer.cpp +++ b/FreeFileSync/Source/lib/icon_buffer.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -12,16 +12,16 @@ #include #ifdef ZEN_WIN -#include -#include -#include -#include "../dll/Thumbnail/thumbnail.h" + #include + #include + #include + #include "../dll/Thumbnail/thumbnail.h" #elif defined ZEN_LINUX -#include + #include #elif defined ZEN_MAC -#include "osx_file_icon.h" + #include "osx_file_icon.h" #endif using namespace zen; @@ -32,16 +32,16 @@ namespace const size_t BUFFER_SIZE_MAX = 800; //maximum number of icons to hold in buffer: must be big enough to hold visible icons + preload buffer! Consider OS limit on GDI resources (wxBitmap)!!! #ifndef NDEBUG -const boost::thread::id mainThreadId = boost::this_thread::get_id(); + const boost::thread::id mainThreadId = boost::this_thread::get_id(); #endif #ifdef ZEN_WIN -const bool isXpOrLater = winXpOrLater(); //VS2010 compiled DLLs are not supported on Win 2000: Popup dialog "DecodePointer not found" + const bool isXpOrLater = winXpOrLater(); //VS2010 compiled DLLs are not supported on Win 2000: Popup dialog "DecodePointer not found" -#define DEF_DLL_FUN(name) const auto name = isXpOrLater ? DllFun(thumb::getDllName(), thumb::funName_##name) : DllFun(); -DEF_DLL_FUN(getIconByIndex); // -DEF_DLL_FUN(getThumbnail); //let's spare the boost::call_once hustle and allocate statically -DEF_DLL_FUN(releaseImageData); // + #define DEF_DLL_FUN(name) const auto name = isXpOrLater ? DllFun(thumb::getDllName(), thumb::funName_##name) : DllFun(); + DEF_DLL_FUN(getIconByIndex); // + DEF_DLL_FUN(getThumbnail); //let's spare the boost::call_once hustle and allocate statically + DEF_DLL_FUN(releaseImageData); // #endif class IconHolder //handle HICON/GdkPixbuf ownership supporting thread-safe usage (in contrast to wxIcon/wxBitmap) diff --git a/FreeFileSync/Source/lib/icon_buffer.h b/FreeFileSync/Source/lib/icon_buffer.h index 3c313bf5..ff049343 100644 --- a/FreeFileSync/Source/lib/icon_buffer.h +++ b/FreeFileSync/Source/lib/icon_buffer.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/localization.cpp b/FreeFileSync/Source/lib/localization.cpp index f891fdb4..72bbcf1b 100644 --- a/FreeFileSync/Source/lib/localization.cpp +++ b/FreeFileSync/Source/lib/localization.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -21,10 +21,10 @@ #include "ffs_paths.h" #ifdef ZEN_LINUX -#include //wcscasecmp + #include //wcscasecmp #elif defined ZEN_MAC -#include + #include #endif using namespace zen; @@ -441,10 +441,10 @@ void zen::setLanguage(int language) //throw FileError //(try to) retrieve language file std::wstring languageFile; - for (auto it = ExistingTranslations::get().begin(); it != ExistingTranslations::get().end(); ++it) - if (it->languageID == language) + for (const ExistingTranslations::Entry& e : ExistingTranslations::get()) + if (e.languageID == language) { - languageFile = it->languageFile; + languageFile = e.languageFile; break; } diff --git a/FreeFileSync/Source/lib/localization.h b/FreeFileSync/Source/lib/localization.h index 6cd61295..3663ac5b 100644 --- a/FreeFileSync/Source/lib/localization.h +++ b/FreeFileSync/Source/lib/localization.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/norm_filter.h b/FreeFileSync/Source/lib/norm_filter.h index 552931e2..e9ea0f5d 100644 --- a/FreeFileSync/Source/lib/norm_filter.h +++ b/FreeFileSync/Source/lib/norm_filter.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/parallel_scan.cpp b/FreeFileSync/Source/lib/parallel_scan.cpp index 930078b5..2b76bf62 100644 --- a/FreeFileSync/Source/lib/parallel_scan.cpp +++ b/FreeFileSync/Source/lib/parallel_scan.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/parallel_scan.h b/FreeFileSync/Source/lib/parallel_scan.h index 4b0e0748..5557d10f 100644 --- a/FreeFileSync/Source/lib/parallel_scan.h +++ b/FreeFileSync/Source/lib/parallel_scan.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/parse_lng.h b/FreeFileSync/Source/lib/parse_lng.h index 9fbebff4..2fe15a27 100644 --- a/FreeFileSync/Source/lib/parse_lng.h +++ b/FreeFileSync/Source/lib/parse_lng.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -361,32 +361,32 @@ public: consumeToken(Token::TK_HEADER_BEGIN); consumeToken(Token::TK_LANG_NAME_BEGIN); - header.languageName = tk.text; + header.languageName = token().text; consumeToken(Token::TK_TEXT); consumeToken(Token::TK_LANG_NAME_END); consumeToken(Token::TK_TRANS_NAME_BEGIN); - header.translatorName = tk.text; + header.translatorName = token().text; consumeToken(Token::TK_TEXT); consumeToken(Token::TK_TRANS_NAME_END); consumeToken(Token::TK_LOCALE_NAME_BEGIN); - header.localeName = tk.text; + header.localeName = token().text; consumeToken(Token::TK_TEXT); consumeToken(Token::TK_LOCALE_NAME_END); consumeToken(Token::TK_FLAG_FILE_BEGIN); - header.flagFile = tk.text; + header.flagFile = token().text; consumeToken(Token::TK_TEXT); consumeToken(Token::TK_FLAG_FILE_END); consumeToken(Token::TK_PLURAL_COUNT_BEGIN); - header.pluralCount = zen::stringTo(tk.text); + header.pluralCount = zen::stringTo(token().text); consumeToken(Token::TK_TEXT); consumeToken(Token::TK_PLURAL_COUNT_END); consumeToken(Token::TK_PLURAL_DEF_BEGIN); - header.pluralDefinition = tk.text; + header.pluralDefinition = token().text; consumeToken(Token::TK_TEXT); consumeToken(Token::TK_PLURAL_DEF_END); @@ -401,11 +401,8 @@ private: if (token().type == Token::TK_PLURAL_BEGIN) return parsePlural(pluralOut, pluralInfo); - if (token().type != Token::TK_TEXT) - throw ParsingError(L"Source text empty", scn.posRow(), scn.posCol()); - std::string original = tk.text; - nextToken(); - + std::string original = token().text; + consumeToken(Token::TK_TEXT); consumeToken(Token::TK_SRC_END); consumeToken(Token::TK_TRG_BEGIN); @@ -415,9 +412,9 @@ private: translation = token().text; nextToken(); } + validateTranslation(original, translation); //throw throw ParsingError consumeToken(Token::TK_TRG_END); - validateTranslation(original, translation); //throw throw ParsingError out.emplace(original, translation); } @@ -426,16 +423,17 @@ private: //Token::TK_SRC_BEGIN already consumed consumeToken(Token::TK_PLURAL_BEGIN); - std::string engSingular = tk.text; + std::string engSingular = token().text; consumeToken(Token::TK_TEXT); consumeToken(Token::TK_PLURAL_END); consumeToken(Token::TK_PLURAL_BEGIN); - std::string engPlural = tk.text; + std::string engPlural = token().text; consumeToken(Token::TK_TEXT); consumeToken(Token::TK_PLURAL_END); consumeToken(Token::TK_SRC_END); + const SingularPluralPair original(engSingular, engPlural); consumeToken(Token::TK_TRG_BEGIN); @@ -443,16 +441,14 @@ private: while (token().type == Token::TK_PLURAL_BEGIN) { consumeToken(Token::TK_PLURAL_BEGIN); - std::string pluralForm = tk.text; + std::string pluralForm = token().text; consumeToken(Token::TK_TEXT); consumeToken(Token::TK_PLURAL_END); pluralList.push_back(pluralForm); } - + validateTranslation(original, pluralList, pluralInfo); consumeToken(Token::TK_TRG_END); - const SingularPluralPair original(engSingular, engPlural); - validateTranslation(original, pluralList, pluralInfo); pluralOut.emplace(original, pluralList); } @@ -463,7 +459,7 @@ private: if (!translation.empty()) { - //if original contains placeholder, so should translation! + //if original contains placeholder, so must translation! auto checkPlaceholder = [&](const std::string& placeholder) { if (zen::contains(original, placeholder) && @@ -474,9 +470,15 @@ private: checkPlaceholder("%y"); checkPlaceholder("%z"); + auto ampersandTokenCount = [](const std::string& str) -> size_t + { + const std::string tmp = zen::replaceCpy(str, "&&", ""); //make sure to not catch && which windows resolves as just one & for display! + return std::count(tmp.begin(), tmp.end(), '&'); + }; + //if source contains ampersand to mark menu accellerator key, so must translation - const size_t ampCountOrig = getAmpersandTokenCount(original); - if (ampCountOrig != getAmpersandTokenCount(translation) || + const size_t ampCountOrig = ampersandTokenCount(original); + if (ampCountOrig != ampersandTokenCount(translation) || ampCountOrig > 1) throw ParsingError(L"Source and translation both need exactly one & character to mark a menu item access key or none at all", scn.posRow(), scn.posCol()); @@ -485,6 +487,28 @@ private: if ((zen::endsWith(original, "&") && !zen::endsWith(original, "&&")) || (zen::endsWith(translation, "&") && !zen::endsWith(translation, "&&"))) throw ParsingError(L"The & character to mark a menu item access key must not occur at the end of a string", scn.posRow(), scn.posCol()); + +#if 0 + //if source ends with colon, so must translation (note: character seems to be universally used, even for asian and arabic languages) + if (zen::endsWith(original, ":") && + !zen::endsWith(translation, ":") && + !zen::endsWith(translation, "\xef\xbc\x9a")) //chinese colon + throw ParsingError(L"Source text ends with a colon character \":\", but translation does not", scn.posRow(), scn.posCol()); + + auto endsWithSingleDot = [](const std::string& s) { return zen::endsWith(s, ".") && !zen::endsWith(s, ".."); }; + + //if source ends with a period, so must translation (note: character seems to be universally used, even for asian and arabic languages) + if (endsWithSingleDot(original) && + !endsWithSingleDot(translation) && + !zen::endsWith(translation, "\xe3\x80\x82")) //chinese period + throw ParsingError(L"Source text ends with a punctuation mark character \".\", but translation does not", scn.posRow(), scn.posCol()); + + //if source ends with an ellipsis, so must translation (note: character seems to be universally used, even for asian and arabic languages) + if (zen::endsWith(original, "...") && + !zen::endsWith(translation, "...") && + !zen::endsWith(translation, "\xe2\x80\xa6")) //narrow ellipsis (spanish?) + throw ParsingError(L"Source text ends with an ellipsis \"...\", but translation does not", scn.posRow(), scn.posCol()); +#endif } } @@ -552,12 +576,6 @@ private: } } - static size_t getAmpersandTokenCount(const std::string& str) - { - const std::string tmp = zen::replaceCpy(str, "&&", ""); //make sure to not catch && which windows resolves as just one & for display! - return std::count(tmp.begin(), tmp.end(), '&'); - } - void nextToken() { tk = scn.nextToken(); } const Token& token() const { return tk; } diff --git a/FreeFileSync/Source/lib/parse_plural.h b/FreeFileSync/Source/lib/parse_plural.h index c19714de..a54eecea 100644 --- a/FreeFileSync/Source/lib/parse_plural.h +++ b/FreeFileSync/Source/lib/parse_plural.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/perf_check.cpp b/FreeFileSync/Source/lib/perf_check.cpp index 251e6274..19ff4bda 100644 --- a/FreeFileSync/Source/lib/perf_check.cpp +++ b/FreeFileSync/Source/lib/perf_check.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/perf_check.h b/FreeFileSync/Source/lib/perf_check.h index 32e74874..16376f97 100644 --- a/FreeFileSync/Source/lib/perf_check.h +++ b/FreeFileSync/Source/lib/perf_check.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/process_xml.cpp b/FreeFileSync/Source/lib/process_xml.cpp index 5f7dbf14..83741791 100644 --- a/FreeFileSync/Source/lib/process_xml.cpp +++ b/FreeFileSync/Source/lib/process_xml.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/process_xml.h b/FreeFileSync/Source/lib/process_xml.h index 6f07e0c9..3a853a90 100644 --- a/FreeFileSync/Source/lib/process_xml.h +++ b/FreeFileSync/Source/lib/process_xml.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/resolve_path.cpp b/FreeFileSync/Source/lib/resolve_path.cpp index a589260f..498ea39f 100644 --- a/FreeFileSync/Source/lib/resolve_path.cpp +++ b/FreeFileSync/Source/lib/resolve_path.cpp @@ -9,18 +9,18 @@ #include //wxGetEnv #ifdef ZEN_WIN -#include -#include -#include //includes "windows.h" -#include -#include -#ifdef _MSC_VER -#pragma comment(lib, "Mpr.lib") -#endif + #include + #include + #include //includes "windows.h" + #include + #include + #ifdef _MSC_VER + #pragma comment(lib, "Mpr.lib") + #endif #elif defined ZEN_LINUX || defined ZEN_MAC -#include //getenv() -#include //getcwd + #include //getenv() + #include //getcwd #endif using namespace zen; diff --git a/FreeFileSync/Source/lib/resolve_path.h b/FreeFileSync/Source/lib/resolve_path.h index 9533cd9d..bc141c90 100644 --- a/FreeFileSync/Source/lib/resolve_path.h +++ b/FreeFileSync/Source/lib/resolve_path.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -27,8 +27,8 @@ Zstring expandMacros(const Zstring& text); std::vector getDirectoryAliases(const Zstring& dirpassPhrase); //may block for slow USB sticks when resolving [] #ifdef ZEN_WIN -//*blocks* if network is not reachable or when showing login prompt dialog! -void loginNetworkShare(const Zstring& dirpath, bool allowUserInteraction); //noexcept; user interaction: show OS password prompt + //*blocks* if network is not reachable or when showing login prompt dialog! + void loginNetworkShare(const Zstring& dirpath, bool allowUserInteraction); //noexcept; user interaction: show OS password prompt #endif } diff --git a/FreeFileSync/Source/lib/return_codes.h b/FreeFileSync/Source/lib/return_codes.h index a37e11f2..71da2f02 100644 --- a/FreeFileSync/Source/lib/return_codes.h +++ b/FreeFileSync/Source/lib/return_codes.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/soft_filter.h b/FreeFileSync/Source/lib/soft_filter.h index db3f31ed..969e245f 100644 --- a/FreeFileSync/Source/lib/soft_filter.h +++ b/FreeFileSync/Source/lib/soft_filter.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/status_handler.cpp b/FreeFileSync/Source/lib/status_handler.cpp index 74872010..c19b97c4 100644 --- a/FreeFileSync/Source/lib/status_handler.cpp +++ b/FreeFileSync/Source/lib/status_handler.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/status_handler.h b/FreeFileSync/Source/lib/status_handler.h index 1ee23c38..6f90506c 100644 --- a/FreeFileSync/Source/lib/status_handler.h +++ b/FreeFileSync/Source/lib/status_handler.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/status_handler_impl.h b/FreeFileSync/Source/lib/status_handler_impl.h index 7ec491fb..e96eb249 100644 --- a/FreeFileSync/Source/lib/status_handler_impl.h +++ b/FreeFileSync/Source/lib/status_handler_impl.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/lib/versioning.h b/FreeFileSync/Source/lib/versioning.h index 38bb6189..b6456e20 100644 --- a/FreeFileSync/Source/lib/versioning.h +++ b/FreeFileSync/Source/lib/versioning.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/process_callback.h b/FreeFileSync/Source/process_callback.h index f75110ce..7948f2af 100644 --- a/FreeFileSync/Source/process_callback.h +++ b/FreeFileSync/Source/process_callback.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/structures.cpp b/FreeFileSync/Source/structures.cpp index f8716669..c549e0df 100644 --- a/FreeFileSync/Source/structures.cpp +++ b/FreeFileSync/Source/structures.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -447,7 +447,7 @@ MainConfiguration zen::merge(const std::vector& mainCfgs) std::vector> syncCfgStat; for (const FolderPairEnh& fp : fpMerged) { - //rather inefficient algorithm, but it does not require a less-than operator: + //a rather inefficient algorithm, but it does not require a less-than operator: { const CompConfig& cmpCfg = *fp.altCmpConfig; diff --git a/FreeFileSync/Source/structures.h b/FreeFileSync/Source/structures.h index 8f718d15..d7844697 100644 --- a/FreeFileSync/Source/structures.h +++ b/FreeFileSync/Source/structures.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/synchronization.cpp b/FreeFileSync/Source/synchronization.cpp index 8aed5d16..c3abfa25 100644 --- a/FreeFileSync/Source/synchronization.cpp +++ b/FreeFileSync/Source/synchronization.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -26,9 +26,9 @@ #include "lib/versioning.h" #ifdef ZEN_WIN -#include -#include -#include "lib/shadow.h" + #include + #include + #include "lib/shadow.h" #endif using namespace zen; @@ -806,8 +806,8 @@ public: txtCreatingFile (_("Creating file %x" )), txtCreatingLink (_("Creating symbolic link %x" )), txtCreatingFolder (_("Creating folder %x" )), - txtOverwritingFile (_("Overwriting file %x" )), - txtOverwritingLink (_("Overwriting symbolic link %x")), + txtOverwritingFile (_("Updating file %x" )), + txtOverwritingLink (_("Updating symbolic link %x")), txtVerifying (_("Verifying file %x" )), txtWritingAttributes(_("Updating attributes of %x" )), txtMovingFile (_("Moving file %x to %y")) @@ -1922,7 +1922,7 @@ struct ReadWriteCount enum class FolderPairJobType { PROCESS, - WRITE_DB_ONLY, + ALREADY_IN_SYNC, SKIP, }; } @@ -2062,7 +2062,7 @@ void zen::synchronize(const TimeComp& timeStamp, //-> skip creating (not yet existing) base directories in particular if there's no need if (!writeLeft && !writeRight) { - jobType[folderIndex] = folderPairCfg.saveSyncDB_ ? FolderPairJobType::WRITE_DB_ONLY : FolderPairJobType::SKIP; + jobType[folderIndex] = FolderPairJobType::ALREADY_IN_SYNC; continue; } @@ -2289,10 +2289,9 @@ void zen::synchronize(const TimeComp& timeStamp, continue; //------------------------------------------------------------------------------------------ - if (jobType[folderIndex] == FolderPairJobType::PROCESS) - callback.reportInfo(_("Synchronizing folder pair:") + L" [" + getVariantName(folderPairCfg.syncVariant_) + L"]\n" + - L" " + j->getBaseDirPf() + L"\n" + - L" " + j->getBaseDirPf()); + callback.reportInfo(_("Synchronizing folder pair:") + L" [" + getVariantName(folderPairCfg.syncVariant_) + L"]\n" + + L" " + j->getBaseDirPf() + L"\n" + + L" " + j->getBaseDirPf()); //------------------------------------------------------------------------------------------ //checking a second time: (a long time may have passed since the intro checks!) diff --git a/FreeFileSync/Source/synchronization.h b/FreeFileSync/Source/synchronization.h index 6b1cbfdd..bc85f077 100644 --- a/FreeFileSync/Source/synchronization.h +++ b/FreeFileSync/Source/synchronization.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/app_icon.h b/FreeFileSync/Source/ui/app_icon.h index a1240fee..03254f2d 100644 --- a/FreeFileSync/Source/ui/app_icon.h +++ b/FreeFileSync/Source/ui/app_icon.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/batch_config.cpp b/FreeFileSync/Source/ui/batch_config.cpp index 643fde32..d658732a 100644 --- a/FreeFileSync/Source/ui/batch_config.cpp +++ b/FreeFileSync/Source/ui/batch_config.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -15,7 +15,7 @@ #include "../lib/help_provider.h" #ifdef ZEN_WIN -#include + #include #endif using namespace zen; diff --git a/FreeFileSync/Source/ui/batch_config.h b/FreeFileSync/Source/ui/batch_config.h index 6041d848..f7e3a3db 100644 --- a/FreeFileSync/Source/ui/batch_config.h +++ b/FreeFileSync/Source/ui/batch_config.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/batch_status_handler.cpp b/FreeFileSync/Source/ui/batch_status_handler.cpp index 5f021484..84f996e1 100644 --- a/FreeFileSync/Source/ui/batch_status_handler.cpp +++ b/FreeFileSync/Source/ui/batch_status_handler.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -245,7 +245,7 @@ BatchStatusHandler::~BatchStatusHandler() { if (logfilesCountLimit_ > 0) { - try { reportStatus(_("Cleaning up old log files exceeding limit...")); } + try { reportStatus(_("Cleaning up old log files...")); } catch (...) {} limitLogfileCount(beforeLast(logFile->getFilename(), FILE_NAME_SEPARATOR), jobName_, logfilesCountLimit_, [&] { try { requestUiRefresh(); } catch (...) {} }); //throw() } @@ -264,14 +264,14 @@ BatchStatusHandler::~BatchStatusHandler() renameFile(oldLogfilepath, addStatusToLogfilename(oldLogfilepath, _("Error"))); //throw FileError //status "warning" is not important enough to show up in log file name } - catch (FileError&) {} + catch (FileError&) { assert(false); } } //----------------- write results into LastSyncs.log------------------------ try { saveToLastSyncsLog(summary, errorLog, lastSyncsLogFileSizeMax_, OnUpdateLogfileStatusNoThrow(*this, getLastSyncsLogfilePath())); //throw FileError } - catch (FileError&) {} + catch (FileError&) { assert(false); } if (progressDlg) { diff --git a/FreeFileSync/Source/ui/batch_status_handler.h b/FreeFileSync/Source/ui/batch_status_handler.h index 214a367b..71792dcc 100644 --- a/FreeFileSync/Source/ui/batch_status_handler.h +++ b/FreeFileSync/Source/ui/batch_status_handler.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -49,7 +49,7 @@ public: Response reportError (const std::wstring& errorMessage, size_t retryNumber ) override; void reportFatalError(const std::wstring& errorMessage ) override; - void abortProcessNow() override; //throw BatchAbortProcess + void abortProcessNow() override final; //throw BatchAbortProcess private: void onProgressDialogTerminate(); diff --git a/FreeFileSync/Source/ui/check_version.cpp b/FreeFileSync/Source/ui/check_version.cpp index ce80753f..46663954 100644 --- a/FreeFileSync/Source/ui/check_version.cpp +++ b/FreeFileSync/Source/ui/check_version.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -15,12 +15,12 @@ #include #ifdef ZEN_WIN -#include //tame wininet include -#include + #include //tame wininet include + #include #elif defined ZEN_LINUX || defined ZEN_MAC -#include -#include + #include + #include #endif using namespace zen; @@ -51,7 +51,7 @@ std::wstring getUserAgentName() #ifdef ZEN_WIN class InternetConnectionError {}; -class WinInetAccess //using IE proxy settings! :) +class WinInetAccess //1. uses IE proxy settings! :) 2. follows HTTP redirects by default { public: WinInetAccess(const wchar_t* url) //throw InternetConnectionError (if url cannot be reached; no need to also call readBytes()) @@ -143,6 +143,57 @@ OutputIterator readBytesUrl(const wchar_t* url, OutputIterator result) //throw I { return WinInetAccess(url).readBytes(result); //throw InternetConnectionError } + +#else +bool getStringFromUrl(const wxString& server, const wxString& page, int timeout, wxString* output, int level = 0) //true on successful connection +{ + wxHTTP webAccess; + webAccess.SetHeader(L"content-type", L"text/html; charset=utf-8"); + webAccess.SetHeader(L"USER-AGENT", getUserAgentName()); + + webAccess.SetTimeout(timeout); //default: 10 minutes(WTF are these wxWidgets people thinking???)... + + if (webAccess.Connect(server)) //will *not* fail for non-reachable url here! + { + //wxApp::IsMainLoopRunning(); // should return true + + std::unique_ptr httpStream(webAccess.GetInputStream(page)); + //must be deleted BEFORE webAccess is closed + const int rs = webAccess.GetResponse(); + + if (rs == 301 || //http://en.wikipedia.org/wiki/List_of_HTTP_status_codes#3xx_Redirection + rs == 302 || + rs == 303 || + rs == 307) + if (level < 5) //"A user agent should not automatically redirect a request more than five times, since such redirections usually indicate an infinite loop." + { + + wxString newLocation = webAccess.GetHeader(L"Location"); + if (!newLocation.empty()) + { + if (startsWith(newLocation, L"http://")) + newLocation = afterFirst(newLocation, L"http://"); + const wxString serverNew = beforeFirst(newLocation, L"/"); //returns the whole string if term not found + const wxString pageNew = L"/" + afterFirst(newLocation, L"/"); //returns empty string if term not found + + return getStringFromUrl(serverNew, pageNew, timeout, output, level + 1); + } + } + + if (rs == 200) //HTTP_STATUS_OK + if (httpStream && webAccess.GetError() == wxPROTO_NOERR) + { + if (output) + { + output->clear(); + wxStringOutputStream outStream(output); + httpStream->Read(outStream); + } + return true; + } + } + return false; +} #endif @@ -174,39 +225,10 @@ GetVerResult getOnlineVersion(wxString& version) //empty string on error; #elif defined ZEN_LINUX || defined ZEN_MAC wxWindowDisabler dummy; - auto getStringFromUrl = [](const wxString& server, const wxString& page, int timeout, wxString* output) -> bool //true on successful connection - { - wxHTTP webAccess; - webAccess.SetHeader(L"content-type", L"text/html; charset=utf-8"); - webAccess.SetHeader(L"USER-AGENT", getUserAgentName()); - - webAccess.SetTimeout(timeout); //default: 10 minutes(WTF are these wxWidgets people thinking???)... - - if (webAccess.Connect(server)) //will *not* fail for non-reachable url here! - { - //wxApp::IsMainLoopRunning(); // should return true - - std::unique_ptr httpStream(webAccess.GetInputStream(page)); - //must be deleted BEFORE webAccess is closed - - if (httpStream && webAccess.GetError() == wxPROTO_NOERR) - { - if (output) - { - output->clear(); - wxStringOutputStream outStream(output); - httpStream->Read(outStream); - } - return true; - } - } - return false; - }; - - if (getStringFromUrl(L"freefilesync.org", L"/latest_version.txt", 5, &version)) + if (getStringFromUrl(L"www.freefilesync.org", L"/latest_version.txt", 5, &version)) return GET_VER_SUCCESS; - const bool canConnectToSf = getStringFromUrl(L"freefilesync.org", L"/", 1, nullptr); + const bool canConnectToSf = getStringFromUrl(L"www.freefilesync.org", L"/", 1, nullptr); return canConnectToSf ? GET_VER_PAGE_NOT_FOUND : GET_VER_NO_CONNECTION; #endif } @@ -267,7 +289,7 @@ void zen::checkForUpdateNow(wxWindow* parent) case GET_VER_NO_CONNECTION: showNotificationDialog(parent, DialogInfoType::ERROR2, PopupDialogCfg(). setTitle(("Check for Program Updates")). - setMainInstructions(_("Unable to connect to freefilesync.org."))); + setMainInstructions(_("Unable to connect to FreeFileSync.org."))); break; case GET_VER_PAGE_NOT_FOUND: diff --git a/FreeFileSync/Source/ui/check_version.h b/FreeFileSync/Source/ui/check_version.h index d2e7220f..4ffe9726 100644 --- a/FreeFileSync/Source/ui/check_version.h +++ b/FreeFileSync/Source/ui/check_version.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/column_attr.h b/FreeFileSync/Source/ui/column_attr.h index 42dc458d..f7aeb46f 100644 --- a/FreeFileSync/Source/ui/column_attr.h +++ b/FreeFileSync/Source/ui/column_attr.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/custom_grid.cpp b/FreeFileSync/Source/ui/custom_grid.cpp index fdd32ff2..f03659e9 100644 --- a/FreeFileSync/Source/ui/custom_grid.cpp +++ b/FreeFileSync/Source/ui/custom_grid.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/custom_grid.h b/FreeFileSync/Source/ui/custom_grid.h index 02c08a6e..c0c2400c 100644 --- a/FreeFileSync/Source/ui/custom_grid.h +++ b/FreeFileSync/Source/ui/custom_grid.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/dir_name.cpp b/FreeFileSync/Source/ui/dir_name.cpp index 993e7259..438cf7a7 100644 --- a/FreeFileSync/Source/ui/dir_name.cpp +++ b/FreeFileSync/Source/ui/dir_name.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -19,9 +19,9 @@ #include "folder_history_box.h" #ifdef ZEN_WIN -#include -#include -#include "../dll/IFileDialog_Vista\ifile_dialog.h" + #include + #include + #include "../dll/IFileDialog_Vista\ifile_dialog.h" #endif using namespace zen; diff --git a/FreeFileSync/Source/ui/dir_name.h b/FreeFileSync/Source/ui/dir_name.h index a2f69698..4bf9001d 100644 --- a/FreeFileSync/Source/ui/dir_name.h +++ b/FreeFileSync/Source/ui/dir_name.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/folder_history_box.cpp b/FreeFileSync/Source/ui/folder_history_box.cpp index 511686c0..95534a52 100644 --- a/FreeFileSync/Source/ui/folder_history_box.cpp +++ b/FreeFileSync/Source/ui/folder_history_box.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -10,7 +10,7 @@ #include #include "../lib/resolve_path.h" #ifdef ZEN_LINUX -#include + #include #endif using namespace zen; diff --git a/FreeFileSync/Source/ui/folder_history_box.h b/FreeFileSync/Source/ui/folder_history_box.h index 35a03c69..c008f724 100644 --- a/FreeFileSync/Source/ui/folder_history_box.h +++ b/FreeFileSync/Source/ui/folder_history_box.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/folder_history_types.h b/FreeFileSync/Source/ui/folder_history_types.h index 23766413..768bc25c 100644 --- a/FreeFileSync/Source/ui/folder_history_types.h +++ b/FreeFileSync/Source/ui/folder_history_types.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/folder_pair.h b/FreeFileSync/Source/ui/folder_pair.h index e48b1e87..5c544edf 100644 --- a/FreeFileSync/Source/ui/folder_pair.h +++ b/FreeFileSync/Source/ui/folder_pair.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/grid_view.cpp b/FreeFileSync/Source/ui/grid_view.cpp index 007c8040..491808cb 100644 --- a/FreeFileSync/Source/ui/grid_view.cpp +++ b/FreeFileSync/Source/ui/grid_view.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/grid_view.h b/FreeFileSync/Source/ui/grid_view.h index 9250e674..3ee2f642 100644 --- a/FreeFileSync/Source/ui/grid_view.h +++ b/FreeFileSync/Source/ui/grid_view.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/gui_generated.cpp index 2bdd6aca..5a3e3615 100644 --- a/FreeFileSync/Source/ui/gui_generated.cpp +++ b/FreeFileSync/Source/ui/gui_generated.cpp @@ -29,6 +29,8 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const m_menuItemLoad = new wxMenuItem( m_menuFile, wxID_OPEN, wxString( _("&Open...") ) + wxT('\t') + wxT("Ctrl+O"), wxEmptyString, wxITEM_NORMAL ); m_menuFile->Append( m_menuItemLoad ); + m_menuFile->AppendSeparator(); + m_menuItemSave = new wxMenuItem( m_menuFile, wxID_SAVE, wxString( _("&Save") ) + wxT('\t') + wxT("Ctrl+S"), wxEmptyString, wxITEM_NORMAL ); m_menuFile->Append( m_menuItemSave ); @@ -40,20 +42,34 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const m_menuFile->AppendSeparator(); - m_menuItemCompare = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("Start &comparison") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL ); - m_menuFile->Append( m_menuItemCompare ); - - m_menuItemSynchronize = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("Start &synchronization") ) + wxT('\t') + wxT("F9"), wxEmptyString, wxITEM_NORMAL ); - m_menuFile->Append( m_menuItemSynchronize ); - - m_menuFile->AppendSeparator(); - wxMenuItem* m_menuItem4; - m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("&Quit") ) , wxEmptyString, wxITEM_NORMAL ); + m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ) , wxEmptyString, wxITEM_NORMAL ); m_menuFile->Append( m_menuItem4 ); m_menubar1->Append( m_menuFile, _("&File") ); + m_menu4 = new wxMenu(); + m_menuItemCompare = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Start &comparison") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL ); + m_menu4->Append( m_menuItemCompare ); + + m_menu4->AppendSeparator(); + + m_menuItemCompSettings = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("C&omparison settings") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL ); + m_menu4->Append( m_menuItemCompSettings ); + + m_menuItemFilter = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("&Filter settings") ) + wxT('\t') + wxT("F7"), wxEmptyString, wxITEM_NORMAL ); + m_menu4->Append( m_menuItemFilter ); + + m_menuItemSyncSettings = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("S&ynchronization settings") ) + wxT('\t') + wxT("F8"), wxEmptyString, wxITEM_NORMAL ); + m_menu4->Append( m_menuItemSyncSettings ); + + m_menu4->AppendSeparator(); + + m_menuItemSynchronize = new wxMenuItem( m_menu4, wxID_ANY, wxString( _("Start &synchronization") ) + wxT('\t') + wxT("F9"), wxEmptyString, wxITEM_NORMAL ); + m_menu4->Append( m_menuItemSynchronize ); + + m_menubar1->Append( m_menu4, _("&Actions") ); + m_menuTools = new wxMenu(); m_menuItemOptions = new wxMenuItem( m_menuTools, wxID_PREFERENCES, wxString( _("&Options") ) , wxEmptyString, wxITEM_NORMAL ); m_menuTools->Append( m_menuItemOptions ); @@ -727,7 +743,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const bSizer172 = new wxBoxSizer( wxVERTICAL ); m_bitmapUpdateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be overwritten") ); + m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be updated") ); bSizer172->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); @@ -739,7 +755,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextUpdateLeft->Wrap( -1 ); - m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be overwritten") ); + m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be updated") ); bSizer172->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); @@ -830,7 +846,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const bSizer177 = new wxBoxSizer( wxVERTICAL ); m_bitmapUpdateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - m_bitmapUpdateRight->SetToolTip( _("Number of files that will be overwritten") ); + m_bitmapUpdateRight->SetToolTip( _("Number of files that will be updated") ); bSizer177->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); @@ -842,7 +858,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextUpdateRight->Wrap( -1 ); - m_staticTextUpdateRight->SetToolTip( _("Number of files that will be overwritten") ); + m_staticTextUpdateRight->SetToolTip( _("Number of files that will be updated") ); bSizer177->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); @@ -901,9 +917,12 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const this->Connect( m_menuItemSave->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ) ); this->Connect( m_menuItemSaveAs->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSaveAs ) ); this->Connect( m_menuItemSaveAsBatch->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ) ); + this->Connect( m_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) ); this->Connect( m_menuItemCompare->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) ); + this->Connect( m_menuItemCompSettings->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ) ); + this->Connect( m_menuItemFilter->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ) ); + this->Connect( m_menuItemSyncSettings->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ) ); this->Connect( m_menuItemSynchronize->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) ); - this->Connect( m_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) ); this->Connect( m_menuItemOptions->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuOptions ) ); this->Connect( m_menuItem15->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuFindItem ) ); this->Connect( m_menuItem51->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuResetLayout ) ); @@ -930,7 +949,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const m_bpButtonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ), NULL, this ); m_bpButtonSaveAs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigSaveAs ), NULL, this ); m_bpButtonSaveAsBatch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ), NULL, this ); - m_listBoxHistory->Connect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this ); + m_listBoxHistory->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this ); m_listBoxHistory->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this ); m_listBoxHistory->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistoryDoubleClick ), NULL, this ); m_listBoxHistory->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCfgHistoryRightClick ), NULL, this ); @@ -1087,20 +1106,27 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w wxBoxSizer* bSizer1721; bSizer1721 = new wxBoxSizer( wxVERTICAL ); - m_staticText92 = new wxStaticText( m_panelComparisonSettings, wxID_ANY, _("Symbolic links:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText92->Wrap( -1 ); - bSizer1721->Add( m_staticText92, 0, wxBOTTOM, 5 ); + m_checkBoxSymlinksInclude = new wxCheckBox( m_panelComparisonSettings, wxID_ANY, _("Include symbolic links:"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer1721->Add( m_checkBoxSymlinksInclude, 0, wxALL, 5 ); + + wxBoxSizer* bSizer176; + bSizer176 = new wxBoxSizer( wxVERTICAL ); + + m_radioBtnSymlinksDirect = new wxRadioButton( m_panelComparisonSettings, wxID_ANY, _("Direct"), wxDefaultPosition, wxDefaultSize, 0 ); + m_radioBtnSymlinksDirect->SetValue( true ); + bSizer176->Add( m_radioBtnSymlinksDirect, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_radioBtnSymlinksFollow = new wxRadioButton( m_panelComparisonSettings, wxID_ANY, _("Follow"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer176->Add( m_radioBtnSymlinksFollow, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + - wxArrayString m_choiceHandleSymlinksChoices; - m_choiceHandleSymlinks = new wxChoice( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleSymlinksChoices, 0 ); - m_choiceHandleSymlinks->SetSelection( 0 ); - bSizer1721->Add( m_choiceHandleSymlinks, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + bSizer1721->Add( bSizer176, 0, wxEXPAND|wxLEFT, 18 ); m_hyperlink24 = new wxHyperlinkCtrl( m_panelComparisonSettings, wxID_ANY, _("More information"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); - bSizer1721->Add( m_hyperlink24, 0, wxTOP, 5 ); + bSizer1721->Add( m_hyperlink24, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - bSizer1734->Add( bSizer1721, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10 ); + bSizer1734->Add( bSizer1721, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_staticline441 = new wxStaticLine( m_panelComparisonSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); bSizer1734->Add( m_staticline441, 0, wxEXPAND, 5 ); @@ -1121,7 +1147,7 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w m_panelCompSettingsHolder->SetSizer( bSizer275 ); m_panelCompSettingsHolder->Layout(); bSizer275->Fit( m_panelCompSettingsHolder ); - m_notebook->AddPage( m_panelCompSettingsHolder, _("dummy"), false ); + m_notebook->AddPage( m_panelCompSettingsHolder, _("dummy"), true ); m_panelFilterSettingsHolder = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelFilterSettingsHolder->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); @@ -1707,7 +1733,7 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w m_panelSyncSettingsHolder->SetSizer( bSizer276 ); m_panelSyncSettingsHolder->Layout(); bSizer276->Fit( m_panelSyncSettingsHolder ); - m_notebook->AddPage( m_panelSyncSettingsHolder, _("dummy"), true ); + m_notebook->AddPage( m_panelSyncSettingsHolder, _("dummy"), false ); bSizer7->Add( m_notebook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -1741,6 +1767,7 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w m_toggleBtnContent->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnContent ), NULL, this ); m_checkBoxTimeShift->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeCompOption ), NULL, this ); m_hyperlink241->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpTimeShift ), NULL, this ); + m_checkBoxSymlinksInclude->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeCompOption ), NULL, this ); m_hyperlink24->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpComparisonSettings ), NULL, this ); m_textCtrlInclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this ); m_hyperlink171->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( ConfigDlgGenerated::OnHelpShowExamples ), NULL, this ); @@ -1865,7 +1892,7 @@ SyncConfirmationDlgGenerated::SyncConfirmationDlgGenerated( wxWindow* parent, wx fgSizer11->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); m_bitmapUpdateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be overwritten") ); + m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be updated") ); fgSizer11->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); @@ -1885,7 +1912,7 @@ SyncConfirmationDlgGenerated::SyncConfirmationDlgGenerated( wxWindow* parent, wx fgSizer11->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); m_bitmapUpdateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - m_bitmapUpdateRight->SetToolTip( _("Number of files that will be overwritten") ); + m_bitmapUpdateRight->SetToolTip( _("Number of files that will be updated") ); fgSizer11->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); @@ -1902,7 +1929,7 @@ SyncConfirmationDlgGenerated::SyncConfirmationDlgGenerated( wxWindow* parent, wx m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextUpdateLeft->Wrap( -1 ); - m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be overwritten") ); + m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be updated") ); fgSizer11->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); @@ -1926,7 +1953,7 @@ SyncConfirmationDlgGenerated::SyncConfirmationDlgGenerated( wxWindow* parent, wx m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextUpdateRight->Wrap( -1 ); - m_staticTextUpdateRight->SetToolTip( _("Number of files that will be overwritten") ); + m_staticTextUpdateRight->SetToolTip( _("Number of files that will be updated") ); fgSizer11->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); @@ -3223,9 +3250,9 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS wxBoxSizer* bSizer171; bSizer171 = new wxBoxSizer( wxHORIZONTAL ); - m_hyperlink11 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("MS Visual C++"), wxT("http://msdn.microsoft.com/library/60k1461a.aspx"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); + m_hyperlink11 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("MS Visual C++"), wxT("http://www.visualstudio.com"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_hyperlink11->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); - m_hyperlink11->SetToolTip( _("http://msdn.microsoft.com/library/60k1461a.aspx") ); + m_hyperlink11->SetToolTip( _("http://www.visualstudio.com") ); bSizer171->Add( m_hyperlink11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); @@ -3365,7 +3392,7 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS bSizer166->Add( m_bitmap9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - m_hyperlink1 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("freefilesync.org"), wxT("http://www.freefilesync.org/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); + m_hyperlink1 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("FreeFileSync.org"), wxT("http://www.freefilesync.org/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_hyperlink1->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, true, wxEmptyString ) ); m_hyperlink1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); @@ -3410,7 +3437,7 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS m_bitmap13 = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 ); bSizer1671->Add( m_bitmap13, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - m_hyperlink5 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("http://www.gnu.org/licenses/gpl.html"), wxT("http://www.gnu.org/licenses/gpl.html"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); + m_hyperlink5 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("http://www.gnu.org/licenses/gpl-3.0"), wxT("http://www.gnu.org/licenses/gpl-3.0"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_hyperlink5->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); bSizer1671->Add( m_hyperlink5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); diff --git a/FreeFileSync/Source/ui/gui_generated.h b/FreeFileSync/Source/ui/gui_generated.h index dc3dd4c7..3fab5c81 100644 --- a/FreeFileSync/Source/ui/gui_generated.h +++ b/FreeFileSync/Source/ui/gui_generated.h @@ -44,6 +44,7 @@ namespace zen { class TripleSplitter; } #include #include #include +#include #include #include #include @@ -72,7 +73,11 @@ protected: wxMenuItem* m_menuItemSave; wxMenuItem* m_menuItemSaveAs; wxMenuItem* m_menuItemSaveAsBatch; + wxMenu* m_menu4; wxMenuItem* m_menuItemCompare; + wxMenuItem* m_menuItemCompSettings; + wxMenuItem* m_menuItemFilter; + wxMenuItem* m_menuItemSyncSettings; wxMenuItem* m_menuItemSynchronize; wxMenu* m_menuTools; wxMenuItem* m_menuItemOptions; @@ -192,9 +197,12 @@ protected: virtual void OnConfigSave( wxCommandEvent& event ) { event.Skip(); } virtual void OnConfigSaveAs( wxCommandEvent& event ) { event.Skip(); } virtual void OnSaveAsBatchJob( wxCommandEvent& event ) { event.Skip(); } + virtual void OnMenuQuit( wxCommandEvent& event ) { event.Skip(); } virtual void OnCompare( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); } + virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); } + virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); } virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); } - virtual void OnMenuQuit( wxCommandEvent& event ) { event.Skip(); } virtual void OnMenuOptions( wxCommandEvent& event ) { event.Skip(); } virtual void OnMenuFindItem( wxCommandEvent& event ) { event.Skip(); } virtual void OnMenuResetLayout( wxCommandEvent& event ) { event.Skip(); } @@ -203,11 +211,8 @@ protected: virtual void OnMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); } virtual void OnMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); } virtual void OnMenuAbout( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); } virtual void OnCompSettingsContext( wxMouseEvent& event ) { event.Skip(); } - virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); } virtual void OnGlobalFilterContext( wxMouseEvent& event ) { event.Skip(); } - virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); } virtual void OnSyncSettingsContext( wxMouseEvent& event ) { event.Skip(); } virtual void OnAddFolderPair( wxCommandEvent& event ) { event.Skip(); } virtual void OnRemoveTopFolderPair( wxCommandEvent& event ) { event.Skip(); } @@ -267,8 +272,9 @@ protected: wxSpinCtrl* m_spinCtrlTimeShift; wxHyperlinkCtrl* m_hyperlink241; wxStaticLine* m_staticline44; - wxStaticText* m_staticText92; - wxChoice* m_choiceHandleSymlinks; + wxCheckBox* m_checkBoxSymlinksInclude; + wxRadioButton* m_radioBtnSymlinksDirect; + wxRadioButton* m_radioBtnSymlinksFollow; wxHyperlinkCtrl* m_hyperlink24; wxStaticLine* m_staticline441; wxStaticLine* m_staticline331; diff --git a/FreeFileSync/Source/ui/gui_status_handler.cpp b/FreeFileSync/Source/ui/gui_status_handler.cpp index f9f63fa6..ece926a3 100644 --- a/FreeFileSync/Source/ui/gui_status_handler.cpp +++ b/FreeFileSync/Source/ui/gui_status_handler.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -323,7 +323,7 @@ SyncStatusHandler::~SyncStatusHandler() { saveToLastSyncsLog(summary, errorLog, lastSyncsLogFileSizeMax_, OnUpdateLogfileStatusNoThrow(*this, getLastSyncsLogfilePath())); //throw FileError } - catch (FileError&) {} + catch (FileError&) { assert(false); } if (progressDlg) { diff --git a/FreeFileSync/Source/ui/gui_status_handler.h b/FreeFileSync/Source/ui/gui_status_handler.h index 7f58afb8..803c8fdb 100644 --- a/FreeFileSync/Source/ui/gui_status_handler.h +++ b/FreeFileSync/Source/ui/gui_status_handler.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -34,7 +34,7 @@ public: void reportFatalError(const std::wstring& errorMessage) override; void reportWarning (const std::wstring& warningMessage, bool& warningActive) override; - void abortProcessNow() override; //throw GuiAbortProcess + void abortProcessNow() override final; //throw GuiAbortProcess private: void OnKeyPressed(wxKeyEvent& event); @@ -68,7 +68,7 @@ public: void reportFatalError(const std::wstring& errorMessage ) override; void reportWarning (const std::wstring& warningMessage, bool& warningActive) override; - void abortProcessNow() override; //throw GuiAbortProcess + void abortProcessNow() override final; //throw GuiAbortProcess private: void onProgressDialogTerminate(); diff --git a/FreeFileSync/Source/ui/main_dlg.cpp b/FreeFileSync/Source/ui/main_dlg.cpp index 918da099..57470db7 100644 --- a/FreeFileSync/Source/ui/main_dlg.cpp +++ b/FreeFileSync/Source/ui/main_dlg.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include "check_version.h" @@ -45,10 +44,10 @@ #include "../lib/localization.h" #ifdef ZEN_WIN -#include + #include #elif defined ZEN_MAC -#include + #include #endif using namespace zen; @@ -79,6 +78,16 @@ IconBuffer::IconSize convert(xmlAccess::FileIconSize isize) } return IconBuffer::SIZE_SMALL; } + +//pretty much the same like "bool wxWindowBase::IsDescendant(wxWindowBase* child) const" but without the obvious misnomer +inline +bool isComponentOf(const wxWindow* child, const wxWindow* top) +{ + for (const wxWindow* wnd = child; wnd != nullptr; wnd = wnd->GetParent()) + if (wnd == top) + return true; + return false; +} } @@ -609,15 +618,15 @@ MainDialog::MainDialog(const Zstring& globalConfigFile, //set tool tips with (non-translated!) short cut hint m_bpButtonNew ->SetToolTip(replaceCpy(_("&New"), L"&", L"") + L" (Ctrl+N)"); // - m_bpButtonOpen ->SetToolTip(replaceCpy(_("&Open..."), L"&", L"") + L" (Ctrl+O)"); //reuse texts from gui builder - m_bpButtonSave ->SetToolTip(replaceCpy(_("&Save"), L"&", L"") + L" (Ctrl+S)"); // + m_bpButtonOpen ->SetToolTip(replaceCpy(_("&Open..."), L"&", L"") + L" (Ctrl+O)"); // + m_bpButtonSave ->SetToolTip(replaceCpy(_("&Save"), L"&", L"") + L" (Ctrl+S)"); //reuse texts from gui builder m_bpButtonSaveAs ->SetToolTip(replaceCpy(_("Save &as..."), L"&", L"")); // m_bpButtonSaveAsBatch->SetToolTip(replaceCpy(_("Save as &batch job..."), L"&", L"")); // - m_buttonCompare ->SetToolTip(_("Start comparison") + L" (F5)"); - m_bpButtonCmpConfig ->SetToolTip(_("Comparison settings") + L" (F6)"); - m_bpButtonSyncConfig->SetToolTip(_("Synchronization settings") + L" (F8)"); - m_buttonSync ->SetToolTip(_("Start synchronization") + L" (F9)"); + m_buttonCompare ->SetToolTip(replaceCpy(_("Start &comparison"), L"&", L"") + L" (F5)"); // + m_bpButtonCmpConfig ->SetToolTip(replaceCpy(_("C&omparison settings"), L"&", L"") + L" (F6)"); // + m_bpButtonSyncConfig->SetToolTip(replaceCpy(_("S&ynchronization settings"), L"&", L"") + L" (F8)"); // + m_buttonSync ->SetToolTip(replaceCpy(_("Start &synchronization"), L"&", L"") + L" (F9)"); // gridDataView = std::make_shared(); treeDataView = std::make_shared(); @@ -644,8 +653,11 @@ MainDialog::MainDialog(const Zstring& globalConfigFile, setMenuItemImage(m_menuItemLoad, getResourceImage(L"load_small")); setMenuItemImage(m_menuItemSave, getResourceImage(L"save_small")); - setMenuItemImage(m_menuItemCompare, getResourceImage(L"compare_small")); - setMenuItemImage(m_menuItemSynchronize, getResourceImage(L"sync_small")); + setMenuItemImage(m_menuItemCompare, getResourceImage(L"compare_small")); + setMenuItemImage(m_menuItemCompSettings, getResourceImage(L"cfg_compare_small")); + setMenuItemImage(m_menuItemFilter, getResourceImage(L"filter_small")); + setMenuItemImage(m_menuItemSyncSettings, getResourceImage(L"cfg_sync_small")); + setMenuItemImage(m_menuItemSynchronize, getResourceImage(L"sync_small")); setMenuItemImage(m_menuItemOptions, getResourceImage(L"settings_small")); setMenuItemImage(m_menuItemSaveAsBatch, getResourceImage(L"batch_small")); @@ -704,7 +716,7 @@ MainDialog::MainDialog(const Zstring& globalConfigFile, m_gridNavi->getMainWin().Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(MainDialog::onTreeButtonEvent), nullptr, this); //enable dialog-specific key local events - setupLocalKeyEvents(*this, [this](wxKeyEvent& event) { this->onLocalKeyEvent(event); }); + Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(MainDialog::onLocalKeyEvent), nullptr, this); //drag & drop on navi panel setupFileDrop(*m_gridNavi); @@ -742,6 +754,16 @@ MainDialog::MainDialog(const Zstring& globalConfigFile, wxCommandEvent evtDummy; //call once before OnLayoutWindowAsync() OnResizeLeftFolderWidth(evtDummy); // + //scroll list box to show the new selection (after window resizing is hopefully complete) + for (int i = 0; i < static_cast(m_listBoxHistory->GetCount()); ++i) + if (m_listBoxHistory->IsSelected(i)) + { + m_listBoxHistory->SetFirstItem(std::max(0, i - 2)); //add some head room + break; + //can't use wxListBox::EnsureVisible(): it's an empty stub on Windows! Undocumented! Not even a runtime-error! + //=> yet another piece of "high-quality" code from wxWidgets making a dev's life "easy"... + } + //---------------------------------------------------------------------------------------------------------------------------------------------------------------- //some convenience: if FFS is started with a *.ffs_gui file as commandline parameter AND all directories contained exist, comparison shall be started right away if (startComparison) @@ -1705,11 +1727,7 @@ void MainDialog::onTreeButtonEvent(wxKeyEvent& event) { case 'C': case WXK_INSERT: //CTRL + C || CTRL + INS - { - std::vector gridRefs; - gridRefs.push_back(m_gridNavi); - copySelectionToClipboard(gridRefs); - } + copySelectionToClipboard({ m_gridNavi }); return; } else if (event.AltDown()) @@ -1790,12 +1808,7 @@ void MainDialog::onGridButtonEvent(wxKeyEvent& event, Grid& grid, bool leftSide) { case 'C': case WXK_INSERT: //CTRL + C || CTRL + INS - { - std::vector gridRefs; - gridRefs.push_back(m_gridMainL); - gridRefs.push_back(m_gridMainR); - copySelectionToClipboard(gridRefs); - } + copySelectionToClipboard({ m_gridMainL, m_gridMainR} ); return; // -> swallow event! don't allow default grid commands! } @@ -1857,6 +1870,9 @@ void MainDialog::onLocalKeyEvent(wxKeyEvent& event) //process key events without event.Skip(); return; } + localKeyEventsEnabled = false; //avoid recursion + ZEN_ON_SCOPE_EXIT(localKeyEventsEnabled = true;) + const int keyCode = event.GetKeyCode(); @@ -1876,29 +1892,29 @@ void MainDialog::onLocalKeyEvent(wxKeyEvent& event) //process key events without startFindNext(); return; //-> swallow event! - case WXK_F6: - { - wxCommandEvent dummy2(wxEVT_COMMAND_BUTTON_CLICKED); //simulate button click - if (wxEvtHandler* evtHandler = m_bpButtonCmpConfig->GetEventHandler()) - evtHandler->ProcessEvent(dummy2); //synchronous call - } - return; //-> swallow event! - - case WXK_F7: - { - wxCommandEvent dummy2(wxEVT_COMMAND_BUTTON_CLICKED); //simulate button click - if (wxEvtHandler* evtHandler = m_bpButtonFilter->GetEventHandler()) - evtHandler->ProcessEvent(dummy2); //synchronous call - } - return; //-> swallow event! - - case WXK_F8: - { - wxCommandEvent dummy2(wxEVT_COMMAND_BUTTON_CLICKED); //simulate button click - if (wxEvtHandler* evtHandler = m_bpButtonSyncConfig->GetEventHandler()) - evtHandler->ProcessEvent(dummy2); //synchronous call - } - return; //-> swallow event! + //case WXK_F6: + //{ + // wxCommandEvent dummy2(wxEVT_COMMAND_BUTTON_CLICKED); //simulate button click + // if (wxEvtHandler* evtHandler = m_bpButtonCmpConfig->GetEventHandler()) + // evtHandler->ProcessEvent(dummy2); //synchronous call + //} + //return; //-> swallow event! + + //case WXK_F7: + //{ + // wxCommandEvent dummy2(wxEVT_COMMAND_BUTTON_CLICKED); //simulate button click + // if (wxEvtHandler* evtHandler = m_bpButtonFilter->GetEventHandler()) + // evtHandler->ProcessEvent(dummy2); //synchronous call + //} + //return; //-> swallow event! + + //case WXK_F8: + //{ + // wxCommandEvent dummy2(wxEVT_COMMAND_BUTTON_CLICKED); //simulate button click + // if (wxEvtHandler* evtHandler = m_bpButtonSyncConfig->GetEventHandler()) + // evtHandler->ProcessEvent(dummy2); //synchronous call + //} + //return; //-> swallow event! case WXK_F10: setViewTypeSyncAction(!m_bpButtonViewTypeSyncAction->isActive()); @@ -1939,7 +1955,7 @@ void MainDialog::onLocalKeyEvent(wxKeyEvent& event) //process key events without m_gridMainL->SetFocus(); event.SetEventType(wxEVT_KEY_DOWN); //the grid event handler doesn't expect wxEVT_CHAR_HOOK! - evtHandler->ProcessEvent(event); //propagating event catched at wxTheApp to child leads to recursion, but code in key_event.h prevents it... + evtHandler->ProcessEvent(event); //propagating event to child lead to recursion with old key_event.h handling => still an issue? event.Skip(false); //definitively handled now! return; } @@ -3111,7 +3127,8 @@ void MainDialog::OnCfgHistoryRightClick(wxMouseEvent& event) void MainDialog::OnCfgHistoryKeyEvent(wxKeyEvent& event) { const int keyCode = event.GetKeyCode(); - if (keyCode == WXK_DELETE || keyCode == WXK_NUMPAD_DELETE) + if (keyCode == WXK_DELETE || + keyCode == WXK_NUMPAD_DELETE) { deleteSelectedCfgHistoryItems(); return; //"swallow" event @@ -3414,8 +3431,8 @@ void MainDialog::initViewFilterButtons() initButton(*m_bpButtonShowCreateRight, "so_create_right", _("Show files that will be created on the right side")); initButton(*m_bpButtonShowDeleteLeft, "so_delete_left", _("Show files that will be deleted on the left side")); initButton(*m_bpButtonShowDeleteRight, "so_delete_right", _("Show files that will be deleted on the right side")); - initButton(*m_bpButtonShowUpdateLeft, "so_update_left", _("Show files that will be overwritten on left side")); - initButton(*m_bpButtonShowUpdateRight, "so_update_right", _("Show files that will be overwritten on right side")); + initButton(*m_bpButtonShowUpdateLeft, "so_update_left", _("Show files that will be updated on the left side")); + initButton(*m_bpButtonShowUpdateRight, "so_update_right", _("Show files that will be updated on the right side")); initButton(*m_bpButtonShowDoNothing, "so_none", _("Show files that won't be copied")); initButton(*m_bpButtonShowExcluded, "checkboxFalse", _("Show filtered or temporarily excluded files")); diff --git a/FreeFileSync/Source/ui/main_dlg.h b/FreeFileSync/Source/ui/main_dlg.h index 689bd528..943c76b7 100644 --- a/FreeFileSync/Source/ui/main_dlg.h +++ b/FreeFileSync/Source/ui/main_dlg.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/on_completion_box.cpp b/FreeFileSync/Source/ui/on_completion_box.cpp index 274d0a30..b489a051 100644 --- a/FreeFileSync/Source/ui/on_completion_box.cpp +++ b/FreeFileSync/Source/ui/on_completion_box.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -11,7 +11,7 @@ #include #include #ifdef ZEN_WIN -#include + #include #endif using namespace zen; diff --git a/FreeFileSync/Source/ui/on_completion_box.h b/FreeFileSync/Source/ui/on_completion_box.h index 1e05a14f..5085735b 100644 --- a/FreeFileSync/Source/ui/on_completion_box.h +++ b/FreeFileSync/Source/ui/on_completion_box.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/progress_indicator.cpp b/FreeFileSync/Source/ui/progress_indicator.cpp index 123e2649..e3595ccd 100644 --- a/FreeFileSync/Source/ui/progress_indicator.cpp +++ b/FreeFileSync/Source/ui/progress_indicator.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include "gui_generated.h" @@ -37,10 +36,10 @@ #include "app_icon.h" #ifdef ZEN_WIN -#include + #include #elif defined ZEN_MAC -#include + #include #endif using namespace zen; @@ -352,6 +351,17 @@ void CompareProgressDialog::updateStatusPanelNow() namespace { +//pretty much the same like "bool wxWindowBase::IsDescendant(wxWindowBase* child) const" but without the obvious misnomer +inline +bool isComponentOf(const wxWindow* child, const wxWindow* top) +{ + for (const wxWindow* wnd = child; wnd != nullptr; wnd = wnd->GetParent()) + if (wnd == top) + return true; + return false; +} + + inline wxBitmap getImageButtonPressed(const wchar_t* name) { @@ -635,7 +645,7 @@ class LogPanel : public LogPanelGenerated { public: LogPanel(wxWindow* parent, const ErrorLog& log) : LogPanelGenerated(parent), - msgView(std::make_shared(log)) + msgView(std::make_shared(log)), processingKeyEventHandler(false) { const int errorCount = log.getItemCount(TYPE_ERROR | TYPE_FATAL_ERROR); const int warningCount = log.getItemCount(TYPE_WARNING); @@ -676,7 +686,7 @@ public: m_gridMessages->Connect(EVENT_GRID_MOUSE_RIGHT_UP, GridClickEventHandler(LogPanel::onMsgGridContext), nullptr, this); //enable dialog-specific key local events - setupLocalKeyEvents(*this, [this](wxKeyEvent& event) { this->onLocalKeyEvent(event); }); + Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(LogPanel::onLocalKeyEvent), nullptr, this); updateGrid(); } @@ -763,6 +773,15 @@ private: void onLocalKeyEvent(wxKeyEvent& event) //process key events without explicit menu entry :) { + if (processingKeyEventHandler) //avoid recursion + { + event.Skip(); + return; + } + processingKeyEventHandler = true; + ZEN_ON_SCOPE_EXIT(processingKeyEventHandler = false;) + + const int keyCode = event.GetKeyCode(); if (event.ControlDown()) @@ -853,6 +872,7 @@ private: } std::shared_ptr msgView; //bound! + bool processingKeyEventHandler; }; //######################################################################################## diff --git a/FreeFileSync/Source/ui/progress_indicator.h b/FreeFileSync/Source/ui/progress_indicator.h index c04f5a50..d86ef14d 100644 --- a/FreeFileSync/Source/ui/progress_indicator.h +++ b/FreeFileSync/Source/ui/progress_indicator.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/search.cpp b/FreeFileSync/Source/ui/search.cpp index 416d2c9e..bdba7e41 100644 --- a/FreeFileSync/Source/ui/search.cpp +++ b/FreeFileSync/Source/ui/search.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/search.h b/FreeFileSync/Source/ui/search.h index 1adf3d01..5cd94edc 100644 --- a/FreeFileSync/Source/ui/search.h +++ b/FreeFileSync/Source/ui/search.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp index b142e8d8..0d98aac3 100644 --- a/FreeFileSync/Source/ui/small_dlgs.cpp +++ b/FreeFileSync/Source/ui/small_dlgs.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -28,7 +28,7 @@ #include "../version/version.h" #ifdef ZEN_WIN -#include + #include #endif using namespace zen; diff --git a/FreeFileSync/Source/ui/small_dlgs.h b/FreeFileSync/Source/ui/small_dlgs.h index 7b488e57..331c500c 100644 --- a/FreeFileSync/Source/ui/small_dlgs.h +++ b/FreeFileSync/Source/ui/small_dlgs.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/sorting.h b/FreeFileSync/Source/ui/sorting.h index d022aeb7..7fb3065f 100644 --- a/FreeFileSync/Source/ui/sorting.h +++ b/FreeFileSync/Source/ui/sorting.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/switch_to_gui.h b/FreeFileSync/Source/ui/switch_to_gui.h index 7f2d4002..6684e8d9 100644 --- a/FreeFileSync/Source/ui/switch_to_gui.h +++ b/FreeFileSync/Source/ui/switch_to_gui.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/sync_cfg.cpp b/FreeFileSync/Source/ui/sync_cfg.cpp index 88424ccb..fb758aaa 100644 --- a/FreeFileSync/Source/ui/sync_cfg.cpp +++ b/FreeFileSync/Source/ui/sync_cfg.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -14,7 +14,6 @@ #include #include #include -#include #include #include "gui_generated.h" #include "on_completion_box.h" @@ -24,7 +23,7 @@ #include "../lib/norm_filter.h" #ifdef ZEN_WIN -#include + #include #endif using namespace zen; @@ -80,7 +79,6 @@ private: CompConfig& cmpCfgOut; //for output only bool* useAlternateCmpCfgOptOut; CompareVariant localCmpVar; - EnumDescrList enumDescrHandleSyml; //------------- filter panel -------------------------- void OnHelpShowExamples(wxHyperlinkEvent& event) override { displayHelpEntry(L"html/Exclude Items.html", this); } @@ -245,12 +243,20 @@ ConfigDialog::ConfigDialog(wxWindow* parent, m_toggleBtnTimeSize->SetToolTip(getCompVariantDescription(CMP_BY_TIME_SIZE)); m_toggleBtnContent ->SetToolTip(getCompVariantDescription(CMP_BY_CONTENT)); - enumDescrHandleSyml. - add(SYMLINK_EXCLUDE, _("Exclude")). - add(SYMLINK_DIRECT, _("Direct")). - add(SYMLINK_FOLLOW, _("Follow")); - - setEnumVal(enumDescrHandleSyml, *m_choiceHandleSymlinks, cmpCfg.handleSymlinks); + switch (cmpCfg.handleSymlinks) + { + case SYMLINK_EXCLUDE: + m_checkBoxSymlinksInclude->SetValue(false); + break; + case SYMLINK_DIRECT: + m_checkBoxSymlinksInclude->SetValue(true); + m_radioBtnSymlinksDirect->SetValue(true); + break; + case SYMLINK_FOLLOW: + m_checkBoxSymlinksInclude->SetValue(true); + m_radioBtnSymlinksFollow->SetValue(true); + break; + } m_checkBoxTimeShift->SetValue(cmpCfg.optTimeShiftHours != 0); m_spinCtrlTimeShift->SetValue(cmpCfg.optTimeShiftHours == 0 ? 1 : cmpCfg.optTimeShiftHours); @@ -354,7 +360,7 @@ ConfigDialog::ConfigDialog(wxWindow* parent, //----------------------------------------------------- //enable dialog-specific key local events - setupLocalKeyEvents(*this, [this](wxKeyEvent& event) { this->onLocalKeyEvent(event); }); + Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(ConfigDialog::onLocalKeyEvent), nullptr, this); m_notebook->SetPageText(static_cast(SyncConfigPanel::COMPARISON), _("Comparison") + L" (F6)"); m_notebook->SetPageText(static_cast(SyncConfigPanel::FILTER ), _("Filter") + L" (F7)"); @@ -442,6 +448,9 @@ void ConfigDialog::updateCompGui() setText(*m_textCtrlCompVarDescription, L"\n" + getCompVariantDescription(localCmpVar)); m_spinCtrlTimeShift->Enable(m_checkBoxTimeShift->GetValue()); + + m_radioBtnSymlinksDirect->Enable(m_checkBoxSymlinksInclude->GetValue()); + m_radioBtnSymlinksFollow->Enable(m_checkBoxSymlinksInclude->GetValue()); } @@ -916,7 +925,7 @@ void ConfigDialog::OnOkay(wxCommandEvent& event) *useAlternateCmpCfgOptOut = m_checkBoxUseLocalCmpOptions->GetValue(); cmpCfgOut.compareVar = localCmpVar; - cmpCfgOut.handleSymlinks = getEnumVal(enumDescrHandleSyml, *m_choiceHandleSymlinks); + cmpCfgOut.handleSymlinks = !m_checkBoxSymlinksInclude->GetValue() ? SYMLINK_EXCLUDE : m_radioBtnSymlinksDirect->GetValue() ? SYMLINK_DIRECT : SYMLINK_FOLLOW; cmpCfgOut.optTimeShiftHours = m_checkBoxTimeShift->GetValue() ? m_spinCtrlTimeShift->GetValue() : 0; //------------- filter panel -------------------------- diff --git a/FreeFileSync/Source/ui/sync_cfg.h b/FreeFileSync/Source/ui/sync_cfg.h index 61c89b13..b560c7ac 100644 --- a/FreeFileSync/Source/ui/sync_cfg.h +++ b/FreeFileSync/Source/ui/sync_cfg.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/taskbar.cpp b/FreeFileSync/Source/ui/taskbar.cpp index 863eb6d6..a41eb1fe 100644 --- a/FreeFileSync/Source/ui/taskbar.cpp +++ b/FreeFileSync/Source/ui/taskbar.cpp @@ -1,24 +1,24 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** #include "taskbar.h" #ifdef ZEN_WIN -#include -#include -#include -#include "../dll/Taskbar_Seven/taskbar.h" + #include + #include + #include + #include "../dll/Taskbar_Seven/taskbar.h" #elif defined HAVE_UBUNTU_UNITY -#include + #include #elif defined ZEN_MAC -#include -#include -#include "osx_dock.h" + #include + #include + #include "osx_dock.h" #endif using namespace zen; diff --git a/FreeFileSync/Source/ui/taskbar.h b/FreeFileSync/Source/ui/taskbar.h index 65509cab..d8fd1ace 100644 --- a/FreeFileSync/Source/ui/taskbar.h +++ b/FreeFileSync/Source/ui/taskbar.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/tray_icon.cpp b/FreeFileSync/Source/ui/tray_icon.cpp index 712e4d51..3a4de1b0 100644 --- a/FreeFileSync/Source/ui/tray_icon.cpp +++ b/FreeFileSync/Source/ui/tray_icon.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/tray_icon.h b/FreeFileSync/Source/ui/tray_icon.h index c83641a7..cdcad3b7 100644 --- a/FreeFileSync/Source/ui/tray_icon.h +++ b/FreeFileSync/Source/ui/tray_icon.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/tree_view.cpp b/FreeFileSync/Source/ui/tree_view.cpp index 6e5d4430..735d4732 100644 --- a/FreeFileSync/Source/ui/tree_view.cpp +++ b/FreeFileSync/Source/ui/tree_view.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/tree_view.h b/FreeFileSync/Source/ui/tree_view.h index db5edbb8..ea8e926d 100644 --- a/FreeFileSync/Source/ui/tree_view.h +++ b/FreeFileSync/Source/ui/tree_view.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/triple_splitter.cpp b/FreeFileSync/Source/ui/triple_splitter.cpp index f88691ec..81bf5579 100644 --- a/FreeFileSync/Source/ui/triple_splitter.cpp +++ b/FreeFileSync/Source/ui/triple_splitter.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/triple_splitter.h b/FreeFileSync/Source/ui/triple_splitter.h index 0577dabf..cb834b34 100644 --- a/FreeFileSync/Source/ui/triple_splitter.h +++ b/FreeFileSync/Source/ui/triple_splitter.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/FreeFileSync/Source/ui/wx_form_build_hide_warnings.h b/FreeFileSync/Source/ui/wx_form_build_hide_warnings.h index 71f28340..679fb62f 100644 --- a/FreeFileSync/Source/ui/wx_form_build_hide_warnings.h +++ b/FreeFileSync/Source/ui/wx_form_build_hide_warnings.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -10,13 +10,13 @@ //pamper over wxFormBuilder "sub-optimal" code #ifdef __GNUC__ -#pragma GCC diagnostic ignored "-Wunused-variable" -#ifndef __clang__ //clang seems to define __GNUC__, but doesn't support this warning -#pragma GCC diagnostic ignored "-Wunused-but-set-variable" -#endif + #pragma GCC diagnostic ignored "-Wunused-variable" + #ifndef __clang__ //clang seems to define __GNUC__, but doesn't support this warning + #pragma GCC diagnostic ignored "-Wunused-but-set-variable" + #endif #elif defined _MSC_VER -#pragma warning(disable: 4189) + #pragma warning(disable: 4189) #endif #endif //WX_FORM_BUILD_230948324234234 diff --git a/FreeFileSync/Source/version/version.h b/FreeFileSync/Source/version/version.h index 33153cb8..9a490759 100644 --- a/FreeFileSync/Source/version/version.h +++ b/FreeFileSync/Source/version/version.h @@ -3,7 +3,7 @@ namespace zen { -const wchar_t currentVersion[] = L"6.11"; //internal linkage! +const wchar_t currentVersion[] = L"6.12"; //internal linkage! } #endif diff --git a/FreeFileSync/Source/version/version.iss b/FreeFileSync/Source/version/version.iss new file mode 100644 index 00000000..da4f557e --- /dev/null +++ b/FreeFileSync/Source/version/version.iss @@ -0,0 +1 @@ +#define FFS_Version "6.12" diff --git a/wx+/app_main.h b/wx+/app_main.h index a13a122d..b97a25ef 100644 --- a/wx+/app_main.h +++ b/wx+/app_main.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/bitmap_button.h b/wx+/bitmap_button.h index 14476324..6c186926 100644 --- a/wx+/bitmap_button.h +++ b/wx+/bitmap_button.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/choice_enum.h b/wx+/choice_enum.h index 57718158..6a795d4a 100644 --- a/wx+/choice_enum.h +++ b/wx+/choice_enum.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/context_menu.h b/wx+/context_menu.h index a498c429..2ae85162 100644 --- a/wx+/context_menu.h +++ b/wx+/context_menu.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/dc.h b/wx+/dc.h index b2f5b584..0d3c1cb8 100644 --- a/wx+/dc.h +++ b/wx+/dc.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -84,7 +84,7 @@ private: #ifndef wxALWAYS_NATIVE_DOUBLE_BUFFER -#error we need this one! + #error we need this one! #endif #if wxALWAYS_NATIVE_DOUBLE_BUFFER diff --git a/wx+/file_drop.h b/wx+/file_drop.h index 55772a03..664b4387 100644 --- a/wx+/file_drop.h +++ b/wx+/file_drop.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/font_size.h b/wx+/font_size.h index 4639d194..c1ea47cd 100644 --- a/wx+/font_size.h +++ b/wx+/font_size.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -10,10 +10,10 @@ #include #include #ifdef ZEN_WIN -#include -#include -#include //TEXT_MAININSTRUCTION -#include //TMT_COLOR + #include + #include + #include //TEXT_MAININSTRUCTION + #include //TMT_COLOR #endif namespace zen diff --git a/wx+/graph.cpp b/wx+/graph.cpp index 67f8e354..cc844144 100644 --- a/wx+/graph.cpp +++ b/wx+/graph.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/graph.h b/wx+/graph.h index 00b0b469..34c7ab3c 100644 --- a/wx+/graph.h +++ b/wx+/graph.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/grid.cpp b/wx+/grid.cpp index de50d4c6..377510ae 100644 --- a/wx+/grid.cpp +++ b/wx+/grid.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -20,7 +20,7 @@ #include "dc.h" #ifdef ZEN_LINUX -#include + #include #endif using namespace zen; diff --git a/wx+/grid.h b/wx+/grid.h index 1ac75aa5..76ee383a 100644 --- a/wx+/grid.h +++ b/wx+/grid.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/image_resources.cpp b/wx+/image_resources.cpp index 062ad88c..a76a2822 100644 --- a/wx+/image_resources.cpp +++ b/wx+/image_resources.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/image_resources.h b/wx+/image_resources.h index b16544ac..8d7c9b49 100644 --- a/wx+/image_resources.h +++ b/wx+/image_resources.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/image_tools.cpp b/wx+/image_tools.cpp index b1732032..c6be3852 100644 --- a/wx+/image_tools.cpp +++ b/wx+/image_tools.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/image_tools.h b/wx+/image_tools.h index d3a20a45..cb8da60b 100644 --- a/wx+/image_tools.h +++ b/wx+/image_tools.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/key_event.h b/wx+/key_event.h deleted file mode 100644 index aa094b4a..00000000 --- a/wx+/key_event.h +++ /dev/null @@ -1,118 +0,0 @@ -// ************************************************************************** -// * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * -// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * -// ************************************************************************** - -#ifndef KEY_EVENT_H_086130871086708354674 -#define KEY_EVENT_H_086130871086708354674 - -#include -#include -#include -#include -#include - -namespace zen -{ -//wxWidgets provides no elegant way to register shortcut keys scoped for dialog windows -// => enable dialog-specific local key events! - -//setup in wxDialog-derived class' constructor, e.g.: -// setupLocalKeyEvents(*this, [this](wxKeyEvent& event){ this->onLocalKeyEvent(event); }); -// -// => redirects local key events to: -// void MyDlg::onLocalKeyEvent(wxKeyEvent& event); -void setupLocalKeyEvents(wxWindow& wnd, const std::function& callback); //callback held during life time of "wnd"! - - - - - - - -//pretty much the same like "bool wxWindowBase::IsDescendant(wxWindowBase* child) const" but without the obvious misnomer -inline -bool isComponentOf(const wxWindow* child, const wxWindow* top) -{ - for (const wxWindow* wnd = child; wnd != nullptr; wnd = wnd->GetParent()) - if (wnd == top) - return true; - return false; -} - - -namespace impl -{ -inline -const wxTopLevelWindow* getTopLevelWindow(const wxWindow* child) -{ - for (const wxWindow* wnd = child; wnd != nullptr; wnd = wnd->GetParent()) - if (auto tlw = dynamic_cast(wnd)) - return tlw; - return nullptr; -} - - -class LokalKeyEventHandler : public wxWindow //private wxEvtHandler -{ -public: - LokalKeyEventHandler(wxWindow& parent, const std::function& callback) : wxWindow(&parent, wxID_ANY), //use a dummy child window to bind instance life time to parent - parent_(parent), - callback_(callback), - processingCallback(false) - { - Hide(); //this is just a dummy window so that its parent can have ownership - Disable(); // - - //register global hotkeys (without needing explicit menu entry) - wxTheApp->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(LokalKeyEventHandler::onGlobalKeyEvent), nullptr, this); - wxTheApp->Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(LokalKeyEventHandler::onGlobalKeyEvent), nullptr, this); //capture direction keys - } - - ~LokalKeyEventHandler() - { - //important! event source wxTheApp lives longer than this instance -> disconnect! - wxTheApp->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(LokalKeyEventHandler::onGlobalKeyEvent), nullptr, this); - wxTheApp->Disconnect(wxEVT_CHAR_HOOK, wxKeyEventHandler(LokalKeyEventHandler::onGlobalKeyEvent), nullptr, this); - } - -private: - void onGlobalKeyEvent(wxKeyEvent& event) - { - const wxWindow* focus = wxWindow::FindFocus(); - const wxTopLevelWindow* tlw = getTopLevelWindow(&parent_); - - //avoid recursion!!! -> this ugly construct seems to be the only (portable) way to avoid re-entrancy - //recursion may happen in multiple situations: e.g. modal dialogs, Grid::ProcessEvent()! - if (processingCallback || - !isComponentOf(focus, &parent_) || - !parent_.IsEnabled() || //only handle if window is in use and no modal dialog is shown: - !tlw || !const_cast(tlw)->IsActive()) //thanks to wxWidgets non-portability we need both checks: - //IsEnabled() is sufficient for Windows, IsActive() is needed on OS X since it does NOT disable the parent when showing a modal dialog - { - event.Skip(); - return; - } - processingCallback = true; - ZEN_ON_SCOPE_EXIT(processingCallback = false;) - - callback_(event); - } - - wxWindow& parent_; - const std::function callback_; - bool processingCallback; -}; -} - - -inline -void setupLocalKeyEvents(wxWindow& wnd, const std::function& callback) -{ - new impl::LokalKeyEventHandler(wnd, callback); //ownership passed to "wnd"! -} - -} - -#endif //KEY_EVENT_H_086130871086708354674 diff --git a/wx+/no_flicker.h b/wx+/no_flicker.h index c5b0d238..fb0585ca 100644 --- a/wx+/no_flicker.h +++ b/wx+/no_flicker.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/popup_dlg.cpp b/wx+/popup_dlg.cpp index ff0bf125..480021eb 100644 --- a/wx+/popup_dlg.cpp +++ b/wx+/popup_dlg.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -12,7 +12,7 @@ #include "popup_dlg_generated.h" #ifdef ZEN_WIN -#include + #include #endif using namespace zen; diff --git a/wx+/popup_dlg.h b/wx+/popup_dlg.h index ab988702..eef7ab79 100644 --- a/wx+/popup_dlg.h +++ b/wx+/popup_dlg.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/rtl.h b/wx+/rtl.h index 0ec84524..5f1c9321 100644 --- a/wx+/rtl.h +++ b/wx+/rtl.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/std_button_layout.h b/wx+/std_button_layout.h index b5e30472..f497de2c 100644 --- a/wx+/std_button_layout.h +++ b/wx+/std_button_layout.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/string_conv.h b/wx+/string_conv.h index e9150223..229a9825 100644 --- a/wx+/string_conv.h +++ b/wx+/string_conv.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/timespan.h b/wx+/timespan.h index 28c9e673..09469ccb 100644 --- a/wx+/timespan.h +++ b/wx+/timespan.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/toggle_button.h b/wx+/toggle_button.h index e532d9d8..faa72f66 100644 --- a/wx+/toggle_button.h +++ b/wx+/toggle_button.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/tooltip.cpp b/wx+/tooltip.cpp index d4bcf302..91298db4 100644 --- a/wx+/tooltip.cpp +++ b/wx+/tooltip.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/tooltip.h b/wx+/tooltip.h index 7f58ff27..d4236186 100644 --- a/wx+/tooltip.h +++ b/wx+/tooltip.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/wx+/zlib_wrap.cpp b/wx+/zlib_wrap.cpp index eccf8698..d25c2c3e 100644 --- a/wx+/zlib_wrap.cpp +++ b/wx+/zlib_wrap.cpp @@ -1,14 +1,14 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** #include "zlib_wrap.h" #ifdef ZEN_WIN -#include //not really a "nice" place to look for a stable solution + #include //not really a "nice" place to look for a stable solution #elif defined ZEN_LINUX || defined ZEN_MAC -#include //let's pray this is the same version wxWidgets is linking against! + #include //let's pray this is the same version wxWidgets is linking against! #endif using namespace zen; diff --git a/wx+/zlib_wrap.h b/wx+/zlib_wrap.h index c271276f..815d8361 100644 --- a/wx+/zlib_wrap.h +++ b/wx+/zlib_wrap.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/async_task.h b/zen/async_task.h index f9bea890..b8d72fbe 100644 --- a/zen/async_task.h +++ b/zen/async_task.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/basic_math.h b/zen/basic_math.h index 41f42dbe..9a3d195e 100644 --- a/zen/basic_math.h +++ b/zen/basic_math.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -42,7 +42,10 @@ auto nearMatch(const T& val, InputIterator first, InputIterator last) -> typenam template bool isNull(T value); -int round(double d); //little rounding function +int round(double d); //"little rounding function" + +template +N integerDivideRoundUp(N numerator, N denominator); template T power(const T& value); @@ -98,7 +101,7 @@ const double ln2 = 0.693147180559945309417; template inline T abs(T value) { - //static_assert(std::is_signed::value, ""); might not compile for non-built-in arithmetic types; anyway "-value" should emit compiler error or warning for unsigned types + static_assert(std::is_signed::value, ""); if (value < 0) return -value; // operator "?:" caveat: may be different type than "value" else @@ -234,6 +237,15 @@ int round(double d) } +template inline +N integerDivideRoundUp(N numerator, N denominator) +{ + static_assert(std::is_unsigned::value, ""); + assert(denominator > 0); + return (numerator + denominator - 1) / denominator; +} + + namespace { template diff --git a/zen/build_info.h b/zen/build_info.h index 406fef70..4eeb8195 100644 --- a/zen/build_info.h +++ b/zen/build_info.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/deprecate.h b/zen/deprecate.h index 56f8e27c..49d8386b 100644 --- a/zen/deprecate.h +++ b/zen/deprecate.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -9,13 +9,13 @@ //compiler macros: http://predef.sourceforge.net/precomp.html #ifdef __GNUC__ -#define ZEN_DEPRECATE __attribute__ ((deprecated)) + #define ZEN_DEPRECATE __attribute__ ((deprecated)) #elif defined _MSC_VER -#define ZEN_DEPRECATE __declspec(deprecated) + #define ZEN_DEPRECATE __declspec(deprecated) #else -#error add your platform here! + #error add your platform here! #endif #endif //DEPRECATE_HEADER_2348970348 diff --git a/zen/dir_watcher.cpp b/zen/dir_watcher.cpp index 9a685fc5..916f6c69 100644 --- a/zen/dir_watcher.cpp +++ b/zen/dir_watcher.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -11,18 +11,18 @@ #include "scope_guard.h" #ifdef ZEN_WIN -#include "notify_removal.h" -#include "win.h" //includes "windows.h" -#include "long_path_prefix.h" + #include "notify_removal.h" + #include "win.h" //includes "windows.h" + #include "long_path_prefix.h" #elif defined ZEN_LINUX -#include -#include -#include "file_traverser.h" + #include + #include + #include "file_traverser.h" #elif defined ZEN_MAC -#include -#include "osx_string.h" + #include + #include "osx_string.h" #endif using namespace zen; diff --git a/zen/dir_watcher.h b/zen/dir_watcher.h index 99131470..b5255898 100644 --- a/zen/dir_watcher.h +++ b/zen/dir_watcher.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/dll.h b/zen/dll.h deleted file mode 100644 index f6422fa7..00000000 --- a/zen/dll.h +++ /dev/null @@ -1,121 +0,0 @@ -// ************************************************************************** -// * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * -// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * -// ************************************************************************** - -#ifndef DLLLOADER_H_4239582598670968 -#define DLLLOADER_H_4239582598670968 - -#include -#ifdef ZEN_WIN -#include -#include "scope_guard.h" -#include "win.h" //includes "windows.h" - -#elif defined ZEN_LINUX || defined ZEN_MAC -#include -#endif - -namespace zen -{ -/* -Manage DLL function and library ownership - - thread safety: like built-in type - - full value semantics - - Usage: - typedef BOOL (WINAPI* FunType_IsWow64Process)(HANDLE hProcess, PBOOL Wow64Process); - const zen::SysDllFun isWow64Process(L"kernel32.dll", "IsWow64Process"); - if (isWow64Process) ... use function ptr ... - - Usage 2: - #define DEF_DLL_FUN(name) DllFun name(dll_ns::getDllName(), dll_ns::funName_##name); - DEF_DLL_FUN(funname1); DEF_DLL_FUN(funname2); DEF_DLL_FUN(funname3); -*/ - -template -class DllFun -{ -public: - DllFun() : fun(nullptr) {} - -#ifdef ZEN_WIN - DllFun(const wchar_t* libraryName, const char* functionName) : - hLibRef(::LoadLibrary(libraryName), ::FreeLibrary), - fun(hLibRef ? reinterpret_cast(::GetProcAddress(static_cast(hLibRef.get()), functionName)) : nullptr) {} -#elif defined ZEN_LINUX || defined ZEN_MAC - DllFun(const char* libraryName, const char* functionName) : - hLibRef(::dlopen(libraryName, RTLD_LAZY), ::dlclose), - fun(hLibRef ? reinterpret_cast(::dlsym(hLibRef.get(), functionName)) : nullptr) {} -#endif - operator Func() const { return fun; } - -private: - std::shared_ptr hLibRef; //we would prefer decltype(*HMODULE()) if only it would work... - Func fun; -}; - - -#ifdef ZEN_WIN -//if the dll is already part of the process space, e.g. "kernel32.dll" or "shell32.dll", we can use a faster variant: -//NOTE: since the lifetime of the referenced library is *not* controlled, this is safe to use only for permanently loaded libraries like these! -template -class SysDllFun -{ -public: - SysDllFun() : fun(nullptr) {} - - SysDllFun(const wchar_t* systemLibrary, const char* functionName) - { - HMODULE mod = ::GetModuleHandle(systemLibrary); - fun = mod ? reinterpret_cast(::GetProcAddress(mod, functionName)) : nullptr; - } - - operator Func() const { return fun; } - -private: - Func fun; -}; - -/* -extract binary resources from .exe/.dll: - --- resource.h -- -#define MY_BINARY_RESOURCE 1337 - --- resource.rc -- -MY_BINARY_RESOURCE RCDATA "filename.dat" -*/ -std::string getResourceStream(const std::wstring& libraryName, size_t resourceId); -#endif - - - - - - - - - - -//--------------- implementation--------------------------------------------------- -#ifdef ZEN_WIN -inline -std::string getResourceStream(const wchar_t* libraryName, size_t resourceId) -{ - if (HMODULE module = ::LoadLibrary(libraryName)) - { - ZEN_ON_SCOPE_EXIT(::FreeLibrary(module)); - - if (HRSRC res = ::FindResource(module, MAKEINTRESOURCE(resourceId), RT_RCDATA)) - if (HGLOBAL resHandle = ::LoadResource(module, res)) - if (const char* stream = static_cast(::LockResource(resHandle))) - return std::string(stream, static_cast(::SizeofResource(module, res))); //size is 0 on error - } - return std::string(); -} -#endif -} - -#endif //DLLLOADER_H_4239582598670968 diff --git a/zen/error_log.h b/zen/error_log.h index de4d3c9e..9814ec23 100644 --- a/zen/error_log.h +++ b/zen/error_log.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/file_access.cpp b/zen/file_access.cpp index c4768dd2..7a77b998 100644 --- a/zen/file_access.cpp +++ b/zen/file_access.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -16,27 +16,27 @@ #include "file_id_def.h" #ifdef ZEN_WIN -#include -#include "privilege.h" -#include "dll.h" -#include "long_path_prefix.h" -#include "win_ver.h" -#include "IFileOperation/file_op.h" + #include + #include "privilege.h" + #include "dll.h" + #include "long_path_prefix.h" + #include "win_ver.h" + #include "IFileOperation/file_op.h" #elif defined ZEN_LINUX -#include //statfs -#include //AT_SYMLINK_NOFOLLOW, UTIME_OMIT -#ifdef HAVE_SELINUX -#include -#endif + #include //statfs + #include //AT_SYMLINK_NOFOLLOW, UTIME_OMIT + #ifdef HAVE_SELINUX + #include + #endif #elif defined ZEN_MAC -#include //statfs + #include //statfs #endif #if defined ZEN_LINUX || defined ZEN_MAC -#include -#include //lutimes + #include + #include //lutimes #endif using namespace zen; @@ -756,8 +756,6 @@ void setFileTimeRaw(const Zstring& filepath, ZEN_ON_SCOPE_EXIT(::CloseHandle(hFile)); - auto isNullTime = [](const FILETIME& ft) { return ft.dwLowDateTime == 0 && ft.dwHighDateTime == 0; }; - if (!::SetFileTime(hFile, //__in HANDLE hFile, creationTime, //__in_opt const FILETIME *lpCreationTime, nullptr, //__in_opt const FILETIME *lpLastAccessTime, @@ -1438,7 +1436,7 @@ void zen::copySymlink(const Zstring& sourceLink, const Zstring& targetLink, bool if (!createSymbolicLink) throw FileError(replaceCpy(replaceCpy(_("Cannot copy symbolic link %x to %y."), L"%x", L"\n" + fmtFileName(sourceLink)), L"%y", L"\n" + fmtFileName(targetLink)), - replaceCpy(_("Cannot find system function %x."), L"%x", L"\"CreateSymbolicLinkW\"")); + replaceCpy(_("Cannot find system function %x."), L"%x", L"\"CreateSymbolicLinkW\"")); const wchar_t functionName[] = L"CreateSymbolicLinkW"; if (!createSymbolicLink(targetLink.c_str(), //__in LPTSTR lpSymlinkFileName, - seems no long path prefix is required... @@ -1744,7 +1742,7 @@ void copyFileWindowsSparse(const Zstring& sourceFile, LPVOID contextWrite = nullptr; // ZEN_ON_SCOPE_EXIT( - if (contextRead ) ::BackupRead (0, nullptr, 0, nullptr, true, false, &contextRead); //lpContext must be passed [...] all other parameters are ignored. + if (contextRead ) ::BackupRead (0, nullptr, 0, nullptr, true, false, &contextRead); //MSDN: "lpContext must be passed [...] all other parameters are ignored." if (contextWrite) ::BackupWrite(0, nullptr, 0, nullptr, true, false, &contextWrite); ); //stream-copy sourceFile to targetFile @@ -1792,8 +1790,6 @@ void copyFileWindowsSparse(const Zstring& sourceFile, } while (!eof); - //DST hack not required, since both source and target volumes cannot be FAT! - //::BackupRead() silently fails reading encrypted files -> double check! if (!someBytesWritten && get64BitUInt(fileInfoSource.nFileSizeLow, fileInfoSource.nFileSizeHigh) != 0U) //note: there is no guaranteed ordering relation beween bytes transferred and file size! Consider ADS (>) and compressed/sparse files (<)! @@ -1807,38 +1803,6 @@ void copyFileWindowsSparse(const Zstring& sourceFile, throwFileError(replaceCpy(_("Cannot write modification time of %x."), L"%x", fmtFileName(targetFile)), L"SetFileTime", getLastError()); guardTarget.dismiss(); - - /* - //create sparse file for testing: - HANDLE hSparse = ::CreateFile(L"C:\\sparse.file", - GENERIC_READ | GENERIC_WRITE, //read access required for FSCTL_SET_COMPRESSION - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - nullptr, - CREATE_NEW, - FILE_FLAG_SEQUENTIAL_SCAN, - nullptr); - if (hFileTarget == INVALID_HANDLE_VALUE) - throw FileError(L"fail"); - ZEN_ON_SCOPE_EXIT(::CloseHandle(hSparse)); - - DWORD br = 0; - if (!::DeviceIoControl(hSparse, FSCTL_SET_SPARSE, nullptr, 0, nullptr, 0, &br,nullptr)) - throw FileError(L"fail"); - - LARGE_INTEGER liDistanceToMove = {}; - liDistanceToMove.QuadPart = 1024 * 1024 * 1024; //create 5 TB sparse file - liDistanceToMove.QuadPart *= 5 * 1024; //maximum file size on NTFS: 16 TB - 64 kB - if (!::SetFilePointerEx(hSparse, liDistanceToMove, nullptr, FILE_BEGIN)) - throw FileError(L"fail"); - - if (!SetEndOfFile(hSparse)) - throw FileError(L"fail"); - - FILE_ZERO_DATA_INFORMATION zeroInfo = {}; - zeroInfo.BeyondFinalZero.QuadPart = liDistanceToMove.QuadPart; - if (!::DeviceIoControl(hSparse, FSCTL_SET_ZERO_DATA, &zeroInfo, sizeof(zeroInfo), nullptr, 0, &br, nullptr)) - throw FileError(L"fail"); - */ } diff --git a/zen/file_access.h b/zen/file_access.h index 7cac889c..4a36009d 100644 --- a/zen/file_access.h +++ b/zen/file_access.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/file_error.h b/zen/file_error.h index 9276e8c5..4ba05107 100644 --- a/zen/file_error.h +++ b/zen/file_error.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/file_id_def.h b/zen/file_id_def.h index 3b217b3d..a96e978b 100644 --- a/zen/file_id_def.h +++ b/zen/file_id_def.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -10,10 +10,10 @@ #include #ifdef ZEN_WIN -#include "win.h" //includes "windows.h" + #include "win.h" //includes "windows.h" #elif defined ZEN_LINUX || defined ZEN_MAC -#include + #include #endif diff --git a/zen/file_io.cpp b/zen/file_io.cpp index 8f4b6cb2..c56d6ac0 100644 --- a/zen/file_io.cpp +++ b/zen/file_io.cpp @@ -1,20 +1,20 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** #include "file_io.h" #ifdef ZEN_WIN -#include "long_path_prefix.h" -#include "IFileOperation/file_op.h" -#include "win_ver.h" -#include "dll.h" + #include "long_path_prefix.h" + #include "IFileOperation/file_op.h" + #include "win_ver.h" + #include "dll.h" #elif defined ZEN_LINUX || defined ZEN_MAC -#include //open, close -#include //read, write + #include //open, close + #include //read, write #endif using namespace zen; diff --git a/zen/file_io.h b/zen/file_io.h index 7ccef05b..111d7a09 100644 --- a/zen/file_io.h +++ b/zen/file_io.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -11,27 +11,27 @@ #include "file_error.h" #ifdef ZEN_WIN -#include "win.h" //includes "windows.h" + #include "win.h" //includes "windows.h" #elif defined ZEN_LINUX || defined ZEN_MAC -#include -#include + #include + #include #endif namespace zen { #ifdef ZEN_WIN -static const char LINE_BREAK[] = "\r\n"; + static const char LINE_BREAK[] = "\r\n"; #elif defined ZEN_LINUX || defined ZEN_MAC -static const char LINE_BREAK[] = "\n"; //since OS X apple uses newline, too + static const char LINE_BREAK[] = "\n"; //since OS X apple uses newline, too #endif //buffered file IO optimized for sequential read/write accesses + better error reporting + long path support + following symlinks #ifdef ZEN_WIN -typedef HANDLE FileHandle; + typedef HANDLE FileHandle; #elif defined ZEN_LINUX || defined ZEN_MAC -typedef FILE* FileHandle; + typedef FILE* FileHandle; #endif class FileInput : public FileInputBase diff --git a/zen/file_io_base.h b/zen/file_io_base.h index e56ea189..9b6b27ca 100644 --- a/zen/file_io_base.h +++ b/zen/file_io_base.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/file_traverser.cpp b/zen/file_traverser.cpp index 7b423faa..f03cf464 100644 --- a/zen/file_traverser.cpp +++ b/zen/file_traverser.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -10,20 +10,20 @@ #include "int64.h" #ifdef ZEN_WIN -#include "win_ver.h" -#include "long_path_prefix.h" -#include "file_access.h" -#include "dll.h" -#include "FindFilePlus/find_file_plus.h" + #include "win_ver.h" + #include "long_path_prefix.h" + #include "file_access.h" + #include "dll.h" + #include "FindFilePlus/find_file_plus.h" #elif defined ZEN_MAC -#include "osx_string.h" + #include "osx_string.h" #endif #if defined ZEN_LINUX || defined ZEN_MAC -#include //required by GCC 4.8.1 to find ptrdiff_t -#include -#include + #include //required by GCC 4.8.1 to find ptrdiff_t + #include + #include #endif using namespace zen; @@ -366,7 +366,7 @@ void DirTraverser::traverse(const Zstring& dirpath, TraverseC inline -DirTraverser::DirTraverser(const Zstring& baseDirectory, TraverseCallback& sink) +DirTraverser::DirTraverser(const Zstring& baseDirectory, TraverseCallback& sink) { try //traversing certain folders with restricted permissions requires this privilege! (but copying these files may still fail) { diff --git a/zen/file_traverser.h b/zen/file_traverser.h index c9efbdb1..174503b5 100644 --- a/zen/file_traverser.h +++ b/zen/file_traverser.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/fixed_list.h b/zen/fixed_list.h index 627584df..2a577f13 100644 --- a/zen/fixed_list.h +++ b/zen/fixed_list.h @@ -1,12 +1,13 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** #ifndef FIXED_LIST_01238467085684139453534 #define FIXED_LIST_01238467085684139453534 +#include #include namespace zen @@ -116,6 +117,13 @@ public: size_t size() const { return sz; } + void swap(FixedList& other) + { + std::swap(firstInsert, other.firstInsert); + std::swap(lastInsert , other.lastInsert); + std::swap(sz , other.sz); + } + private: FixedList (const FixedList&) = delete; FixedList& operator=(const FixedList&) = delete; diff --git a/zen/format_unit.cpp b/zen/format_unit.cpp index e251dc3c..5f529f9c 100644 --- a/zen/format_unit.cpp +++ b/zen/format_unit.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -14,12 +14,12 @@ #include #ifdef ZEN_WIN -#include "win.h" //includes "windows.h" -#include "win_ver.h" + #include "win.h" //includes "windows.h" + #include "win_ver.h" #elif defined ZEN_LINUX || defined ZEN_MAC -#include //thousands separator -#include "utf.h" // + #include //thousands separator + #include "utf.h" // #endif using namespace zen; diff --git a/zen/format_unit.h b/zen/format_unit.h index 9416e3e5..009199f6 100644 --- a/zen/format_unit.h +++ b/zen/format_unit.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/guid.h b/zen/guid.h index 83845e5c..2ebfa132 100644 --- a/zen/guid.h +++ b/zen/guid.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -11,15 +11,15 @@ #include #ifdef __GNUC__ //boost should start cleaning this mess up -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow" -#pragma GCC diagnostic ignored "-Wuninitialized" + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wshadow" + #pragma GCC diagnostic ignored "-Wuninitialized" #endif #include #ifdef __GNUC__ -#pragma GCC diagnostic pop + #pragma GCC diagnostic pop #endif diff --git a/zen/i18n.h b/zen/i18n.h index bf284c7f..6c3a37c4 100644 --- a/zen/i18n.h +++ b/zen/i18n.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -15,9 +15,9 @@ //minimal layer enabling text translation - without platform/library dependencies! #ifdef __WXMSW__ //we have wxWidgets -#ifndef WXINTL_NO_GETTEXT_MACRO -#error WXINTL_NO_GETTEXT_MACRO must be defined to deactivate wxWidgets underscore macro -#endif + #ifndef WXINTL_NO_GETTEXT_MACRO + #error WXINTL_NO_GETTEXT_MACRO must be defined to deactivate wxWidgets underscore macro + #endif #endif #define ZEN_TRANS_CONCAT_SUB(X, Y) X ## Y @@ -78,7 +78,7 @@ std::wstring translate(const std::wstring& singular, const std::wstring& plural, return translation; } - return replaceCpy(std::abs(n) == 1 ? singular : plural, L"%x", toGuiString(n)); + return replaceCpy(std::abs(n) == 1 ? singular : plural, L"%x", toGuiString(n)); } template inline diff --git a/zen/int64.h b/zen/int64.h index 671f3372..bc01a4c2 100644 --- a/zen/int64.h +++ b/zen/int64.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -10,7 +10,7 @@ #include #ifdef ZEN_WIN -#include "win.h" + #include "win.h" #endif diff --git a/zen/long_path_prefix.h b/zen/long_path_prefix.h index 824c7084..d2289330 100644 --- a/zen/long_path_prefix.h +++ b/zen/long_path_prefix.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/notify_removal.cpp b/zen/notify_removal.cpp index 639264a6..37f305c9 100644 --- a/zen/notify_removal.cpp +++ b/zen/notify_removal.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/notify_removal.h b/zen/notify_removal.h index ba560f96..08d75818 100644 --- a/zen/notify_removal.h +++ b/zen/notify_removal.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/optional.h b/zen/optional.h index 15d27f4b..d65820c2 100644 --- a/zen/optional.h +++ b/zen/optional.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/perf.h b/zen/perf.h index 4405537c..17aeabd0 100644 --- a/zen/perf.h +++ b/zen/perf.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -11,9 +11,9 @@ #include "tick_count.h" #ifdef ZEN_WIN -#include + #include #else -#include + #include #endif //############# two macros for quick performance measurements ############### diff --git a/zen/process_priority.cpp b/zen/process_priority.cpp index ee8e7d8b..c5932900 100644 --- a/zen/process_priority.cpp +++ b/zen/process_priority.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -9,7 +9,7 @@ #include "i18n.h" #ifdef ZEN_WIN -#include "win.h" //includes "windows.h" + #include "win.h" //includes "windows.h" #endif using namespace zen; @@ -32,8 +32,8 @@ PreventStandby::~PreventStandby() #ifndef PROCESS_MODE_BACKGROUND_BEGIN -#define PROCESS_MODE_BACKGROUND_BEGIN 0x00100000 // Windows Server 2003 and Windows XP/2000: This value is not supported! -#define PROCESS_MODE_BACKGROUND_END 0x00200000 // + #define PROCESS_MODE_BACKGROUND_BEGIN 0x00100000 // Windows Server 2003 and Windows XP/2000: This value is not supported! + #define PROCESS_MODE_BACKGROUND_END 0x00200000 // #endif struct ScheduleForBackgroundProcessing::Pimpl {}; diff --git a/zen/process_priority.h b/zen/process_priority.h index a133985f..3e217776 100644 --- a/zen/process_priority.h +++ b/zen/process_priority.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** #ifndef PREVENTSTANDBY_H_83421759082143245 diff --git a/zen/recycler.cpp b/zen/recycler.cpp index 5b5e44d4..649bbb8e 100644 --- a/zen/recycler.cpp +++ b/zen/recycler.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -8,19 +8,19 @@ #include "file_access.h" #ifdef ZEN_WIN -#include "thread.h" -#include "dll.h" -#include "win_ver.h" -#include "long_path_prefix.h" -#include "IFileOperation/file_op.h" + #include "thread.h" + #include "dll.h" + #include "win_ver.h" + #include "long_path_prefix.h" + #include "IFileOperation/file_op.h" #elif defined ZEN_LINUX -#include -#include -#include "scope_guard.h" + #include + #include + #include "scope_guard.h" #elif defined ZEN_MAC -#include + #include #endif using namespace zen; diff --git a/zen/recycler.h b/zen/recycler.h index b406408f..d86fbb12 100644 --- a/zen/recycler.h +++ b/zen/recycler.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/scope_guard.h b/zen/scope_guard.h index 761c6aea..706b20dc 100644 --- a/zen/scope_guard.h +++ b/zen/scope_guard.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/serialize.h b/zen/serialize.h index cd427c9c..54baf75a 100644 --- a/zen/serialize.h +++ b/zen/serialize.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -137,35 +137,35 @@ template < class BinInputStream> void readArray (BinInputStream& stre //-----------------------implementation------------------------------- template inline void saveBinStream(const Zstring& filepath, //throw FileError - const BinContainer& cont, - const std::function& onUpdateStatus) //optional + const BinContainer& cont, + const std::function& onUpdateStatus) //optional { static_assert(sizeof(typename BinContainer::value_type) == 1, ""); //expect: bytes (until further) FileOutput fileOut(filepath, zen::FileOutput::ACC_OVERWRITE); //throw FileError if (!cont.empty()) - { - const size_t blockSize = 128 * 1024; - auto bytePtr = &*cont.begin(); - size_t bytesLeft = cont.size(); - - while (bytesLeft > blockSize) - { - fileOut.write(bytePtr, blockSize); //throw FileError - bytePtr += blockSize; - bytesLeft -= blockSize; - if (onUpdateStatus) onUpdateStatus(blockSize); - } - - fileOut.write(bytePtr, bytesLeft); //throw FileError - if (onUpdateStatus) onUpdateStatus(bytesLeft); - } + { + const size_t blockSize = 128 * 1024; + auto bytePtr = &*cont.begin(); + size_t bytesLeft = cont.size(); + + while (bytesLeft > blockSize) + { + fileOut.write(bytePtr, blockSize); //throw FileError + bytePtr += blockSize; + bytesLeft -= blockSize; + if (onUpdateStatus) onUpdateStatus(blockSize); + } + + fileOut.write(bytePtr, bytesLeft); //throw FileError + if (onUpdateStatus) onUpdateStatus(bytesLeft); + } } template inline BinContainer loadBinStream(const Zstring& filepath, //throw FileError - const std::function& onUpdateStatus) //optional + const std::function& onUpdateStatus) //optional { static_assert(sizeof(typename BinContainer::value_type) == 1, ""); //expect: bytes (until further) @@ -181,7 +181,7 @@ BinContainer loadBinStream(const Zstring& filepath, //throw FileError if (bytesRead < blockSize) contOut.resize(contOut.size() - (blockSize - bytesRead)); //caveat: unsigned arithmetics - if (onUpdateStatus) onUpdateStatus(bytesRead); + if (onUpdateStatus) onUpdateStatus(bytesRead); } while (!fileIn.eof()); diff --git a/zen/shell_execute.h b/zen/shell_execute.h index c2ccd837..4eebcca2 100644 --- a/zen/shell_execute.h +++ b/zen/shell_execute.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -10,12 +10,12 @@ #include "file_error.h" #ifdef ZEN_WIN -#include "scope_guard.h" -#include "win.h" //includes "windows.h" + #include "scope_guard.h" + #include "win.h" //includes "windows.h" #elif defined ZEN_LINUX || defined ZEN_MAC -#include "thread.h" -#include //::system() + #include "thread.h" + #include //::system() #endif diff --git a/zen/stl_tools.h b/zen/stl_tools.h index eb94b4a1..a8f2a9b5 100644 --- a/zen/stl_tools.h +++ b/zen/stl_tools.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -164,8 +164,8 @@ bool equal(InputIterator1 first1, InputIterator1 last1, #if defined _MSC_VER && _MSC_VER <= 1600 -//VS2010 performance bug in std::unordered_set<>: http://drdobbs.com/blogs/cpp/232200410 -> should be fixed in VS11 -static_assert(false, ""); + //VS2010 performance bug in std::unordered_set<>: http://drdobbs.com/blogs/cpp/232200410 -> should be fixed in VS11 + static_assert(false, ""); #endif } diff --git a/zen/string_base.h b/zen/string_base.h index 0f9ad479..b1d7102e 100644 --- a/zen/string_base.h +++ b/zen/string_base.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -74,7 +74,7 @@ protected: assert(newCapacity >= minCapacity); Descriptor* const newDescr = static_cast(this->allocate(sizeof(Descriptor) + (newCapacity + 1) * sizeof(Char))); //throw std::bad_alloc - new (newDescr) Descriptor(size, newCapacity); + new (newDescr) Descriptor(size, newCapacity); return reinterpret_cast(newDescr + 1); //alignment note: "newDescr + 1" is Descriptor-aligned, which is larger than alignment for Char-array! => no problem! } @@ -86,14 +86,14 @@ protected: return newData; } - void destroy(Char* ptr) - { + void destroy(Char* ptr) + { if (!ptr) return; //support "destroy(nullptr)" - Descriptor* const d = descr(ptr); - d->~Descriptor(); - this->deallocate(d); - } + Descriptor* const d = descr(ptr); + d->~Descriptor(); + this->deallocate(d); + } //this needs to be checked before writing to "ptr" static bool canWrite(const Char* ptr, size_t minCapacity) { return minCapacity <= descr(ptr)->capacity; } @@ -164,7 +164,7 @@ protected: static bool canWrite(const Char* ptr, size_t minCapacity) //needs to be checked before writing to "ptr" { const Descriptor* const d = descr(ptr); - assert(d->refCount > 0); + assert(d->refCount > 0); return d->refCount == 1 && minCapacity <= d->capacity; } @@ -180,7 +180,7 @@ private: struct Descriptor { Descriptor(size_t len, size_t cap) : - refCount(1), + refCount(1), length (static_cast(len)), capacity(static_cast(cap)) { static_assert(ATOMIC_INT_LOCK_FREE == 2, ""); } //2: "the types are always lock-free" diff --git a/zen/string_tools.h b/zen/string_tools.h index addf2bd5..1b8595c7 100644 --- a/zen/string_tools.h +++ b/zen/string_tools.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/string_traits.h b/zen/string_traits.h index ba97397c..8bc55a6a 100644 --- a/zen/string_traits.h +++ b/zen/string_traits.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -82,10 +82,10 @@ template struct GetCharTypeImpl : ResultType struct GetCharTypeImpl : - ResultType< - typename SelectIf::value, wchar_t, - typename SelectIf::value, char, NullType>::Type - >::Type> + ResultType< + typename SelectIf::value, wchar_t, + typename SelectIf::value, char, NullType>::Type + >::Type> { //typedef typename S::value_type Type; /*DON'T use S::value_type: diff --git a/zen/symlink_target.h b/zen/symlink_target.h index 4106ed02..1a7f45bd 100644 --- a/zen/symlink_target.h +++ b/zen/symlink_target.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -11,22 +11,22 @@ #include "file_error.h" #ifdef ZEN_WIN -#include "win.h" //includes "windows.h" -#include "privilege.h" -#include "long_path_prefix.h" -#include "dll.h" + #include "win.h" //includes "windows.h" + #include "privilege.h" + #include "long_path_prefix.h" + #include "dll.h" #elif defined ZEN_LINUX || defined ZEN_MAC -#include -#include //realpath + #include + #include //realpath #endif namespace zen { #ifdef ZEN_WIN -bool isSymlink(const WIN32_FIND_DATA& data); //*not* a simple FILE_ATTRIBUTE_REPARSE_POINT check! -bool isSymlink(DWORD fileAttributes, DWORD reparseTag); + bool isSymlink(const WIN32_FIND_DATA& data); //*not* a simple FILE_ATTRIBUTE_REPARSE_POINT check! + bool isSymlink(DWORD fileAttributes, DWORD reparseTag); #endif Zstring getResolvedFilePath(const Zstring& linkPath); //throw FileError; Win: requires Vista or later! diff --git a/zen/sys_error.h b/zen/sys_error.h index 9cfc762f..9f7667db 100644 --- a/zen/sys_error.h +++ b/zen/sys_error.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -13,11 +13,11 @@ #include "scope_guard.h" #ifdef ZEN_WIN -#include "win.h" //includes "windows.h" + #include "win.h" //includes "windows.h" #elif defined ZEN_LINUX || defined ZEN_MAC -#include -#include + #include + #include #endif @@ -25,11 +25,11 @@ namespace zen { //evaluate GetLastError()/errno and assemble specific error message #ifdef ZEN_WIN -typedef DWORD ErrorCode; + typedef DWORD ErrorCode; #elif defined ZEN_LINUX || defined ZEN_MAC -typedef int ErrorCode; + typedef int ErrorCode; #else -#error define a platform! + #error define a platform! #endif ErrorCode getLastError(); diff --git a/zen/thread.h b/zen/thread.h index a834f070..cca2561f 100644 --- a/zen/thread.h +++ b/zen/thread.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -12,27 +12,27 @@ //workaround this pathetic boost thread warning mess #ifdef __GNUC__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wswitch-enum" -#pragma GCC diagnostic ignored "-Wstrict-aliasing" -#pragma GCC diagnostic ignored "-Wredundant-decls" -#pragma GCC diagnostic ignored "-Wshadow" -#ifndef __clang__ //clang defines __GNUC__, but doesn't support this warning -#pragma GCC diagnostic ignored "-Wunused-local-typedefs" -#endif + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wswitch-enum" + #pragma GCC diagnostic ignored "-Wstrict-aliasing" + #pragma GCC diagnostic ignored "-Wredundant-decls" + #pragma GCC diagnostic ignored "-Wshadow" + #ifndef __clang__ //clang defines __GNUC__, but doesn't support this warning + #pragma GCC diagnostic ignored "-Wunused-local-typedefs" + #endif #endif #ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable : 4702 4913) //unreachable code; user defined binary operator ',' exists but no overload could convert all operands, default built-in binary operator ',' used + #pragma warning(push) + #pragma warning(disable : 4702 4913) //unreachable code; user defined binary operator ',' exists but no overload could convert all operands, default built-in binary operator ',' used #endif #include #ifdef __GNUC__ -#pragma GCC diagnostic pop + #pragma GCC diagnostic pop #endif #ifdef _MSC_VER -#pragma warning(pop) + #pragma warning(pop) #endif namespace zen @@ -85,7 +85,7 @@ private: //###################### implementation ###################### #ifndef BOOST_HAS_THREADS -#error just some paranoia check... + #error just some paranoia check... #endif template inline diff --git a/zen/tick_count.h b/zen/tick_count.h index 56179b62..bedc66a5 100644 --- a/zen/tick_count.h +++ b/zen/tick_count.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -12,13 +12,13 @@ #include "basic_math.h" #ifdef ZEN_WIN -#include "win.h" //includes "windows.h" + #include "win.h" //includes "windows.h" #elif defined ZEN_LINUX -#include //Posix ::clock_gettime() + #include //Posix ::clock_gettime() #elif defined ZEN_MAC -#include + #include #endif //template inline //T dist(T a, T b) diff --git a/zen/time.h b/zen/time.h index e53e4c6e..4593c48b 100644 --- a/zen/time.h +++ b/zen/time.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/type_tools.h b/zen/type_tools.h index 1f782a2d..95e49769 100644 --- a/zen/type_tools.h +++ b/zen/type_tools.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/type_traits.h b/zen/type_traits.h index 8e85a7b2..082baea9 100644 --- a/zen/type_traits.h +++ b/zen/type_traits.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/utf.h b/zen/utf.h index e742c1e2..42758c35 100644 --- a/zen/utf.h +++ b/zen/utf.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/warn_static.h b/zen/warn_static.h index b9673ed6..1e942031 100644 --- a/zen/warn_static.h +++ b/zen/warn_static.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/win.h b/zen/win.h index 40a157f5..121e6a9c 100644 --- a/zen/win.h +++ b/zen/win.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -9,20 +9,20 @@ //------------------------------------------------------ #ifdef __WXMSW__ //we have wxWidgets -#include //includes "windows.h" -//------------------------------------------------------ + #include //includes "windows.h" + //------------------------------------------------------ #else -//#define WIN32_LEAN_AND_MEAN + //#define WIN32_LEAN_AND_MEAN -#ifndef NOMINMAX -#define NOMINMAX -#endif + #ifndef NOMINMAX + #define NOMINMAX + #endif -#ifndef STRICT -#define STRICT //improve type checking -#endif + #ifndef STRICT + #define STRICT //improve type checking + #endif -#include + #include #endif //------------------------------------------------------ diff --git a/zen/win_ver.h b/zen/win_ver.h index 1d7ce7f0..97b6d7e1 100644 --- a/zen/win_ver.h +++ b/zen/win_ver.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -10,6 +10,8 @@ #include #include #include "win.h" //includes "windows.h" +#include "build_info.h" +#include "dll.h" namespace zen { @@ -33,6 +35,7 @@ const OsVersion osVersionWin7 (6, 1); const OsVersion osVersionWinVista (6, 0); const OsVersion osVersionWinServer2003(5, 2); const OsVersion osVersionWinXp (5, 1); +const OsVersion osVersionWin2000 (5, 0); /* NOTE: there are two basic APIs to check Windows version: (empiric study following) @@ -53,6 +56,8 @@ inline bool winXpOrLater () { using namespace std::rel_ops; return getOsV bool isRealOsVersion(const OsVersion& ver); +bool runningWOW64(); +bool running64BitWindows(); @@ -98,6 +103,30 @@ bool isRealOsVersion(const OsVersion& ver) return rv; } + + +inline +bool runningWOW64() //test if process is running under WOW64: http://msdn.microsoft.com/en-us/library/ms684139(VS.85).aspx +{ + typedef BOOL (WINAPI* IsWow64ProcessFun)(HANDLE hProcess, PBOOL Wow64Process); + + const SysDllFun isWow64Process(L"kernel32.dll", "IsWow64Process"); + if (isWow64Process) + { + BOOL isWow64 = FALSE; + if (isWow64Process(::GetCurrentProcess(), &isWow64)) + return isWow64 != FALSE; + } + return false; +} + + +inline +bool running64BitWindows() //http://blogs.msdn.com/b/oldnewthing/archive/2005/02/01/364563.aspx +{ + static_assert(zen::is32BitBuild || zen::is64BitBuild, ""); + return is64BitBuild || runningWOW64(); //should we bother to make this a compile-time check? +} } #endif //WINDOWS_VERSION_HEADER_238470348254325 diff --git a/zen/xml_io.cpp b/zen/xml_io.cpp index 9ac4b87f..a070b526 100644 --- a/zen/xml_io.cpp +++ b/zen/xml_io.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/xml_io.h b/zen/xml_io.h index e3e47f59..16e01aff 100644 --- a/zen/xml_io.h +++ b/zen/xml_io.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** diff --git a/zen/zstring.cpp b/zen/zstring.cpp index a2a26f83..d87e7989 100644 --- a/zen/zstring.cpp +++ b/zen/zstring.cpp @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -9,17 +9,16 @@ #include #ifdef ZEN_WIN -#include "dll.h" -#include "win_ver.h" + #include "dll.h" + #include "win_ver.h" #elif defined ZEN_MAC -#include //toupper() + #include //toupper() #endif #ifndef NDEBUG -#include -#include -#include "thread.h" + #include + #include #endif using namespace zen; @@ -40,14 +39,14 @@ public: void insert(const void* ptr, size_t size) { - boost::lock_guard dummy(lockActStrings); + std::lock_guard dummy(lockActStrings); if (!activeStrings.emplace(ptr, size).second) reportProblem("Serious Error: New memory points into occupied space: " + rawMemToString(ptr, size)); } void remove(const void* ptr) { - boost::lock_guard dummy(lockActStrings); + std::lock_guard dummy(lockActStrings); if (activeStrings.erase(ptr) != 1) reportProblem("Serious Error: No memory available for deallocation at this location!"); } @@ -96,7 +95,7 @@ private: throw std::logic_error("Memory leak! " + message); } - boost::mutex lockActStrings; + std::mutex lockActStrings; std::unordered_map activeStrings; }; @@ -168,8 +167,8 @@ int cmpFileName(const Zstring& lhs, const Zstring& rhs) //do NOT use "CompareString"; this function is NOT accurate (even with LOCALE_INVARIANT and SORT_STRINGSORT): for example "wei" == "weiss"!!! //the only reliable way to compare filepaths (with XP) is to call "CharUpper" or "LCMapString": - const size_t sizeLhs = lhs.size(); - const size_t sizeRhs = rhs.size(); + const size_t sizeLhs = lhs.size(); + const size_t sizeRhs = rhs.size(); const auto minSize = std::min(sizeLhs, sizeRhs); diff --git a/zen/zstring.h b/zen/zstring.h index 94144386..0610a27f 100644 --- a/zen/zstring.h +++ b/zen/zstring.h @@ -1,6 +1,6 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl.html * +// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** @@ -10,7 +10,7 @@ #include "string_base.h" #ifdef ZEN_LINUX -#include //strcmp + #include //strcmp #endif @@ -49,14 +49,14 @@ public: //############################## helper functions ############################################# #ifdef ZEN_WIN //Windows encodes Unicode as UTF-16 wchar_t -typedef wchar_t Zchar; -#define Zstr(x) L ## x -const Zchar FILE_NAME_SEPARATOR = L'\\'; + typedef wchar_t Zchar; + #define Zstr(x) L ## x + const Zchar FILE_NAME_SEPARATOR = L'\\'; #elif defined ZEN_LINUX || defined ZEN_MAC //Linux uses UTF-8 -typedef char Zchar; -#define Zstr(x) x -const Zchar FILE_NAME_SEPARATOR = '/'; + typedef char Zchar; + #define Zstr(x) x + const Zchar FILE_NAME_SEPARATOR = '/'; #endif //"The reason for all the fuss above" - Loki/SmartPtr @@ -79,7 +79,7 @@ struct EqualFilename //case-insensitive on Windows, case-sensitive on Linux }; #if defined ZEN_WIN || defined ZEN_MAC -Zstring makeUpperCopy(const Zstring& str); + Zstring makeUpperCopy(const Zstring& str); #endif inline -- cgit