diff options
| author | Daniel Wilhelm <shieldwed@outlook.com> | 2018-05-09 00:07:03 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <shieldwed@outlook.com> | 2018-05-09 00:07:03 +0200 |
| commit | 1aab211abb68b40cefb5024d0be373589c9c8f99 (patch) | |
| tree | 2da4ead196df622081ac45b29678e92ed30476a3 | |
| parent | 9.5 (diff) | |
| download | FreeFileSync-1aab211abb68b40cefb5024d0be373589c9c8f99.tar.gz FreeFileSync-1aab211abb68b40cefb5024d0be373589c9c8f99.tar.bz2 FreeFileSync-1aab211abb68b40cefb5024d0be373589c9c8f99.zip | |
9.6
244 files changed, 4452 insertions, 4008 deletions
diff --git a/Changelog.txt b/Changelog.txt index 30904ccb..acf06a4d 100755 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,19 @@ +FreeFileSync 9.6 +---------------- +New installation command line option /disable_updates +Fixed crash when closing main dialog during sync +Fixed RealTimeSync crash after recursive mutex locking +Improved file copy performance on macOS +Clean up obsolete files during installation +Don't use threads for running async command line (Linux) +Avoid main dialog flash after minimized sync +Disable file list export until after comparison +Directly close progress dialog during sync +Redirect escape key from main dialog to progress dialog +Fixed startup delay during consistency checks +Updated translation files + + FreeFileSync 9.5 [2017-11-05] ----------------------------- Allow to change error handling option on progress dialogs diff --git a/FreeFileSync/Build/Help/html/command-line.html b/FreeFileSync/Build/Help/html/command-line.html index c58d5248..3bde31e8 100755 --- a/FreeFileSync/Build/Help/html/command-line.html +++ b/FreeFileSync/Build/Help/html/command-line.html @@ -66,9 +66,8 @@ <div class="half-line"> </div> <ul style="margin: 0"> - <li>Enable checkbox <b>Run minimized</b> or have <b>On completion</b> automatically close the results dialog after synchronization. - - <li>Set error handling to <b>Stop</b> or <b>Ignore</b> instead of <i>Pop-up</i>. + <li>Set <i>When finished</i> to <b>Exit</b> to skip the summary dialog after synchronization. + <li>Set up error handling to <b>Ignore errors</b> or <b>Cancel</b> to stop the synchronization at the first error. </ul> </div> <br> diff --git a/FreeFileSync/Build/Help/html/schedule-a-batch-job.html b/FreeFileSync/Build/Help/html/schedule-a-batch-job.html index 17f5db64..200df6e0 100755 --- a/FreeFileSync/Build/Help/html/schedule-a-batch-job.html +++ b/FreeFileSync/Build/Help/html/schedule-a-batch-job.html @@ -16,20 +16,20 @@ <br><br> - <li>By default, FreeFileSync will show a progress dialog during synchronization and will wait while the results dialog is shown. - If the progress dialog is not needed, enable checkbox <b>Run minimized</b>. This will also skip the results dialog at the end. - <br><br> - Alternatively, if you want to see the progress, but not to wait at the results dialog, it's sufficient to only select the <i>On completion</i> action <b>Close progress dialog</b>. + <li>By default, FreeFileSync will show a progress dialog during synchronization and will wait while the summary dialog is shown. + If the progress dialog is not needed, enable checkbox <b>Run minimized</b> and + also set <i>When finished</i> to <b>Exit</b> if you want to skip the summary dialog at the end. <br><br> <div class="bluebox"> <b>Note</b><br> - Even if the progress dialog is not shown at the beginning, you can make it visible later <b>during</b> + Even if the progress dialog is not shown at the beginning, you can make it visible at any time <b>during</b> synchronization by double-clicking the FreeFileSync icon in the notification area. </div> <br> - <li>If you don't want error or warning messages to interrupt synchronization, set <b>Handle errors</b> to either <b>Ignore</b> or <b>Stop</b>.<br> + <li>If you don't want error or warning messages to stall synchronization when no user is available to respond, + either check <b>Ignore errors</b> or set <b>Cancel</b> to stop the synchronization at the first error.<br> <li>If log files are required, enable <b>Save log</b> and enter a folder path. diff --git a/FreeFileSync/Build/Help/images/filter-zero-file-size.png b/FreeFileSync/Build/Help/images/filter-zero-file-size.png Binary files differindex 59ce29fe..7bb88f66 100755 --- a/FreeFileSync/Build/Help/images/filter-zero-file-size.png +++ b/FreeFileSync/Build/Help/images/filter-zero-file-size.png diff --git a/FreeFileSync/Build/Help/images/main-window.png b/FreeFileSync/Build/Help/images/main-window.png Binary files differindex 2b51d3a6..667e45a1 100755 --- a/FreeFileSync/Build/Help/images/main-window.png +++ b/FreeFileSync/Build/Help/images/main-window.png diff --git a/FreeFileSync/Build/Help/images/realtimesync-monitor-usb.png b/FreeFileSync/Build/Help/images/realtimesync-monitor-usb.png Binary files differindex 9f83fba3..f6f3e78a 100755 --- a/FreeFileSync/Build/Help/images/realtimesync-monitor-usb.png +++ b/FreeFileSync/Build/Help/images/realtimesync-monitor-usb.png diff --git a/FreeFileSync/Build/Help/images/setup-batch-job.png b/FreeFileSync/Build/Help/images/setup-batch-job.png Binary files differindex 2545af21..76a27a12 100755 --- a/FreeFileSync/Build/Help/images/setup-batch-job.png +++ b/FreeFileSync/Build/Help/images/setup-batch-job.png diff --git a/FreeFileSync/Build/Help/images/synchronization-settings.png b/FreeFileSync/Build/Help/images/synchronization-settings.png Binary files differindex c5aded2a..c7bffa5f 100755 --- a/FreeFileSync/Build/Help/images/synchronization-settings.png +++ b/FreeFileSync/Build/Help/images/synchronization-settings.png diff --git a/FreeFileSync/Build/Languages/arabic.lng b/FreeFileSync/Build/Languages/arabic.lng index ed471da1..db7feb3a 100755 --- a/FreeFileSync/Build/Languages/arabic.lng +++ b/FreeFileSync/Build/Languages/arabic.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>التحقق من توافر سلة المحذوفات من أجل المجلد %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>سلة المهملات غير متوفرة للمجلدات التالية. سيتم حذف الملفات بشكل نهائي بدلاً عن ذلك:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>سلة المهملات غير مدعومة بواسطة المجلدات التالية. لن تتمكن من استعادة الملفات المحذوفة أو التي يتم استبدالها:</target> <source>An exception occurred</source> <target>حدث استثناء</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>بنية:</target> -<source>global config file:</source> -<target>ملف الخيارات العام:</target> - <source>config files:</source> <target>ملفات الخيارات:</target> <source>directory</source> <target>مسار</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>تحديد مسار مختلف لملف GlobalSettings.xml.</target> +<source>global config file:</source> +<target>ملف الخيارات العام:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>أي عدد من ملفات تكوين FreeFileSync بامتداد .ffs_gui أو/و .ffs_batch.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>أي عدد من أزواج المسارات البديلة من أجل ملف خيارات واحد.</target> -<source>Open configuration for editing without executing it.</source> -<target>فتح التكوين للتحرير دون تنفيذه.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>فتح التكوين المحدد لتعديله فقط بدون تنفيذه.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>تحديد مسار مختلف لملف GlobalSettings.xml.</target> <source>Cannot find the following folders:</source> <target>تعذر العثور على المجلدات التالية:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>تحديث السمات على اليسار</target> -<source>Cannot write file %x.</source> -<target>لا يمكن كتابة الملف %x.</target> +<source>Cannot read file %x.</source> +<target>لا يمكن قراءة الملف %x.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Actual: %y bytes <source>Operation not supported for different base folder types.</source> <target>العملية غير مدعومة لأنواع المجلدات مختلفة الأساس.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>لا يمكن نسخ الرابط الرمزي من %x إلى %y.</target> +<source>Cannot write file %x.</source> +<target>لا يمكن كتابة الملف %x.</target> <source>Cannot move file %x to %y.</source> <target>لا يمكن نقل الملف %x إلى %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>لا يمكن نسخ الرابط الرمزي من %x إلى %y.</target> + <source>Unable to connect to %x.</source> <target>لا يمكن الاتصال بـ %x.</target> @@ -294,9 +297,6 @@ Actual: %y bytes <source>Cannot read file attributes of %x.</source> <target>لا يمكن قراءة سمات الملف %x.</target> -<source>Cannot read file %x.</source> -<target>لا يمكن قراءة الملف %x.</target> - <source>Cannot create directory %x.</source> <target>لا يمكن إنشاء المسار %x.</target> @@ -616,8 +616,8 @@ The command is triggered if: <source>Automated Synchronization</source> <target>مزامنة تلقائية</target> -<source>The following path does not support directory monitoring:</source> -<target>المسار التالي لا يدعم مراقبة الدليل:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>بروتوكول %x لا يدعم مراقبة المجلدات:</target> <source>Directory monitoring active</source> <target>مراقبة المسارات فعالة</target> @@ -733,8 +733,8 @@ The command is triggered if: <source>Base folder:</source> <target>المجلد الأساس:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>سيتم مزامنة مجلد الإصدار لأنه موجود في المجلد الأساس.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>مجلد الإصدار موجود داخل مجلد أساس.</target> <source>Synchronizing folder pair:</source> <target>مزامنة زوج مجلدات:</target> @@ -748,6 +748,15 @@ The command is triggered if: <source>job name</source> <target>اسم المهمة</target> +<source>Show summary</source> +<target>إظهار الملخص</target> + +<source>Sleep</source> +<target>سكون</target> + +<source>Shut down</source> +<target>إيقاف التشغيل</target> + <source>Synchronization stopped</source> <target>توقفت عملية المزامنة</target> @@ -769,6 +778,9 @@ The command is triggered if: <source>Synchronization completed successfully</source> <target>تمت المزامنة بنجاح</target> +<source>Executing command %x</source> +<target>تنفيذ الأمر %x</target> + <source>Cleaning up old log files...</source> <target>جاري تنظيف ملفات المتابعة القديمة...</target> @@ -800,8 +812,8 @@ The command is triggered if: <pluralform>إعادة المحاولة بعد %x ثانية...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&تجاهلا الأخطاء المماثلة</target> +<source>Ignore &all</source> +<target>تجاهل &الكل</target> <source>Retrying operation...</source> <target>إعادة محاولة العملية...</target> @@ -908,12 +920,12 @@ The command is triggered if: <source>&Find...</source> <target>&بحث...</target> -<source>&Reset layout</source> -<target>إعادة ال&تنسيق إلى الإفتراضي</target> - <source>&Export file list...</source> <target>&تصدير قائمة الملفات...</target> +<source>&Reset layout</source> +<target>إعادة ال&تنسيق إلى الإفتراضي</target> + <source>&Tools</source> <target>أ&دوات</target> @@ -1049,9 +1061,6 @@ The command is triggered if: <source>C&lear</source> <target>إ&زالة</target> -<source>Detect synchronization directions with the help of database files</source> -<target>تحديد اتجاه المزامنة بالاستعانة بقواعد بيانات الملفات</target> - <source>Detect moved files</source> <target>اكتشاف الملفات المنقولة</target> @@ -1072,38 +1081,23 @@ The command is triggered if: <source>&Recycle bin</source> <target>&سلة المهملات</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>نسخ احتياطي للملفات المحذوفة و المستبدلة في سلة المهملات</target> - <source>&Permanent</source> <target>&دائم</target> -<source>Delete or overwrite files permanently</source> -<target>حذف أو الكتابة فوق الملفات بشكل دائم</target> - <source>&Versioning</source> <target>ال&وسم حسب الإصدار</target> -<source>Move files to a user-defined folder</source> -<target>نقل الملفات إلى المجلد المحدد من قبل المستخدم</target> - <source>Naming convention:</source> <target>اصطلاح التسمية:</target> -<source>Handle errors:</source> -<target>التعامل مع الأخطاء:</target> - -<source>&Pop-up</source> -<target>&منبثق</target> +<source>&Ignore errors</source> +<target>&تجاهل الأخطاء</target> <source>Show pop-up on errors or warnings</source> <target>إظهار إطارات منبثقة عند حصول أخطاء أو تحذيرات</target> -<source>Hide all error and warning messages</source> -<target>إخفاء جميع رسائل الأخطاء و التحذير</target> - -<source>On completion:</source> -<target>عند الانتهاء:</target> +<source>Run a command after synchronization:</source> +<target>تشغيل أمر بعد المزامنة:</target> <source>OK</source> <target>موافق</target> @@ -1141,6 +1135,9 @@ The command is triggered if: <source>&Key file</source> <target>&ملف المفتاح</target> +<source>&SSH agent</source> +<target>&عميل بروتوكول SSH</target> + <source>User name:</source> <target>اسم المستخدم:</target> @@ -1159,11 +1156,8 @@ The command is triggered if: <source>How to get best performance?</source> <target>كيفية الحصول على أفضل أداء؟</target> -<source>SSH connections for directory reading:</source> -<target>اتصالات SSH لقراءة الدليل:</target> - -<source>Suggested range: [1 - 10]</source> -<target>النطاق المقترح: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>عدد الاتصالات لقراءة المجلد:</target> <source>SFTP channels per connection:</source> <target>قنوات SFTP لكل اتصال:</target> @@ -1171,9 +1165,6 @@ The command is triggered if: <source>Detect server limit</source> <target>اكتشاف حد الخادم</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>اتصالان × 10 قنوات = 20 مرات قراءة الدليل أسرع</target> - <source>Select a directory on the server:</source> <target>تحديد دليل على الخادم:</target> @@ -1213,6 +1204,9 @@ The command is triggered if: <source>Bytes copied:</source> <target>Bytes المنسوخة:</target> +<source>When finished:</source> +<target>عند الانتهاء:</target> + <source>Close</source> <target>إغلاق</target> @@ -1225,15 +1219,18 @@ The command is triggered if: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>إنشاء ملف دفعي من أجل عمليات المزامنة غير المحضورة. للبدأ, انقر نقراً مزدوجاً على الملف أو المهمة المجدولة في منظم المهام: %x</target> -<source>&Stop</source> -<target>&توقف</target> +<source>Run minimized</source> +<target>تشغيل بوضع التصغير</target> + +<source>&Show error dialog</source> +<target>&إظهار نافذة الأخطاء</target> + +<source>&Cancel</source> +<target>&إلغاء</target> <source>Stop synchronization at first error</source> <target>إحباط المزامنة عند أول خطأ</target> -<source>Run minimized</source> -<target>تشغيل بوضع التصغير</target> - <source>Save log:</source> <target>حفظ السجل:</target> @@ -1264,14 +1261,14 @@ This guarantees a consistent state even in case of a serious error. هذه العملية تضمن حالة مستقرة حتى في حال حدوث خطأ فادح. </target> -<source>(recommended)</source> -<target>(موصى به)</target> +<source>recommended</source> +<target>منصوح به</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>نسخ الملفات المشتركة مع مستخدمين آخرين أو المقفولة باستخدام خدمة نسخ الظل الوسيط.</target> -<source>(requires administrator rights)</source> -<target>(بحاجة امتيازات المدير)</target> +<source>requires administrator rights</source> +<target>يتطلب صلاحيات مسؤول</target> <source>Transfer file and folder permissions.</source> <target>نقل أذونات الملفات و المجلدات.</target> @@ -1303,14 +1300,17 @@ This guarantees a consistent state even in case of a serious error. <source>Source code written in C++ using:</source> <target>الرماز المصدري مكتوب بلغة C++ باستخدام:</target> -<source>Donation details</source> -<target>تفاصيل التبرع</target> - <source>If you like FreeFileSync:</source> <target>إذا أعجبك FreeFileSync:</target> -<source>Donate with PayPal</source> -<target>تبرع باستخدام PayPal</target> +<source>Support with a donation</source> +<target>دعم عبر التبرع</target> + +<source>Donation details</source> +<target>تفاصيل التبرع</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>تم تعطيل المحدث التلقائي بواسطة المسؤول.</target> <source>Feedback and suggestions are welcome</source> <target>التعليقات و الاقتراحات موضع ترحيب</target> @@ -1348,7 +1348,7 @@ This guarantees a consistent state even in case of a serious error. <source>Activate offline</source> <target>تنشيط دون اتصال</target> -<source>Save as Batch Job</source> +<source>Save as a Batch Job</source> <target>حفظ كمهمة دفعية</target> <source>Delete Items</source> @@ -1387,11 +1387,17 @@ This guarantees a consistent state even in case of a serious error. <source>Overview</source> <target>نظرة عامة</target> +<source>Show "%x"</source> +<target>إظهار "%x"</target> + <source>&Show details</source> <target>&عرض التفاصيل</target> -<source>A new version of FreeFileSync is available:</source> -<target>يتوفر إصدار جديد من FreeFileSync:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x متوفر!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>ملفات التثبيت تالفة. الرجاء إعادة تثبيت FreeFileSync.</target> <source>Local path not available for %x.</source> <target>المسار المحلي غير متوفر لـ %x.</target> @@ -1499,9 +1505,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>حدد المجال الزمني...</target> -<source>Show "%x"</source> -<target>إظهار "%x"</target> - <source>Last session</source> <target>مصدر الجلسة</target> @@ -1601,18 +1604,6 @@ This guarantees a consistent state even in case of a serious error. <source>Searching for program updates...</source> <target>جاري البحث عن تحديثات للبرنامج...</target> -<source>Close progress dialog</source> -<target>إنهاء نافذة حوار تقدم العملية</target> - -<source>Log off</source> -<target>تسجيل الخروج</target> - -<source>Standby</source> -<target>وضع الاستعداد</target> - -<source>Shut down</source> -<target>إيقاف التشغيل</target> - <source>Paused</source> <target>تم الإيقاف مؤقتاً</target> @@ -1643,18 +1634,21 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>السجل</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>ملفات التثبيت تالفة. الرجاء إعادة تثبيت FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>شكرا لك، %x, للتبرع والدعم.</target> +<source>Recommended range:</source> +<target>النطاق المستحسن:</target> + <source>Password:</source> <target>كلمة المرور:</target> <source>Key password:</source> <target>كلمة المرور الرئيسية:</target> +<source>Please enter a file path.</source> +<target>الرجاء إدخال مسار الملف.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1781,6 +1775,15 @@ This guarantees a consistent state even in case of a serious error. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>الاحتفاظ بالملفات المحذوفة والمستبدلة في سلة المهملات</target> + +<source>Delete and overwrite files permanently</source> +<target>حذف واستبدال الملفات نهائيا</target> + +<source>Move files to a user-defined folder</source> +<target>نقل الملفات إلى المجلد المحدد من قبل المستخدم</target> + <source>Replace</source> <target>استبدال</target> @@ -1793,6 +1796,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>إلحاق ختم زمني بكل اسم ملف</target> +<source>On completion:</source> +<target>عند الانتهاء:</target> + +<source>On errors:</source> +<target>عند حصول أخطاء:</target> + +<source>On success:</source> +<target>عند النجاح:</target> + <source>Main config</source> <target>التكوين الرئيسي</target> @@ -1814,9 +1826,6 @@ This guarantees a consistent state even in case of a serious error. <source>Name</source> <target>الاسم</target> -<source>Items</source> -<target>عناصر</target> - <source>Percentage</source> <target>النسبة المئوية</target> @@ -1958,6 +1967,9 @@ This guarantees a consistent state even in case of a serious error. <source>Cannot change process I/O priorities.</source> <target>تعذر تغيير أولويات I/O للعملية.</target> +<source>Unable to shut down the system.</source> +<target>غير فادر على إيقاف تشغيل النظام.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>فشل تصفح سلة المهملات من أجل الملف %x.</target> @@ -1982,9 +1994,6 @@ This guarantees a consistent state even in case of a serious error. <source>Portable</source> <target>متنقل</target> -<source>recommended</source> -<target>منصوح به</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>حفظ الإعدادات إلى "%APPDATA%\FreeFileSync"</target> @@ -2036,8 +2045,8 @@ This guarantees a consistent state even in case of a serious error. <source>Edit with FreeFileSync</source> <target>تعديل بواسطة FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>النسخة المحمولة لا يمكن تثبيتها في المجلد المحدد.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>لا يمكن تثبيت النسخة المحمولة من FreeFileSync في مجلد فرعي داخل %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>الرجاء اختيار نوع التثبيت المحلي أو اختيار مجلد آخر للتثبيت.</target> diff --git a/FreeFileSync/Build/Languages/bulgarian.lng b/FreeFileSync/Build/Languages/bulgarian.lng index 9aba3ab4..e82f9a12 100755 --- a/FreeFileSync/Build/Languages/bulgarian.lng +++ b/FreeFileSync/Build/Languages/bulgarian.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Проверява достъпността на кошчето за папка %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Кошчето е недостъпно за следните папки. Вместо това ще изтрие необратимо файловете:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>Кошчето не се поддържа от следните папки. Изтритите или презаписани файлове няма да могат да се възстановяват:</target> <source>An exception occurred</source> <target>Възникна изключение</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Синтаксис:</target> -<source>global config file:</source> -<target>глобален конфигурационен файл:</target> - <source>config files:</source> <target>конфигурационни файлове:</target> <source>directory</source> <target>директория</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Път до алтернативен файл GlobalSettings.xml.</target> +<source>global config file:</source> +<target>глобален конфигурационен файл:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Произволен брой FreeFileSync-конфигурационни-файлове .ffs_gui и/или .ffs_batch.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Произволен брой алтернативни двойки директории за най-много един конфигурационен файл.</target> -<source>Open configuration for editing without executing it.</source> -<target>Отвори конфигурацията за редактиране без изпълнение.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Отвори избраната конфигурация само за редактиране, без да се изпълнява.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Път до алтернативен файл GlobalSettings.xml.</target> <source>Cannot find the following folders:</source> <target>Не са намерени следните папки:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Актуализирай атрибутите на десния елемент</target> -<source>Cannot write file %x.</source> -<target>Не може да запише файл %x.</target> +<source>Cannot read file %x.</source> +<target>Не може да прочете файл %x.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Actual: %y bytes <source>Operation not supported for different base folder types.</source> <target>Операцията не се поддържа за различни типове основни папки.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Не може да копира символната връзка %x в %y.</target> +<source>Cannot write file %x.</source> +<target>Не може да запише файл %x.</target> <source>Cannot move file %x to %y.</source> <target>Не може да премести файл %x в %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Не може да копира символната връзка %x в %y.</target> + <source>Unable to connect to %x.</source> <target>Не може да се свърже със %x.</target> @@ -294,9 +297,6 @@ Actual: %y bytes <source>Cannot read file attributes of %x.</source> <target>Не може да прочете атрибутите на файл %x.</target> -<source>Cannot read file %x.</source> -<target>Не може да прочете файл %x.</target> - <source>Cannot create directory %x.</source> <target>Не може да създаде директория %x.</target> @@ -596,8 +596,8 @@ The command is triggered if: <source>Automated Synchronization</source> <target>Автоматична синхронизация</target> -<source>The following path does not support directory monitoring:</source> -<target>Посочения път не поддържа следене на директория:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>Протоколът %x не поддържа следене на директорията:</target> <source>Directory monitoring active</source> <target>Следенето на директории е активирано</target> @@ -713,8 +713,8 @@ The command is triggered if: <source>Base folder:</source> <target>Базова папка:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>Папката за версии ще бъде синхронизирана, понеже се съдържа в базовата папка.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>Папката за версии се съдържа в основната папка.</target> <source>Synchronizing folder pair:</source> <target>Синхронизация на двойка папки:</target> @@ -728,6 +728,15 @@ The command is triggered if: <source>job name</source> <target>име на задачата</target> +<source>Show summary</source> +<target>Покажи резюме</target> + +<source>Sleep</source> +<target>Заспиване</target> + +<source>Shut down</source> +<target>Изключване</target> + <source>Synchronization stopped</source> <target>Синхронизацията е спряна</target> @@ -749,6 +758,9 @@ The command is triggered if: <source>Synchronization completed successfully</source> <target>Синхронизацията завърши успешно</target> +<source>Executing command %x</source> +<target>Изпълнява команда %x</target> + <source>Cleaning up old log files...</source> <target>Изчиства старите log-файлове...</target> @@ -776,8 +788,8 @@ The command is triggered if: <pluralform>Автоматично повтаряне след %x сек...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Игнорирай следващите грешки</target> +<source>Ignore &all</source> +<target>Игнорирай &всички</target> <source>Retrying operation...</source> <target>Повтаря операцията...</target> @@ -884,12 +896,12 @@ The command is triggered if: <source>&Find...</source> <target>&Намери...</target> -<source>&Reset layout</source> -<target>&Инициализирай изгледа</target> - <source>&Export file list...</source> <target>&Експортирай файловия списък...</target> +<source>&Reset layout</source> +<target>&Инициализирай изгледа</target> + <source>&Tools</source> <target>&Инструменти</target> @@ -1025,9 +1037,6 @@ The command is triggered if: <source>C&lear</source> <target>И&зчисти</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Открий посоката на синхронизация чрез файловете бази данни</target> - <source>Detect moved files</source> <target>Откриване на преместени файлове</target> @@ -1048,38 +1057,23 @@ The command is triggered if: <source>&Recycle bin</source> <target>&Кошче</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Резервирай изтритите или презаписани файлове в кошчето</target> - <source>&Permanent</source> <target>&Необратимо</target> -<source>Delete or overwrite files permanently</source> -<target>Изтрий или презапиши файловете необратимо</target> - <source>&Versioning</source> <target>&Версифициране</target> -<source>Move files to a user-defined folder</source> -<target>Премести файловете в зададена потребителска папка</target> - <source>Naming convention:</source> <target>Конвенция за именуване:</target> -<source>Handle errors:</source> -<target>Обработка на грешки:</target> - -<source>&Pop-up</source> -<target>&Попитай</target> +<source>&Ignore errors</source> +<target>&Игнорирай грешките</target> <source>Show pop-up on errors or warnings</source> <target>Питай при грешки или предупреждения</target> -<source>Hide all error and warning messages</source> -<target>Скрий всички грешки и предупреждения</target> - -<source>On completion:</source> -<target>При завършване:</target> +<source>Run a command after synchronization:</source> +<target>След синхронизация изпълни команда:</target> <source>OK</source> <target>ОК</target> @@ -1117,6 +1111,9 @@ The command is triggered if: <source>&Key file</source> <target>&Кодов файл</target> +<source>&SSH agent</source> +<target>&SSH агент</target> + <source>User name:</source> <target>Потребителско име:</target> @@ -1135,11 +1132,8 @@ The command is triggered if: <source>How to get best performance?</source> <target>Как да се получи най-добра работа?</target> -<source>SSH connections for directory reading:</source> -<target>SSH-връзки за четене на директории:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Предлаган диапазон: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>Връзки за четене на папка:</target> <source>SFTP channels per connection:</source> <target>SFTP-канали за една връзка:</target> @@ -1147,9 +1141,6 @@ The command is triggered if: <source>Detect server limit</source> <target>Открий лимита на сървъра</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 връзки x 10 канала = 20 пъти по-бързо четене на директории</target> - <source>Select a directory on the server:</source> <target>Изберете директория на сървъра:</target> @@ -1189,6 +1180,9 @@ The command is triggered if: <source>Bytes copied:</source> <target>Копирани байтове:</target> +<source>When finished:</source> +<target>При завършване:</target> + <source>Close</source> <target>Затвори</target> @@ -1199,17 +1193,20 @@ The command is triggered if: <target>Стоп</target> <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> -<target>Създаване на пакетен файл за автоматична синхронизация. За старт двукратно щракнете върху този файл или задайте планова задача: %x</target> +<target>Създай пакетен файл за автоматична синхронизация. За старт двукратно щракнете върху този файл или задайте планова задача: %x</target> -<source>&Stop</source> -<target>&Стоп</target> +<source>Run minimized</source> +<target>Изпълни в минимизиран вид</target> + +<source>&Show error dialog</source> +<target>&Покажи диалог за грешките</target> + +<source>&Cancel</source> +<target>&Отказ</target> <source>Stop synchronization at first error</source> <target>Спри синхронизацията при първа грешка</target> -<source>Run minimized</source> -<target>Изпълни в минимизиран вид</target> - <source>Save log:</source> <target>Запази протокол:</target> @@ -1240,14 +1237,14 @@ This guarantees a consistent state even in case of a serious error. Това гарантира цялостност на файла дори в случай на сериозна грешка. </target> -<source>(recommended)</source> -<target>(препоръчително)</target> +<source>recommended</source> +<target>препоръчително</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Копирай споделени или заключени файлове с услугата Volume Shadow Copy.</target> -<source>(requires administrator rights)</source> -<target>(изисква администраторски права)</target> +<source>requires administrator rights</source> +<target>изисква административни права</target> <source>Transfer file and folder permissions.</source> <target>Прехвърли правата за достъп на файла и папката.</target> @@ -1279,14 +1276,17 @@ This guarantees a consistent state even in case of a serious error. <source>Source code written in C++ using:</source> <target>Изходния код е написан на C++ със:</target> -<source>Donation details</source> -<target>Подробности за дарителство</target> - <source>If you like FreeFileSync:</source> <target>Ако харесвате FreeFileSync:</target> -<source>Donate with PayPal</source> -<target>Дарете чрез PayPal</target> +<source>Support with a donation</source> +<target>Подкрепа с дарение</target> + +<source>Donation details</source> +<target>Подробности за дарение</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>Автоматичното обновяване бе деактивирано от администратора.</target> <source>Feedback and suggestions are welcome</source> <target>Забележки и предложения са добре дошли</target> @@ -1324,7 +1324,7 @@ This guarantees a consistent state even in case of a serious error. <source>Activate offline</source> <target>Активирайте офлайн</target> -<source>Save as Batch Job</source> +<source>Save as a Batch Job</source> <target>Запази като пакетна задача</target> <source>Delete Items</source> @@ -1363,11 +1363,17 @@ This guarantees a consistent state even in case of a serious error. <source>Overview</source> <target>Преглед</target> +<source>Show "%x"</source> +<target>Покажи "%x"</target> + <source>&Show details</source> <target>&Покажи подробно</target> -<source>A new version of FreeFileSync is available:</source> -<target>FreeFileSync има нова версия:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x е наличен!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Инсталационните файлове са повредени. Моля, преинсталирайте FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Няма наличен локален път за %x.</target> @@ -1459,9 +1465,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>Избор на времеви интервал...</target> -<source>Show "%x"</source> -<target>Покажи "%x"</target> - <source>Last session</source> <target>Последна сесия</target> @@ -1561,18 +1564,6 @@ This guarantees a consistent state even in case of a serious error. <source>Searching for program updates...</source> <target>Търсене на обновления на програмата...</target> -<source>Close progress dialog</source> -<target>Затвори диалога</target> - -<source>Log off</source> -<target>Излез от сесията</target> - -<source>Standby</source> -<target>Режим на очакване</target> - -<source>Shut down</source> -<target>Изключи компютъра</target> - <source>Paused</source> <target>Пауза</target> @@ -1586,7 +1577,7 @@ This guarantees a consistent state even in case of a serious error. <target>Сравнява съдържанието на файлове...</target> <source>Completed</source> -<target>Завършено</target> +<target>Готово</target> <source>Info</source> <target>Информация</target> @@ -1603,11 +1594,11 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>Протокол</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Инсталационните файлове са повредени. Моля, преинсталирайте FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> -<target>%x, благодарности за Вашето дарение и подкрепа!</target> +<target>%x, благодаря за Вашето дарение и подкрепа!</target> + +<source>Recommended range:</source> +<target>Препоръчителен обхват:</target> <source>Password:</source> <target>Парола:</target> @@ -1615,6 +1606,9 @@ This guarantees a consistent state even in case of a serious error. <source>Key password:</source> <target>Кодова фраза:</target> +<source>Please enter a file path.</source> +<target>Моля, въведете файлов път.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1729,6 +1723,15 @@ This guarantees a consistent state even in case of a serious error. <source>MB</source> <target>МБ</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Задръж изтритите и презаписани файлове в кошчето</target> + +<source>Delete and overwrite files permanently</source> +<target>Изтрий и презапиши файловете</target> + +<source>Move files to a user-defined folder</source> +<target>Премести файловете в зададена потребителска папка</target> + <source>Replace</source> <target>Замени</target> @@ -1741,6 +1744,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>Добави времето към името на всеки файл</target> +<source>On completion:</source> +<target>При завършване:</target> + +<source>On errors:</source> +<target>При грешки:</target> + +<source>On success:</source> +<target>При успех:</target> + <source>Main config</source> <target>Главна конфигурация</target> @@ -1762,9 +1774,6 @@ This guarantees a consistent state even in case of a serious error. <source>Name</source> <target>Име</target> -<source>Items</source> -<target>Елементи</target> - <source>Percentage</source> <target>Процент</target> @@ -1894,6 +1903,9 @@ This guarantees a consistent state even in case of a serious error. <source>Cannot change process I/O priorities.</source> <target>Не може да промени I/O-приоритетите на процеса.</target> +<source>Unable to shut down the system.</source> +<target>Не може да изключи системата.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Неуспешна проверка на кошчето за папка %x.</target> @@ -1918,9 +1930,6 @@ This guarantees a consistent state even in case of a serious error. <source>Portable</source> <target>Преносима</target> -<source>recommended</source> -<target>препоръчително</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Запази настройките в "%APPDATA%\FreeFileSync"</target> @@ -1972,8 +1981,8 @@ This guarantees a consistent state even in case of a serious error. <source>Edit with FreeFileSync</source> <target>Редактиране с FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>Преносимата версия не може да се инсталира в избраната папка.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>Преносимата версия на FreeFileSync не може да се инсталира в подпапка на %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Моля, изберете локален тип инсталация или пък друга папка за инсталация.</target> diff --git a/FreeFileSync/Build/Languages/chinese_simple.lng b/FreeFileSync/Build/Languages/chinese_simple.lng index 8559381d..4cf6efb4 100755 --- a/FreeFileSync/Build/Languages/chinese_simple.lng +++ b/FreeFileSync/Build/Languages/chinese_simple.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>正在为文件夹 %x 检测回收站可用性...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>对于如下的文件夹回收站不可用. 文件将被永久性删除:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>如下文件夹不支持回收站, 已删除或覆盖的文件将不可恢复:</target> <source>An exception occurred</source> <target>发生异常</target> @@ -88,26 +88,26 @@ <source>Syntax:</source> <target>语法:</target> -<source>global config file:</source> -<target>全局配置文件:</target> - <source>config files:</source> <target>配置文件:</target> <source>directory</source> <target>目录</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>指向一个替代的GlobalSettings.xml文件的路径.</target> +<source>global config file:</source> +<target>全局配置文件:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> -<target>任意数量的 FreeFileSync .ffs_gui 和/或 .ffs_batch 配置文件.</target> +<target>任意数目的 FreeFileSync .ffs_gui 和/或 .ffs_batch 配置文件.</target> <source>Any number of alternative directory pairs for at most one config file.</source> -<target>任意数量的替代目录对的最多一个配置文件.</target> +<target>任意数目的替代目录对的最多一个配置文件.</target> -<source>Open configuration for editing without executing it.</source> -<target>打开配置文件进行编辑而不执行它.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>打开已选定的配置文件仅进行编辑而不执行.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>指向一个替代的GlobalSettings.xml文件的路径.</target> <source>Cannot find the following folders:</source> <target>无法找到如下文件夹:</target> @@ -155,7 +155,7 @@ <target>复制被锁定的文件</target> <source>Copy file access permissions</source> -<target>复制文件存取权限</target> +<target>复制文件访问权限</target> <source>File time tolerance</source> <target>文件时间容差</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>更新右侧的文件属性</target> -<source>Cannot write file %x.</source> -<target>无法写入文件 %x .</target> +<source>Cannot read file %x.</source> +<target>无法读取文件 %x .</target> <source> Unexpected size of data stream. @@ -271,14 +271,17 @@ Actual: %y bytes <target>无法写入 %x 的权限.</target> <source>Operation not supported for different base folder types.</source> -<target>对于不同基础文件夹方式此操作不被支持.</target> +<target>对于不同基础文件夹类型此操作不被支持.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>无法复制符号连接 %x 到 %y.</target> +<source>Cannot write file %x.</source> +<target>无法写入文件 %x .</target> <source>Cannot move file %x to %y.</source> <target>无法移动文件 %x 到 %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>无法复制符号连接 %x 到 %y.</target> + <source>Unable to connect to %x.</source> <target>无法连接到 %x.</target> @@ -291,9 +294,6 @@ Actual: %y bytes <source>Cannot read directory %x.</source> <target>无法读取目录 %x.</target> -<source>Cannot read file %x.</source> -<target>无法读取文件 %x .</target> - <source>Cannot read file attributes of %x.</source> <target>无法读取 %x 的文件属性.</target> @@ -494,7 +494,7 @@ Actual: %y bytes <target>卷名 %x 不是文件路径 %y 的一部分.</target> <source>Stop requested: Waiting for current operation to finish...</source> -<target>停止要求: 等待当前操作完成...</target> +<target>停止请求: 等待当前操作完成...</target> <source>Unable to create time stamp for versioning:</source> <target>无法为历史版本创建时间戳:</target> @@ -591,8 +591,8 @@ The command is triggered if: <source>Automated Synchronization</source> <target>自动同步</target> -<source>The following path does not support directory monitoring:</source> -<target>如下路径并不支持目录监视:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>协议 %x 不支持目录监视:</target> <source>Directory monitoring active</source> <target>目录监视激活</target> @@ -646,7 +646,7 @@ The command is triggered if: <target>正在移动符号连接 %x 到 %y</target> <source>Removing old versions...</source> -<target>移除旧版本...</target> +<target>正在移除旧版本...</target> <source>Updating file %x</source> <target>正在更新文件 %x</target> @@ -655,10 +655,10 @@ The command is triggered if: <target>正在更新符号连接 %x</target> <source>Verifying file %x</source> -<target>校验文件 %x</target> +<target>正在校验文件 %x</target> <source>Updating attributes of %x</source> -<target>更新 %x 的属性</target> +<target>正在更新 %x 的属性</target> <source>Cannot write file attributes of %x.</source> <target>无法写入 %x 的文件属性.</target> @@ -691,7 +691,7 @@ The command is triggered if: <target>如下的文件夹有显著不同. 请检查是否选择了正确的文件夹来进行同步.</target> <source>Not enough free disk space available in:</source> -<target>没有足够的可用磁盘空间用于:</target> +<target>没有足够的可用磁盘空间:</target> <source>Available:</source> <target>可用:</target> @@ -708,8 +708,8 @@ The command is triggered if: <source>Base folder:</source> <target>基础文件夹:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>历史版本文件夹将会被同步因为它被包含在一个基础文件夹中.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>历史版本文件夹被包含在一个基础文件夹中.</target> <source>Synchronizing folder pair:</source> <target>正在同步成对的文件夹:</target> @@ -723,6 +723,15 @@ The command is triggered if: <source>job name</source> <target>作业名称</target> +<source>Show summary</source> +<target>显示摘要</target> + +<source>Sleep</source> +<target>休眠</target> + +<source>Shut down</source> +<target>关机</target> + <source>Synchronization stopped</source> <target>同步已停止</target> @@ -744,6 +753,9 @@ The command is triggered if: <source>Synchronization completed successfully</source> <target>同步成功完成</target> +<source>Executing command %x</source> +<target>正在执行命令 %x</target> + <source>Cleaning up old log files...</source> <target>正在清理旧日志文件...</target> @@ -770,8 +782,8 @@ The command is triggered if: <pluralform>在 %x 秒后自动重试...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>忽略后续的错误(&I)</target> +<source>Ignore &all</source> +<target>忽略所有(&A)</target> <source>Retrying operation...</source> <target>正在重试操作...</target> @@ -878,12 +890,12 @@ The command is triggered if: <source>&Find...</source> <target>查找(&F)...</target> -<source>&Reset layout</source> -<target>重置布局(&R)</target> - <source>&Export file list...</source> <target>导出文件列表(&E)...</target> +<source>&Reset layout</source> +<target>重置布局(&R)</target> + <source>&Tools</source> <target>工具(&T)</target> @@ -903,7 +915,7 @@ The command is triggered if: <target>同步</target> <source>Add folder pair</source> -<target>添加成对文件夹</target> +<target>添加文件夹对</target> <source>Remove folder pair</source> <target>移除文件夹对</target> @@ -948,7 +960,7 @@ The command is triggered if: <target>将被删除的文件和文件夹数</target> <source>Number of files that will be updated</source> -<target>将会被更新的文件数</target> +<target>将被更新的文件数</target> <source>Number of files and folders that will be created</source> <target>将被创建的文件和文件夹数</target> @@ -1019,9 +1031,6 @@ The command is triggered if: <source>C&lear</source> <target>清除(&L)</target> -<source>Detect synchronization directions with the help of database files</source> -<target>借助数据库文件来检测同步的方向</target> - <source>Detect moved files</source> <target>检测被移动的文件</target> @@ -1042,38 +1051,23 @@ The command is triggered if: <source>&Recycle bin</source> <target>回收站(&R)</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>备份被删除和被覆盖的文件到回收站</target> - <source>&Permanent</source> <target>永久(&P)</target> -<source>Delete or overwrite files permanently</source> -<target>永久性删除或覆盖文件</target> - <source>&Versioning</source> <target>历史版本(&V)</target> -<source>Move files to a user-defined folder</source> -<target>移动文件到一个用户定义的文件夹</target> - <source>Naming convention:</source> <target>命名规则:</target> -<source>Handle errors:</source> -<target>处理错误:</target> - -<source>&Pop-up</source> -<target>弹出对话框(&P)</target> +<source>&Ignore errors</source> +<target>忽略错误(&I)</target> <source>Show pop-up on errors or warnings</source> <target>在错误或警告时显示弹出对话框</target> -<source>Hide all error and warning messages</source> -<target>隐藏所有错误与警告信息</target> - -<source>On completion:</source> -<target>在完成时:</target> +<source>Run a command after synchronization:</source> +<target>同步之后运行一个命令:</target> <source>OK</source> <target>确定</target> @@ -1111,6 +1105,9 @@ The command is triggered if: <source>&Key file</source> <target>密钥文件(&K)</target> +<source>&SSH agent</source> +<target>SSH代理(&S)</target> + <source>User name:</source> <target>用户名:</target> @@ -1129,11 +1126,8 @@ The command is triggered if: <source>How to get best performance?</source> <target>如何取得最佳性能?</target> -<source>SSH connections for directory reading:</source> -<target>用于目录读取的SSH连接:</target> - -<source>Suggested range: [1 - 10]</source> -<target>建议范围:[1 - 10]</target> +<source>Connections for directory reading:</source> +<target>用于目录读取的连接:</target> <source>SFTP channels per connection:</source> <target>每个连接的SFTP通道数:</target> @@ -1141,9 +1135,6 @@ The command is triggered if: <source>Detect server limit</source> <target>检测服务器限制</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2连接 x 10 通道 = 目录读取加快 20 倍</target> - <source>Select a directory on the server:</source> <target>选择一个服务器上的目录:</target> @@ -1178,11 +1169,14 @@ The command is triggered if: <target>同步中...</target> <source>Minimize to notification area</source> -<target>最小化到托盘</target> +<target>最小化到系统托盘</target> <source>Bytes copied:</source> <target>字节被复制:</target> +<source>When finished:</source> +<target>当完成时:</target> + <source>Close</source> <target>关闭</target> @@ -1195,15 +1189,18 @@ The command is triggered if: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>创建一个用于无人值守同步的批处理文件. 要开始, 双击这个文件或任务计划器中的计划调度: %x</target> -<source>&Stop</source> -<target>停止(&S)</target> +<source>Run minimized</source> +<target>以最小化运行</target> + +<source>&Show error dialog</source> +<target>显示错误对话框(&S)</target> + +<source>&Cancel</source> +<target>取消(&C)</target> <source>Stop synchronization at first error</source> <target>在遇到第一个错误时停止同步</target> -<source>Run minimized</source> -<target>以最小化运行</target> - <source>Save log:</source> <target>保存日志:</target> @@ -1231,14 +1228,14 @@ This guarantees a consistent state even in case of a serious error. </source> <target>在覆盖目标之前先复制到临时文件(*.ffs_tmp). 这样即使在发生严重错误的情况下也可以保证有一致的状态.</target> -<source>(recommended)</source> -<target>(推荐)</target> +<source>recommended</source> +<target>推荐</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>使用卷影复制服务来复制已共享或已锁定的文件.</target> -<source>(requires administrator rights)</source> -<target>(需要管理员权限)</target> +<source>requires administrator rights</source> +<target>需要管理员权限</target> <source>Transfer file and folder permissions.</source> <target>传输文件及文件夹的权限.</target> @@ -1268,16 +1265,19 @@ This guarantees a consistent state even in case of a serious error. <target>默认(&D)</target> <source>Source code written in C++ using:</source> -<target>源代码用如下C++工具写成:</target> - -<source>Donation details</source> -<target>捐款详情</target> +<target>源代码使用如下工具由C++写成:</target> <source>If you like FreeFileSync:</source> <target>如果你喜欢 FreeFileSync:</target> -<source>Donate with PayPal</source> -<target>通过PayPal捐赠</target> +<source>Support with a donation</source> +<target>通过捐款来支持我们</target> + +<source>Donation details</source> +<target>捐款详情</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>自动更新程序已由管理员禁用.</target> <source>Feedback and suggestions are welcome</source> <target>欢迎反馈意见和提出建议</target> @@ -1313,10 +1313,10 @@ This guarantees a consistent state even in case of a serious error. <target>输入激活码:</target> <source>Activate offline</source> -<target>在线激活</target> +<target>离线激活</target> -<source>Save as Batch Job</source> -<target>另存为批处理作业</target> +<source>Save as a Batch Job</source> +<target>保存为批处理作业</target> <source>Delete Items</source> <target>删除项目</target> @@ -1354,11 +1354,17 @@ This guarantees a consistent state even in case of a serious error. <source>Overview</source> <target>摘要</target> +<source>Show "%x"</source> +<target>显示 "%x"</target> + <source>&Show details</source> <target>显示详情(&S)</target> -<source>A new version of FreeFileSync is available:</source> -<target>已经有新版本的FreeFileSync可用:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x 可用!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>安装文件已损坏, 请重新安装FreeFileSync.</target> <source>Local path not available for %x.</source> <target>本地路径不适用于 %x.</target> @@ -1446,9 +1452,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>选择时间跨度...</target> -<source>Show "%x"</source> -<target>显示 "%x"</target> - <source>Last session</source> <target>最后会话</target> @@ -1548,18 +1551,6 @@ This guarantees a consistent state even in case of a serious error. <source>Searching for program updates...</source> <target>正在搜索程序的更新...</target> -<source>Close progress dialog</source> -<target>关闭进度对话框</target> - -<source>Log off</source> -<target>注销</target> - -<source>Standby</source> -<target>待机</target> - -<source>Shut down</source> -<target>关机</target> - <source>Paused</source> <target>已暂停</target> @@ -1590,18 +1581,21 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>日志</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>安装文件已损坏, 请重新安装FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>谢谢你, %x , 对我们的捐款和支持!</target> +<source>Recommended range:</source> +<target>建议的范围:</target> + <source>Password:</source> <target>密码:</target> <source>Key password:</source> <target>密钥密码:</target> +<source>Please enter a file path.</source> +<target>请输入一个文件路径.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1611,7 +1605,7 @@ This guarantees a consistent state even in case of a serious error. </target> <source>Please enter a target folder.</source> -<target>请输入一下目录文件夹.</target> +<target>请输入一个目标文件夹.</target> <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> @@ -1713,6 +1707,15 @@ This guarantees a consistent state even in case of a serious error. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>保留已删除和覆盖的文件到回收站中</target> + +<source>Delete and overwrite files permanently</source> +<target>永久性删除和覆盖文件</target> + +<source>Move files to a user-defined folder</source> +<target>移动文件到一个用户定义的文件夹</target> + <source>Replace</source> <target>替换</target> @@ -1725,6 +1728,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>添加一个时间戳到每个文件名</target> +<source>On completion:</source> +<target>在完成时:</target> + +<source>On errors:</source> +<target>在错误时:</target> + +<source>On success:</source> +<target>在成功时:</target> + <source>Main config</source> <target>主配置</target> @@ -1746,9 +1758,6 @@ This guarantees a consistent state even in case of a serious error. <source>Name</source> <target>文件名</target> -<source>Items</source> -<target>项目</target> - <source>Percentage</source> <target>百分比</target> @@ -1870,13 +1879,16 @@ This guarantees a consistent state even in case of a serious error. <target>无法设置 %x 的特权.</target> <source>Unable to suspend system sleep mode.</source> -<target>无法路上系统睡眠模式.</target> +<target>无法中止系统休眠模式.</target> <source>Cannot change process I/O priorities.</source> <target>无法更改进程的I/O优先级.</target> +<source>Unable to shut down the system.</source> +<target>无法关闭系统.</target> + <source>Checking recycle bin failed for folder %x.</source> -<target>为文件夹 %x 检查回收站失败.</target> +<target>检查文件夹 %x 的回收站失败.</target> <source>The following XML elements could not be read:</source> <target>下列的XML元素无法被读取:</target> @@ -1899,9 +1911,6 @@ This guarantees a consistent state even in case of a serious error. <source>Portable</source> <target>便携</target> -<source>recommended</source> -<target>推荐</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>保存设置到 "%APPDATA%\FreeFileSync"</target> @@ -1953,8 +1962,8 @@ This guarantees a consistent state even in case of a serious error. <source>Edit with FreeFileSync</source> <target>使用FreeFileSync编辑</target> -<source>The portable version cannot install into the selected folder.</source> -<target>便携版本无法安装到选定的文件夹.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>FreeFileSync便携版无法安装到 %x 的一个子目录.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>请选择本地安装类型或选择用于安装的不同文件夹.</target> diff --git a/FreeFileSync/Build/Languages/chinese_traditional.lng b/FreeFileSync/Build/Languages/chinese_traditional.lng index 800f38c1..ea48a8b1 100755 --- a/FreeFileSync/Build/Languages/chinese_traditional.lng +++ b/FreeFileSync/Build/Languages/chinese_traditional.lng @@ -17,19 +17,19 @@ <target>自上次同步以來都沒有變更。</target> <source>The database entry is not in sync considering current settings.</source> -<target>資料庫條目未同步考慮到目前設定。</target> +<target>考慮到目前設定，資料庫項目不同步。</target> <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source> <target>設定預設同步方向：舊檔案會被較新的檔案覆蓋。</target> <source>Creating file %x</source> -<target>正在新建檔案 %x</target> +<target>正在建立檔案 %x</target> <source>Creating folder %x</source> -<target>正在新建資料夾 %x</target> +<target>正在建立資料夾 %x</target> <source>Creating symbolic link %x</source> -<target>正在新建符號連結 %x</target> +<target>正在建立符號連結 %x</target> <source>Moving file %x to the recycle bin</source> <target>正在移動檔案 %x 到資源回收筒</target> @@ -50,16 +50,16 @@ <target>正在刪除符號連結 %x</target> <source>Checking recycle bin availability for folder %x...</source> -<target>正在檢查資源回收筒的可用性資料夾 %x…</target> +<target>正在檢查資源回收筒的有效資料夾 %x…</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>資源回收筒不可用於以下資料夾。相反的檔案將永久被刪除：</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>以下資料夾不支援資源回收筒。刪除或覆蓋的檔將無法還原：</target> <source>An exception occurred</source> <target>發生異常</target> <source>A directory path is expected after %x.</source> -<target>在 %x 後預期的目錄路徑。</target> +<target>%x 後需要目錄路徑。</target> <source>Syntax error</source> <target>語法錯誤</target> @@ -74,10 +74,10 @@ <target>檔案 %x 不包含一個有效的配置。</target> <source>Unequal number of left and right directories specified.</source> -<target>左邊和右邊指定的目錄數不相等。</target> +<target>指定的左邊和右邊目錄數量不相等。</target> <source>The config file must not contain settings at directory pair level when directories are set via command line.</source> -<target>目錄設定透過命令列時，該設定檔必須不包含配對目錄級別的設定。</target> +<target>目錄透過命令列設定時，該設定檔不能包含配對目錄層級的設定。</target> <source>Directories cannot be set for more than one configuration file.</source> <target>目錄無法設定多個配置檔。</target> @@ -88,32 +88,32 @@ <source>Syntax:</source> <target>語法：</target> -<source>global config file:</source> -<target>全域配置檔案：</target> - <source>config files:</source> <target>配置檔案：</target> <source>directory</source> <target>目錄</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>備用的GlobalSettings.xml檔案路徑。</target> +<source>global config file:</source> +<target>全域配置檔案：</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> -<target>FreeFileSync .ffs_gui和/或.ffs_batch配置檔案的任意數量。</target> +<target>FreeFileSync .ffs_gui和(或).ffs_batch配置檔案的任意數量。</target> <source>Any number of alternative directory pairs for at most one config file.</source> <target>任意數量的備用配對目錄為最多一個配置檔案。</target> -<source>Open configuration for editing without executing it.</source> -<target>開啟配置進行編輯而不執行。</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>只打開所選的配置進行編輯而不執行。</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>備用的GlobalSettings.xml檔案路徑。</target> <source>Cannot find the following folders:</source> <target>找不到下列資料夾：</target> <source>If this error is ignored the folders will be considered empty. Missing folders are created automatically when needed.</source> -<target>如果忽略此錯誤的資料夾將視為空。在需要時會自動新建缺少的資料夾。</target> +<target>如果忽略此錯誤的資料夾將視為空的。在需要時會自動建立缺少的資料夾。</target> <source>File %x has an invalid date.</source> <target>檔案 %x 的日期無效。</target> @@ -128,7 +128,7 @@ <target>大小：</target> <source>Content comparison was skipped for excluded files.</source> -<target>內容比對被設定排除檔案跳過。</target> +<target>內容比對被設定的排除檔案跳過。</target> <source>Items differ in attributes only</source> <target>只有項目的屬性不同</target> @@ -140,10 +140,10 @@ <target>正在比對檔案 %x 的内容</target> <source>Generating file list...</source> -<target>正在產生檔案清單…</target> +<target>正在產生檔案列表…</target> <source>Fail-safe file copy</source> -<target>故障保護檔案複製</target> +<target>失效安全的檔案複製</target> <source>Enabled</source> <target>啟用</target> @@ -158,7 +158,7 @@ <target>複製檔案存取權限</target> <source>File time tolerance</source> -<target>檔案時間差</target> +<target>檔案時間容差範圍</target> <source>Folder access timeout</source> <target>資料夾存取超時</target> @@ -182,13 +182,13 @@ <target>資料夾輸入欄位是空白。</target> <source>The corresponding folder will be considered as empty.</source> -<target>對應的資料夾將視為空。</target> +<target>對應的資料夾將視為空的。</target> <source>Exclude:</source> <target>排除：</target> <source>One base folder of a folder pair is contained in the other one.</source> -<target>一個基本資料夾中的配對資料夾包含在另一個中。</target> +<target>一個配對資料夾的一個底層資料夾包含在另一個配對資料夾中。</target> <source>The folder should be excluded from synchronization via filter.</source> <target>應該從同步透過篩選器中排除資料夾。</target> @@ -218,7 +218,7 @@ <target>兩邊都相同</target> <source>Conflict/item cannot be categorized</source> -<target>衝突/項目不能被分類</target> +<target>衝突(項目)不能被分類</target> <source>Copy new item to left</source> <target>複製新的項目到左邊</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>更新右邊的屬性</target> -<source>Cannot write file %x.</source> -<target>無法寫入檔案 %x。</target> +<source>Cannot read file %x.</source> +<target>無法讀取檔案 %x。</target> <source> Unexpected size of data stream. @@ -271,19 +271,22 @@ Actual: %y bytes <target>無法寫入 %x 的權限。</target> <source>Operation not supported for different base folder types.</source> -<target>不支援不同基本資料夾類型的操作。</target> +<target>不支援不同底層資料夾類型的操作。</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>無法複製符號連結 %x 到 %y。</target> +<source>Cannot write file %x.</source> +<target>無法寫入檔案 %x。</target> <source>Cannot move file %x to %y.</source> <target>無法移動檔案 %x 到 %y。</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>無法複製符號連結 %x 到 %y。</target> + <source>Unable to connect to %x.</source> <target>無法連接到 %x。</target> <source>Failed to get information about server %x.</source> -<target>無法獲取有關伺服器 %x 的資訊。</target> +<target>無法獲取關於伺服器 %x 的資訊。</target> <source>Cannot open directory %x.</source> <target>無法開啟目錄 %x。</target> @@ -294,11 +297,8 @@ Actual: %y bytes <source>Cannot read file attributes of %x.</source> <target>無法讀取 %x 的檔案屬性。</target> -<source>Cannot read file %x.</source> -<target>無法讀取檔案 %x。</target> - <source>Cannot create directory %x.</source> -<target>無法新建目錄 %x。</target> +<target>無法建立目錄 %x。</target> <source>Cannot delete file %x.</source> <target>無法刪除目錄 %x。</target> @@ -356,7 +356,7 @@ Actual: %y bytes <pluralform>Operation timed out after %x seconds.</pluralform> </source> <target> -<pluralform>操作在 %x 秒後超時。</pluralform> +<pluralform>在 %x 秒後操作超時。</pluralform> </target> <source> @@ -394,19 +394,19 @@ Actual: %y bytes <target>無法載入檔案 %x。</target> <source>Database file %x is incompatible.</source> -<target>資料庫檔案 %x 是不相容的。</target> +<target>資料庫檔案 %x 不相容。</target> <source>Initial synchronization:</source> <target>初始化同步：</target> <source>Database file %x does not yet exist.</source> -<target>資料庫檔案 %x 並不存在。</target> +<target>資料庫檔案 %x 不存在。</target> <source>Database file is corrupted:</source> <target>資料庫檔案已損壞：</target> <source>The database files do not yet contain information about the last synchronization.</source> -<target>資料庫檔案尚未包含有關上次同步資訊。</target> +<target>資料庫檔案尚未包含關於上次同步資訊。</target> <source>Loading file %x...</source> <target>正在讀取檔案 %x…</target> @@ -421,10 +421,10 @@ Actual: %y bytes <target>搜尋資料夾 %x 時超時。</target> <source>Cannot get process information.</source> -<target>無法得到進程資訊。</target> +<target>無法得到處理訊息。</target> <source>Waiting while directory is locked:</source> -<target>正在等待鎖定目錄時：</target> +<target>等待目錄被鎖定：</target> <source>Lock owner:</source> <target>鎖定擁有者：</target> @@ -438,7 +438,7 @@ Actual: %y bytes </target> <source>Detecting abandoned lock...</source> -<target>正在檢測廢棄鎖…</target> +<target>正在檢測被遺棄的鎖定…</target> <source>Items processed:</source> <target>已處理項目：</target> @@ -467,10 +467,10 @@ Actual: %y bytes <target>正在掃瞄：</target> <source>/sec</source> -<target>/秒</target> +<target>(秒)</target> <source>%x items/sec</source> -<target>%x 個項目/秒</target> +<target>%x 個項目(秒)</target> <source>Show in Explorer</source> <target>在資源管理器中顯示</target> @@ -482,22 +482,22 @@ Actual: %y bytes <target>瀏覽目錄</target> <source>Cannot access the Volume Shadow Copy Service.</source> -<target>無法存取卷影複製服務。</target> +<target>無法存取磁碟區陰影複製服務。</target> <source>Please run the 64-bit version of FreeFileSync to create shadow copies on this system.</source> -<target>請在此系統上執行64位元版本的FreeFileSync新建卷影副本。</target> +<target>請在此系統上執行64位元版本的FreeFileSync建立陰影複製副本。</target> <source>Cannot determine volume name for %x.</source> -<target>無法確定 %x 卷名。</target> +<target>無法確定 %x 磁碟機名稱。</target> <source>Volume name %x is not part of file path %y.</source> -<target>卷名 %x 不是檔案路徑 %y 的一部分。</target> +<target>磁碟機名稱 %x 不是檔案路徑 %y 的一部分。</target> <source>Stop requested: Waiting for current operation to finish...</source> -<target>停止要求：等待目前的操作結束…</target> +<target>停止請求：等待目前的操作結束…</target> <source>Unable to create time stamp for versioning:</source> -<target>無法創建時間戳記的版本控制：</target> +<target>無法建立時間戳記的版本控制：</target> <source>Drag && drop</source> <target>拖放</target> @@ -515,7 +515,7 @@ Actual: %y bytes <target>另存新檔(&A)…</target> <source>E&xit</source> -<target>離開(&x)</target> +<target>離開(&X)</target> <source>&File</source> <target>檔案(&F)</target> @@ -530,16 +530,16 @@ Actual: %y bytes <target>說明(&H)</target> <source>Usage:</source> -<target>使用量：</target> +<target>使用方法：</target> <source>1. Select folders to watch.</source> <target>1. 選擇要監看的資料夾。</target> <source>2. Enter a command line.</source> -<target>2. 輸入命令列。</target> +<target>2. 輸入一個命令列。</target> <source>3. Press 'Start'.</source> -<target>3. 按下 '開始'。</target> +<target>3. 按下「開始」。</target> <source>To get started just import a .ffs_batch file.</source> <target>若要開始只要導入一個.ffs_batch檔。</target> @@ -591,11 +591,11 @@ The command is triggered if: <source>Automated Synchronization</source> <target>自動化同步</target> -<source>The following path does not support directory monitoring:</source> -<target>下列路徑不支援目錄監測：</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>%x 協定不支援目錄監測：</target> <source>Directory monitoring active</source> -<target>目錄監測啟動</target> +<target>目錄監測活動</target> <source>Waiting until all directories are available...</source> <target>正在等到所有目錄可用…</target> @@ -613,7 +613,7 @@ The command is triggered if: <target>重試(&R)</target> <source>File time and size</source> -<target>檔案大小和日期</target> +<target>檔案時間和大小</target> <source>File content</source> <target>檔案内容</target> @@ -646,7 +646,7 @@ The command is triggered if: <target>正在移動符號連結 %x 到 %y</target> <source>Removing old versions...</source> -<target>正在刪除舊版本…</target> +<target>正在移除舊版本…</target> <source>Updating file %x</source> <target>正在更新檔案 %x</target> @@ -670,7 +670,7 @@ The command is triggered if: <target>資料驗證錯誤：</target> <source>Creating a Volume Shadow Copy for %x...</source> -<target>正在新建卷影複製為 %x…</target> +<target>正在建立磁碟區陰影複製為 %x…</target> <source>Target folder %x already existing.</source> <target>目標資料夾 %x 已存在。</target> @@ -682,13 +682,13 @@ The command is triggered if: <target>找不到來源資料夾 %x。</target> <source>Please enter a target folder for versioning.</source> -<target>請輸入版本控制的目的資料夾。</target> +<target>請輸入版本控制的目標資料夾。</target> <source>The following items have unresolved conflicts and will not be synchronized:</source> <target>下列項目有未解決的衝突，將不會同步：</target> <source>The following folders are significantly different. Please check that the correct folders are selected for synchronization.</source> -<target>下列資料夾是明顯不同的。請檢查同步中的所有被選擇的正確資料夾。</target> +<target>下列資料夾明顯不同。請檢查同步中所選的正確資料夾。</target> <source>Not enough free disk space available in:</source> <target>沒有足夠的可用空間：</target> @@ -697,19 +697,19 @@ The command is triggered if: <target>可用：</target> <source>Some files will be synchronized as part of multiple base folders.</source> -<target>某些檔案將作為多個基本資料夾的一部分進行同步。</target> +<target>某些檔案將作為多個底層資料夾的一部分進行同步。</target> <source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source> -<target>為了避免衝突，設定排除過濾器，以便每個更新的檔案被視為只有一個基本資料夾。</target> +<target>為了避免衝突，設定排除過濾器，以便每個更新過的檔案被視為只有一個底層資料夾。</target> <source>Versioning folder:</source> <target>版本控制資料夾：</target> <source>Base folder:</source> -<target>基本資料夾：</target> +<target>底層資料夾：</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>版本控制檔案夾將被同步，因為它包含在基本資料夾中。</target> +<source>The versioning folder is contained in a base folder.</source> +<target>版本控制資料夾包含在底層資料夾中。</target> <source>Synchronizing folder pair:</source> <target>同步配對資料夾：</target> @@ -721,37 +721,49 @@ The command is triggered if: <target>正在載入…</target> <source>job name</source> -<target>作業名稱</target> +<target>工作名稱</target> + +<source>Show summary</source> +<target>顯示摘要</target> + +<source>Sleep</source> +<target>睡眠</target> + +<source>Shut down</source> +<target>關機</target> <source>Synchronization stopped</source> -<target>同步已停止。</target> +<target>同步已停止</target> <source>Stopped</source> <target>已停止</target> <source>Synchronization completed with errors</source> -<target>同步完成但有錯誤</target> +<target>同步完成，但是有錯誤</target> <source>Synchronization completed with warnings</source> -<target>同步已完成，但出現警告</target> +<target>同步完成，但是出現警告</target> <source>Warning</source> <target>警告</target> <source>Nothing to synchronize</source> -<target>沒有什麼東西可同步</target> +<target>沒有東西可以同步</target> <source>Synchronization completed successfully</source> -<target>同步已成功完成</target> +<target>同步順利完成</target> + +<source>Executing command %x</source> +<target>執行命令 %x</target> <source>Cleaning up old log files...</source> <target>清理舊日誌檔…</target> <source>You can switch to FreeFileSync's main window to resolve this issue.</source> -<target>您可以切換到FreeFileSync的主視窗中來解決此問題。</target> +<target>您可以切換到FreeFileSync的主視窗來解決此問題。</target> <source>&Don't show this warning again</source> -<target>不要再顯示此警告(&D)</target> +<target>不再顯示此警告(&D)</target> <source>&Ignore</source> <target>忽略(&I)</target> @@ -770,8 +782,8 @@ The command is triggered if: <pluralform>在 %x 秒自動重試…</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>忽略後續的錯誤(&I)</target> +<source>Ignore &all</source> +<target>全部忽略(&A)</target> <source>Retrying operation...</source> <target>重試操作…</target> @@ -801,7 +813,7 @@ The command is triggered if: <target>日期</target> <source>Extension</source> -<target>擴展</target> +<target>副檔名</target> <source>Category</source> <target>分類</target> @@ -840,7 +852,7 @@ The command is triggered if: <target>所選資料夾 %x 無法使用於FreeFileSync。</target> <source>Please select a folder on a local file system, network or an MTP device.</source> -<target>請選擇一個本機檔案系統、網路或MTP設備上的資料夾。</target> +<target>請選擇一個本機檔案系統、網路或MTP裝置上的資料夾。</target> <source>&New</source> <target>新增(&N)</target> @@ -849,22 +861,22 @@ The command is triggered if: <target>儲存(&S)</target> <source>Save as &batch job...</source> -<target>另存為批次處理作業(&b)…</target> +<target>另存為批次工作(&B)…</target> <source>Start &comparison</source> -<target>開始比對(&c)</target> +<target>開始比對(&C)</target> <source>C&omparison settings</source> -<target>比對設定(&o)</target> +<target>比對設定(&O)</target> <source>&Filter settings</source> <target>篩選器設定(&F)</target> <source>S&ynchronization settings</source> -<target>同步設定(&y)</target> +<target>同步設定(&Y)</target> <source>Start &synchronization</source> -<target>開始同步(&s)</target> +<target>開始同步(&S)</target> <source>&Actions</source> <target>動作(&A)</target> @@ -878,12 +890,12 @@ The command is triggered if: <source>&Find...</source> <target>尋找(&F)…</target> +<source>&Export file list...</source> +<target>匯出檔案列表(&E)…</target> + <source>&Reset layout</source> <target>重置佈局(&R)</target> -<source>&Export file list...</source> -<target>匯出檔案清單(&E)…</target> - <source>&Tools</source> <target>工具(&T)</target> @@ -891,7 +903,7 @@ The command is triggered if: <target>現在檢查更新(&C)</target> <source>Check &automatically once a week</source> -<target>每週自動檢查一次(&a)</target> +<target>每週自動檢查一次(&A)</target> <source>Cancel</source> <target>取消</target> @@ -951,10 +963,10 @@ The command is triggered if: <target>將被更新的檔案數量</target> <source>Number of files and folders that will be created</source> -<target>將被新建的檔案和資料夾數量</target> +<target>將被建立的檔案和資料夾數量</target> <source>Total bytes to copy</source> -<target>要複製的位元組總數</target> +<target>要複製的總資料量</target> <source>Folder pair:</source> <target>配對資料夾：</target> @@ -969,10 +981,10 @@ The command is triggered if: <target>選擇一個變數：</target> <source>Include &symbolic links:</source> -<target>包括符號連結(&s)：</target> +<target>包含符號連結(&S)：</target> <source>&Follow</source> -<target>按照(&F)</target> +<target>跟隨(&F)</target> <source>&Direct</source> <target>直接(&D)</target> @@ -981,22 +993,22 @@ The command is triggered if: <target>詳細資訊</target> <source>&Ignore time shift [hh:mm]</source> -<target>忽略時間的轉變(&D)</target> +<target>忽略時間偏移(&D)</target> <source>List of file time offsets to ignore</source> -<target>忽略清單中的檔案時間偏移</target> +<target>忽略列表中的檔案時間偏移</target> <source>Example:</source> <target>範例：</target> <source>Handle daylight saving time</source> -<target>日光節約時間處理</target> +<target>處理日光節約時間</target> <source>Local settings:</source> <target>本機設定：</target> <source>Include:</source> -<target>包括：</target> +<target>包含：</target> <source>Show examples</source> <target>顯示範例</target> @@ -1017,10 +1029,7 @@ The command is triggered if: <target>選擇從同步中排除某些檔案的篩選器規則。輸入相對於其對應的配對資料夾路徑。</target> <source>C&lear</source> -<target>清除(&l)</target> - -<source>Detect synchronization directions with the help of database files</source> -<target>檢測同步方向和資料庫檔案的說明</target> +<target>清除(&L)</target> <source>Detect moved files</source> <target>檢測被移動的檔案</target> @@ -1032,8 +1041,8 @@ The command is triggered if: </source> <target> - 不支援所有檔案系統 -- 需要新建資料庫檔案 -- 檢測不可用於首次同步 +- 需要建立資料庫檔案 +- 初次同步的檢測不可用 </target> <source>Delete files:</source> @@ -1042,38 +1051,23 @@ The command is triggered if: <source>&Recycle bin</source> <target>資源回收筒(&R)</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>在資源回收筒中刪除備份和覆蓋檔案</target> - <source>&Permanent</source> <target>常駐(&P)</target> -<source>Delete or overwrite files permanently</source> -<target>永久刪除或覆蓋檔案</target> - <source>&Versioning</source> <target>版本控制(&V)</target> -<source>Move files to a user-defined folder</source> -<target>將檔案移動到一個使用者定義的資料夾</target> - <source>Naming convention:</source> <target>命名慣例：</target> -<source>Handle errors:</source> -<target>錯誤處理：</target> - -<source>&Pop-up</source> -<target>彈出(&P)</target> +<source>&Ignore errors</source> +<target>忽略錯誤(&I)</target> <source>Show pop-up on errors or warnings</source> -<target>在彈出視窗上顯示錯誤或警告訊息</target> - -<source>Hide all error and warning messages</source> -<target>隱藏所有錯誤和警告訊息</target> +<target>錯誤或警告時顯示彈出視窗</target> -<source>On completion:</source> -<target>完成後：</target> +<source>Run a command after synchronization:</source> +<target>同步後執行一個命令：</target> <source>OK</source> <target>確定</target> @@ -1082,7 +1076,7 @@ The command is triggered if: <target>排列配對資料夾</target> <source>Enter your login details:</source> -<target>請輸入您的登錄資訊：</target> +<target>請輸入您的登入資訊：</target> <source>Connection type:</source> <target>連線類型：</target> @@ -1100,7 +1094,7 @@ The command is triggered if: <target>已禁用(&D)</target> <source>&Explicit SSL/TLS</source> -<target>顯式SSL/TLS(&E)</target> +<target>外顯式SSL/TLS(&E)</target> <source>Authentication:</source> <target>身份驗證：</target> @@ -1111,6 +1105,9 @@ The command is triggered if: <source>&Key file</source> <target>金鑰檔案(&K)</target> +<source>&SSH agent</source> +<target>SSH連線(&S)</target> + <source>User name:</source> <target>使用者名稱：</target> @@ -1124,16 +1121,13 @@ The command is triggered if: <target>在伺服器上的目錄：</target> <source>Performance improvements:</source> -<target>性能改進：</target> +<target>效能改善：</target> <source>How to get best performance?</source> -<target>如何獲得最佳的性能？</target> - -<source>SSH connections for directory reading:</source> -<target>用於目錄閱讀的SSH連接：</target> +<target>如何獲得最佳效能？</target> -<source>Suggested range: [1 - 10]</source> -<target>建議範圍：[1 - 10]</target> +<source>Connections for directory reading:</source> +<target>用於讀取目錄的連接：</target> <source>SFTP channels per connection:</source> <target>每個連接SFTP通道數：</target> @@ -1141,9 +1135,6 @@ The command is triggered if: <source>Detect server limit</source> <target>檢測伺服器限制</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2連接數 x 10通道 = 20倍更快的目錄讀取速度</target> - <source>Select a directory on the server:</source> <target>選擇伺服器上的目錄：</target> @@ -1157,7 +1148,7 @@ The command is triggered if: <target>變數：</target> <source>&Don't show this dialog again</source> -<target>不要再顯示此對話框(&D)</target> +<target>不再顯示此對話框(&D)</target> <source>Items found:</source> <target>找到的項目：</target> @@ -1183,6 +1174,9 @@ The command is triggered if: <source>Bytes copied:</source> <target>已複製的位元組：</target> +<source>When finished:</source> +<target>完成後：</target> + <source>Close</source> <target>關閉</target> @@ -1193,17 +1187,20 @@ The command is triggered if: <target>停止</target> <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> -<target>新建一個批次處理檔，用於無人值守同步。開始，在此檔案點兩下，或安排在任務規劃中：%x</target> - -<source>&Stop</source> -<target>停止(&S)</target> - -<source>Stop synchronization at first error</source> -<target>在第一個錯誤出現時停止同步</target> +<target>建立一個批次檔，用於無人值守同步。若要開始，在此檔案點兩下，或安排在任務規劃中：%x</target> <source>Run minimized</source> <target>最小化執行</target> +<source>&Show error dialog</source> +<target>顯示錯誤對話框(&S)</target> + +<source>&Cancel</source> +<target>取消(&C)</target> + +<source>Stop synchronization at first error</source> +<target>在第一個錯誤時停止同步</target> + <source>Save log:</source> <target>儲存日誌：</target> @@ -1214,7 +1211,7 @@ The command is triggered if: <target>限制日誌檔的最大數量</target> <source>How can I schedule a batch job?</source> -<target>如何安排批次處理作業？</target> +<target>如何排程批次工作？</target> <source>&Keep relative paths</source> <target>保持相對路徑(&K)</target> @@ -1223,25 +1220,25 @@ The command is triggered if: <target>覆蓋現有檔案(&O)</target> <source>The following settings are used for all synchronization jobs.</source> -<target>下列設定用於所有同步作業。</target> +<target>下列設定用於所有同步工作。</target> <source> Copy to a temporary file (*.ffs_tmp) before overwriting target. This guarantees a consistent state even in case of a serious error. </source> <target> -覆蓋目標之前先複製到一個臨時檔案(*.ffs_tmp)。 +覆蓋目標之前先複製到一個暫存檔(*.ffs_tmp)。 即使發生嚴重錯誤時，還能確保一致的狀態。 </target> -<source>(recommended)</source> -<target>(建議)</target> +<source>recommended</source> +<target>建議</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> -<target>共用的副本或鎖定的檔案使用卷影複製服務。</target> +<target>共用的副本或鎖定的檔案使用磁碟區陰影複製服務。</target> -<source>(requires administrator rights)</source> -<target>(需要管理員權限)</target> +<source>requires administrator rights</source> +<target>需要管理員權限</target> <source>Transfer file and folder permissions.</source> <target>傳輸檔案和資料夾的權限。</target> @@ -1273,14 +1270,17 @@ This guarantees a consistent state even in case of a serious error. <source>Source code written in C++ using:</source> <target>使用C++編寫的原始碼：</target> -<source>Donation details</source> -<target>捐款詳情</target> - <source>If you like FreeFileSync:</source> <target>如果您喜歡FreeFileSync：</target> -<source>Donate with PayPal</source> -<target>使用PayPal捐款</target> +<source>Support with a donation</source> +<target>贊助與支持</target> + +<source>Donation details</source> +<target>贊助詳情</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>自動更新程式已被管理員禁用。</target> <source>Feedback and suggestions are welcome</source> <target>歡迎反映意見和建議</target> @@ -1295,19 +1295,19 @@ This guarantees a consistent state even in case of a serious error. <target>在GNU通用公共許可證下發佈</target> <source>Many thanks for localization:</source> -<target>非常感謝本地化語系翻譯工作人員：</target> +<target>非常感謝在地化翻譯人員：</target> <source>Activate the FreeFileSync Donation Edition by one of the following methods:</source> -<target>透過以下其中一種方法來啟動FreeFileSync捐贈版：</target> +<target>透過以下其中一種方法來啟動FreeFileSync贊助版：</target> <source>1. Activate via internet now:</source> -<target>1.現在透過網際網路啟動：</target> +<target>1. 現在透過網際網路啟動：</target> <source>Activate online</source> <target>線上啟動</target> <source>2. Retrieve an offline activation key from the following URL:</source> -<target>2.從下面的URL檢索離線啟用金鑰：</target> +<target>2. 從下面網址擷取離線啟用金鑰：</target> <source>&Copy to clipboard</source> <target>複製到剪貼簿(&C)</target> @@ -1318,8 +1318,8 @@ This guarantees a consistent state even in case of a serious error. <source>Activate offline</source> <target>離線啟動</target> -<source>Save as Batch Job</source> -<target>另存為批次處理作業</target> +<source>Save as a Batch Job</source> +<target>另存為批次工作</target> <source>Delete Items</source> <target>刪除項目</target> @@ -1334,7 +1334,7 @@ This guarantees a consistent state even in case of a serious error. <target>選擇時間間隔</target> <source>FreeFileSync Donation Edition</source> -<target>FreeFileSync捐贈版</target> +<target>FreeFileSync贊助版</target> <source>&Options</source> <target>選項(&O)</target> @@ -1357,14 +1357,20 @@ This guarantees a consistent state even in case of a serious error. <source>Overview</source> <target>摘要</target> +<source>Show "%x"</source> +<target>顯示「%x」</target> + <source>&Show details</source> <target>顯示詳細資訊(&S)</target> -<source>A new version of FreeFileSync is available:</source> -<target>FreeFileSync有新版本可用：</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x 可用！</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>安裝檔已損壞。請重新安裝FreeFileSync。</target> <source>Local path not available for %x.</source> -<target>沒有適用於 %x 的本機路徑。</target> +<target>本機路徑不適用於 %x。</target> <source>Confirm</source> <target>確認</target> @@ -1408,16 +1414,16 @@ This guarantees a consistent state even in case of a serious error. <target>設定方向：</target> <source>multiple selection</source> -<target>多重選擇</target> +<target>多選</target> <source>Include via filter:</source> -<target>透過篩選器包括：</target> +<target>透過篩選器包含：</target> <source>Exclude via filter:</source> <target>透過篩選器排除：</target> <source>Include temporarily</source> -<target>暫時包括</target> +<target>暫時包含</target> <source>Exclude temporarily</source> <target>暫時排除</target> @@ -1429,7 +1435,7 @@ This guarantees a consistent state even in case of a serious error. <target>刪除(&D)</target> <source>Include all</source> -<target>包括所有</target> +<target>包含所有</target> <source>Exclude all</source> <target>排除所有</target> @@ -1449,9 +1455,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>選擇時間間隔…</target> -<source>Show "%x"</source> -<target>顯示 "%x"</target> - <source>Last session</source> <target>最後連線</target> @@ -1468,13 +1471,13 @@ This guarantees a consistent state even in case of a serious error. <target>是否要儲存變更到 %x？</target> <source>Never save &changes</source> -<target>不儲存變更(&c)</target> +<target>不儲存變更(&C)</target> <source>Do&n't save</source> <target>不儲存(&N)</target> <source>Remove entry from list</source> -<target>從清單中項目刪除</target> +<target>從列表移除項目</target> <source>Clear filter</source> <target>清除篩選器</target> @@ -1501,10 +1504,10 @@ This guarantees a consistent state even in case of a serious error. <target>顯示衝突</target> <source>Show files that will be created on the left side</source> -<target>顯示左邊將被新建的檔案</target> +<target>顯示左邊將被建立的檔案</target> <source>Show files that will be created on the right side</source> -<target>顯示右邊將被新建的檔案</target> +<target>顯示右邊將被建立的檔案</target> <source>Show files that will be deleted on the left side</source> <target>顯示左邊將被刪除的檔案</target> @@ -1546,23 +1549,11 @@ This guarantees a consistent state even in case of a serious error. <target>以逗號分隔值</target> <source>File list exported</source> -<target>檔案清單已匯出</target> +<target>檔案列表已匯出</target> <source>Searching for program updates...</source> <target>正在搜尋程式更新…</target> -<source>Close progress dialog</source> -<target>關閉進度對話框</target> - -<source>Log off</source> -<target>登出</target> - -<source>Standby</source> -<target>待機</target> - -<source>Shut down</source> -<target>關機</target> - <source>Paused</source> <target>已暫停</target> @@ -1593,11 +1584,11 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>日誌</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>安裝檔已損壞。請重新安裝FreeFileSync。</target> - <source>Thank you, %x, for your donation and support!</source> -<target>%x，感謝你的捐款和支持！</target> +<target>%x，感謝您的贊助與支持！</target> + +<source>Recommended range:</source> +<target>建議範圍：</target> <source>Password:</source> <target>密碼：</target> @@ -1605,6 +1596,9 @@ This guarantees a consistent state even in case of a serious error. <source>Key password:</source> <target>金鑰密碼：</target> +<source>Please enter a file path.</source> +<target>請輸入檔案路徑。</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1614,7 +1608,7 @@ This guarantees a consistent state even in case of a serious error. </target> <source>Please enter a target folder.</source> -<target>請輸入目的資料夾。</target> +<target>請輸入目標資料夾。</target> <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> @@ -1639,7 +1633,7 @@ This guarantees a consistent state even in case of a serious error. <target>複製DACL、SACL、擁有者、群組</target> <source>Integrate external applications into context menu. The following macros are available:</source> -<target>整合內容功能表中的外部應用程式。可以使用下面的巨集：</target> +<target>整合內容功能表中的外部應用程式。可使用下面的巨集：</target> <source>Full file or folder path</source> <target>完整檔案或資料夾路徑</target> @@ -1648,13 +1642,13 @@ This guarantees a consistent state even in case of a serious error. <target>上層資料夾路徑</target> <source>Temporary local copy for SFTP and MTP storage</source> -<target>SFTP和MTP儲存裝置的臨時本機副本</target> +<target>SFTP和MTP儲存裝置的本機暫存副本</target> <source>Parameters for opposite side</source> <target>另一邊的參數</target> <source>Show hidden dialogs and warning messages again?</source> -<target>再次顯示隱藏對話框和警告訊息？</target> +<target>再次顯示隱藏的對話框和警告訊息？</target> <source>&Show</source> <target>顯示(&S)</target> @@ -1663,19 +1657,19 @@ This guarantees a consistent state even in case of a serious error. <target>正在下載更新…</target> <source>Identify equal files by comparing modification time and size.</source> -<target>由修改時間和檔案大小比對來判斷相同檔案。</target> +<target>透過檔案修改時間和大小比對來判斷相同檔案。</target> <source>Identify equal files by comparing the file content.</source> -<target>由比對檔案內容來判斷相同檔案。</target> +<target>透過檔案內容比對來判斷相同檔案。</target> <source>Identify equal files by comparing their file size.</source> -<target>由比對檔案大小來判斷相同檔案。</target> +<target>透過檔案大小比對來判斷相同檔案。</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> -<target>識別和傳達兩邊的變更。自動檢測刪除、移動和衝突使用的資料庫。</target> +<target>識別和傳播兩邊的變化。使用資料庫自動檢測刪除、移動和衝突。</target> <source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>新建一個鏡像備份的左邊資料夾來調整匹配右邊資料夾。</target> +<target>透過改寫於右邊的資料夾來匹配建立在左邊鏡像備份的資料夾。</target> <source>Copy new and updated files to the right folder.</source> <target>將新的和已更新的檔案複製到右邊資料夾。</target> @@ -1716,6 +1710,15 @@ This guarantees a consistent state even in case of a serious error. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>在資源回收筒中保留已刪除和覆蓋的檔案</target> + +<source>Delete and overwrite files permanently</source> +<target>永久刪除和覆蓋的檔案</target> + +<source>Move files to a user-defined folder</source> +<target>將檔案移動到一個使用者定義的資料夾</target> + <source>Replace</source> <target>取代</target> @@ -1728,6 +1731,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>將時間戳記附加到每個檔案名稱上</target> +<source>On completion:</source> +<target>完成時：</target> + +<source>On errors:</source> +<target>錯誤時：</target> + +<source>On success:</source> +<target>成功時：</target> + <source>Main config</source> <target>主要配置</target> @@ -1749,20 +1761,17 @@ This guarantees a consistent state even in case of a serious error. <source>Name</source> <target>名稱</target> -<source>Items</source> -<target>項目</target> - <source>Percentage</source> <target>百分比</target> <source>Failed to retrieve update information.</source> -<target>無法檢索更新訊息。</target> +<target>無法擷取更新訊息。</target> <source>Automatic updates:</source> <target>自動更新：</target> <source>Requires FreeFileSync Donation Edition</source> -<target>需要FreeFileSync捐贈版</target> +<target>需要FreeFileSync贊助版</target> <source>Check for Program Updates</source> <target>檢查程式更新</target> @@ -1792,13 +1801,13 @@ This guarantees a consistent state even in case of a serious error. <target>檢查(&C)</target> <source>Consistency check failed for %x.</source> -<target>%x 的一致性檢查失敗。</target> +<target>對 %x 一致性檢查失敗。</target> <source>Installation was registered on a different operating system.</source> <target>已安裝註冊在不同的作業系統上。</target> <source>Failed to activate FreeFileSync Donation Edition.</source> -<target>無法啟動FreeFileSync捐贈版。</target> +<target>無法啟動FreeFileSync贊助版。</target> <source>Incorrect activation key.</source> <target>不正確的啟用金鑰。</target> @@ -1807,16 +1816,16 @@ This guarantees a consistent state even in case of a serious error. <target>無法註冊以接收系統訊息。</target> <source>Cannot find system function %x.</source> -<target>找不到系統函數 %x。</target> +<target>找不到系統功能 %x。</target> <source>Unable to register device notifications for %x.</source> -<target>無法註冊 %x 的裝置通知。</target> +<target>無法為 %x 註冊裝置通知。</target> <source>Cannot monitor directory %x.</source> <target>無法監測目錄 %x。</target> <source>The file is locked by another process:</source> -<target>檔案被另一個進程鎖定：</target> +<target>檔案被另一個處理程序鎖定：</target> <source>Cannot read security context of %x.</source> <target>無法讀取 %x 的安全內容。</target> @@ -1831,7 +1840,7 @@ This guarantees a consistent state even in case of a serious error. <target>無法複製從 %x 到 %y 的權限。</target> <source>%x is not a regular directory name.</source> -<target>%x 不是一個常規目錄名稱。</target> +<target>%x 不是一般目錄名稱。</target> <source>Cannot copy file %x to %y.</source> <target>無法複製檔案 %x 到 %y。</target> @@ -1870,7 +1879,7 @@ This guarantees a consistent state even in case of a serious error. </target> <source>Cannot set privilege %x.</source> -<target>無法設定特別權限 %x。</target> +<target>無法設定 %x 的特權。</target> <source>Unable to suspend system sleep mode.</source> <target>無法中止系統睡眠模式。</target> @@ -1878,14 +1887,17 @@ This guarantees a consistent state even in case of a serious error. <source>Cannot change process I/O priorities.</source> <target>無法更改I/O處理優先順序。</target> +<source>Unable to shut down the system.</source> +<target>無法關閉系統。</target> + <source>Checking recycle bin failed for folder %x.</source> <target>檢查資源回收筒的資料夾 %x 失敗。</target> <source>The following XML elements could not be read:</source> -<target>無法讀取下列XML元素：</target> +<target>無法讀取下列XML元件：</target> <source>Configuration file %x is incomplete. The missing elements will be set to their default values.</source> -<target>配置檔案 %x 是不完整的。缺少的元素將設定為其預設值。</target> +<target>配置檔案 %x 不完整。缺少的元件將設定為其本身預設值。</target> <source>Prepare installation</source> <target>準備安裝</target> @@ -1902,17 +1914,14 @@ This guarantees a consistent state even in case of a serious error. <source>Portable</source> <target>可攜式</target> -<source>recommended</source> -<target>建議</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> -<target>儲存到 "%APPDATA%\FreeFileSync"</target> +<target>儲存到「%APPDATA%\FreeFileSync」</target> <source>Register FreeFileSync file extensions</source> -<target>註冊FreeFileSync檔案副檔名</target> +<target>註冊FreeFileSync檔案關聯</target> <source>Create Explorer context menu entries</source> -<target>新建資源管理器右鍵選單項目</target> +<target>建立資源管理器右鍵選單項目</target> <source>Save settings in installation directory</source> <target>儲存設定到安裝目錄</target> @@ -1936,10 +1945,10 @@ This guarantees a consistent state even in case of a serious error. <target>開始功能表</target> <source>Registering FreeFileSync file extensions</source> -<target>註冊FreeFileSync檔案副檔名</target> +<target>註冊FreeFileSync檔案關聯</target> <source>Unregistering FreeFileSync file extensions</source> -<target>取消註冊FreeFileSync檔案副檔名</target> +<target>取消註冊FreeFileSync檔案關聯</target> <source>FreeFileSync Configuration</source> <target>FreeFileSync配置</target> @@ -1956,12 +1965,12 @@ This guarantees a consistent state even in case of a serious error. <source>Edit with FreeFileSync</source> <target>使用FreeFileSync進行編輯</target> -<source>The portable version cannot install into the selected folder.</source> -<target>可攜式版本不能安裝到所選的資料夾。</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>FreeFileSync可攜式版本無法安裝到 %x 的子資料夾。</target> <source>Please choose the local installation type or select a different folder for installation.</source> -<target>請選擇本地安裝類型或選擇不同的安裝資料夾。</target> +<target>請選擇本機安裝類型或選擇不同的安裝資料夾。</target> <source>The silent installation mode is only available in the FreeFileSync Donation Edition.</source> -<target>無干擾安裝模式僅在FreeFileSync捐贈版才可使用。</target> +<target>命令提示字元安裝模式僅在FreeFileSync贊助版才可使用。</target> diff --git a/FreeFileSync/Build/Languages/croatian.lng b/FreeFileSync/Build/Languages/croatian.lng index c30f7c13..c1be603f 100755 --- a/FreeFileSync/Build/Languages/croatian.lng +++ b/FreeFileSync/Build/Languages/croatian.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Provjeravanje dosupnosti kante za smeće za mapu %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Koš za smeće nije dostupna za sljedeće mape. Zbog toga će datoteke biti trajno obrisane:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>Koš za smeće nije podržan od slijedećih mapa. Izbrisane ili prepisane datoteke neće biti moguće povratiti:</target> <source>An exception occurred</source> <target>Dogodilo se izuzeće</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Sintaksa:</target> -<source>global config file:</source> -<target>globalna config datoteka:</target> - <source>config files:</source> <target>config datoteke:</target> <source>directory</source> <target>direktorij</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Putanja do alternativne GlobalSettings.xml datoteke.</target> +<source>global config file:</source> +<target>globalna config datoteka:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Bilo koji broj FreeFileSync .ffs_gui i/ili .ffs_batch konfiguracijskih datoteka.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Bilo koji broj alternativnih parova mapa za najmanje jednu config datoteku.</target> -<source>Open configuration for editing without executing it.</source> -<target>Otvori postavke za izmjenu bez pokretanja.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Otvorite odabrane postavke za izmjenu bez da ih izvršite.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Putanja do alternativne GlobalSettings.xml datoteke.</target> <source>Cannot find the following folders:</source> <target>Ne mogu pronaći slijedeće mape:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Osvježi atribute desno</target> -<source>Cannot write file %x.</source> -<target>Ne mogu zapisati datoteku %x.</target> +<source>Cannot read file %x.</source> +<target>Ne mogu čitati datoteku %x.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Stvarno: %y bajta <source>Operation not supported for different base folder types.</source> <target>Operacija nije podržana za različite bazne mape.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Ne može se kopirati simbolična poveznica %x prema %y.</target> +<source>Cannot write file %x.</source> +<target>Ne mogu zapisati datoteku %x.</target> <source>Cannot move file %x to %y.</source> <target>Ne mogu premjestiti datoteku %x u %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Ne može se kopirati simbolična poveznica %x prema %y.</target> + <source>Unable to connect to %x.</source> <target>Nije moguće povezivanje na %x.</target> @@ -291,9 +294,6 @@ Stvarno: %y bajta <source>Cannot read directory %x.</source> <target>Nije moguće učitati mapu %x.</target> -<source>Cannot read file %x.</source> -<target>Ne mogu čitati datoteku %x.</target> - <source>Cannot read file attributes of %x.</source> <target>Ne mogu pročitati osobine od %x.</target> @@ -601,8 +601,8 @@ Naredba će biti pokrenuta ako se: <source>Automated Synchronization</source> <target>Automatska Sinkronizacija</target> -<source>The following path does not support directory monitoring:</source> -<target>Slijedeća putanja ne podržava nadzor nad mapama:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>%x protokol ne podržava nadziranje mapa:</target> <source>Directory monitoring active</source> <target>Nadzor direktorija je aktivan</target> @@ -718,8 +718,8 @@ Naredba će biti pokrenuta ako se: <source>Base folder:</source> <target>Bazna mapa:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>Mapa verzije će biti sinkronizirana jer je sadržana u baznoj mapi.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>Usporedni folder se nalazi u baznom folderu.</target> <source>Synchronizing folder pair:</source> <target>Mape sinkronizacije::</target> @@ -733,6 +733,15 @@ Naredba će biti pokrenuta ako se: <source>job name</source> <target>Naziv zadatka</target> +<source>Show summary</source> +<target>Prikaži izvještaj</target> + +<source>Sleep</source> +<target>U stanje pripravnosti</target> + +<source>Shut down</source> +<target>Isključi računalo</target> + <source>Synchronization stopped</source> <target>Sinkronizacija zaustavljena</target> @@ -754,6 +763,9 @@ Naredba će biti pokrenuta ako se: <source>Synchronization completed successfully</source> <target>Sinkronizacija uspješno dovršena</target> +<source>Executing command %x</source> +<target>Izvršavanje naredbe %x</target> + <source>Cleaning up old log files...</source> <target>Čistim stare datoteke o izvješću...</target> @@ -782,8 +794,8 @@ Naredba će biti pokrenuta ako se: <pluralform>Automatski pokušaj za %x sekundi...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Zanemari naknadne pogreške</target> +<source>Ignore &all</source> +<target>Ignoriraj &sve</target> <source>Retrying operation...</source> <target>Ponavljam operaciju...</target> @@ -890,12 +902,12 @@ Naredba će biti pokrenuta ako se: <source>&Find...</source> <target>&Pronađi...</target> -<source>&Reset layout</source> -<target>&Resetiraj prikaz</target> - <source>&Export file list...</source> <target>&Izvoz popisa datoteka...</target> +<source>&Reset layout</source> +<target>&Resetiraj prikaz</target> + <source>&Tools</source> <target>&Alati</target> @@ -1031,9 +1043,6 @@ Naredba će biti pokrenuta ako se: <source>C&lear</source> <target>O&čisti</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Otkrij putanju sinkronizacije pomoću baze podataka</target> - <source>Detect moved files</source> <target>Otkrij premještene datoteke</target> @@ -1054,38 +1063,23 @@ Naredba će biti pokrenuta ako se: <source>&Recycle bin</source> <target>&Koš za smeće</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Spremi izbrisane ili prepisane datoteke u koš za smeće</target> - <source>&Permanent</source> <target>&Trajno</target> -<source>Delete or overwrite files permanently</source> -<target>Trajno izbriši ili prepiši datoteke</target> - <source>&Versioning</source> -<target>&Označavanje</target> - -<source>Move files to a user-defined folder</source> -<target>Premjesti datoteke u mapu određenu od korsnika</target> +<target>&Odabir</target> <source>Naming convention:</source> <target>Naziv pravila:</target> -<source>Handle errors:</source> -<target>Obradi pogreške:</target> - -<source>&Pop-up</source> -<target>&Pop-up</target> +<source>&Ignore errors</source> +<target>&Ignoriraj pogreške</target> <source>Show pop-up on errors or warnings</source> <target>Prikaži skočni prozor pri greškama i upozorenjima</target> -<source>Hide all error and warning messages</source> -<target>Sakrij sve poruke za greške i upozorenja</target> - -<source>On completion:</source> -<target>Pri dovršetku:</target> +<source>Run a command after synchronization:</source> +<target>Pokreni naredbu nakon sinkronizacije:</target> <source>OK</source> <target>U redu</target> @@ -1123,6 +1117,9 @@ Naredba će biti pokrenuta ako se: <source>&Key file</source> <target>&Ključ</target> +<source>&SSH agent</source> +<target>&SSH upravitelj</target> + <source>User name:</source> <target>Korisničko ime:</target> @@ -1141,11 +1138,8 @@ Naredba će biti pokrenuta ako se: <source>How to get best performance?</source> <target>Kako dobiti najbolje perfomanse?</target> -<source>SSH connections for directory reading:</source> -<target>SSH konekcije za čitanje direktorija:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Predložen raspon: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>Broj veza za čitanje mapa:</target> <source>SFTP channels per connection:</source> <target>SFTP kanala po konekciji:</target> @@ -1153,9 +1147,6 @@ Naredba će biti pokrenuta ako se: <source>Detect server limit</source> <target>Detektiranje limita servera</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 konekcije x 10 kanala = 20 puta brže čitanje direktorija</target> - <source>Select a directory on the server:</source> <target>Odaberi mapu na serveru:</target> @@ -1195,6 +1186,9 @@ Naredba će biti pokrenuta ako se: <source>Bytes copied:</source> <target>Bajta kopirano:</target> +<source>When finished:</source> +<target>Nakon završetka:</target> + <source>Close</source> <target>Zatvori</target> @@ -1207,15 +1201,18 @@ Naredba će biti pokrenuta ako se: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Stvaranje slijednih datoteka za sinkronizaciju bez nadzora. Da započnete, dvostruko-kliknite na ovu datoteku ili planirajte u planeru zadataka: %x</target> -<source>&Stop</source> -<target>&Zaustavi</target> +<source>Run minimized</source> +<target>Pokreni minimizirano</target> + +<source>&Show error dialog</source> +<target>&Prikaži pogreške</target> + +<source>&Cancel</source> +<target>&Odustani</target> <source>Stop synchronization at first error</source> <target>Zaustavi sinkronizaciju pri prvoj pogrešci</target> -<source>Run minimized</source> -<target>Pokreni minimizirano</target> - <source>Save log:</source> <target>Spremi izvještaj:</target> @@ -1243,17 +1240,17 @@ This guarantees a consistent state even in case of a serious error. </source> <target> Kopiraj u privremenu datoteku (*.ffs_tmp) prije prepisivanja ciljne datoteke -Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. +Ovo garantira stabilno stanje čak u slučaju ozbiljne greške. </target> -<source>(recommended)</source> -<target>(preporučeno)</target> +<source>recommended</source> +<target>preporučljivo</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Kopiraj djeljene ili zaključane datoteke pomoću Volume Shadow Copy servisa.</target> -<source>(requires administrator rights)</source> -<target>(zahtjeva administratorske ovlasti)</target> +<source>requires administrator rights</source> +<target>zahtjeva administratorska prava</target> <source>Transfer file and folder permissions.</source> <target>Prenesi dopuštenja za datoteke i mape.</target> @@ -1274,7 +1271,7 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <target>Opis</target> <source>Show hidden dialogs again</source> -<target>Prikazuj skrivene prozore ponovno</target> +<target>Prikaži skrivene prozore ponovno</target> <source>Show all permanently hidden dialogs and warning messages again</source> <target>Prikaži sve trajno skrivene prozore i poruke upozorenja ponovno</target> @@ -1285,14 +1282,17 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <source>Source code written in C++ using:</source> <target>Izvorni kod napisan u C++ uz korištenje:</target> -<source>Donation details</source> -<target>Detalji donacije</target> - <source>If you like FreeFileSync:</source> <target>Ako volite FreeFileSync:</target> -<source>Donate with PayPal</source> -<target>Donirajte s PayPal</target> +<source>Support with a donation</source> +<target>Podržite nas donacijom</target> + +<source>Donation details</source> +<target>Detalji donacije</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>Auto updater je onemogućen od strane administratora.</target> <source>Feedback and suggestions are welcome</source> <target>Povratne informacije i prijedlozi su dobrodošli</target> @@ -1330,7 +1330,7 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <source>Activate offline</source> <target>Aktivacija offline</target> -<source>Save as Batch Job</source> +<source>Save as a Batch Job</source> <target>Spremi kao slijedni zadatak</target> <source>Delete Items</source> @@ -1369,11 +1369,17 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <source>Overview</source> <target>Pregled</target> +<source>Show "%x"</source> +<target>Prikaži "%x"</target> + <source>&Show details</source> <target>&Prikaži detalje</target> -<source>A new version of FreeFileSync is available:</source> -<target>Nova verzija FreeFileSync je dostupna:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x je dostupan!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Instalacijske datoteke su oštećene. Molimo ponovno instalirajte FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Nije dostupna lokalna putanja za %x.</target> @@ -1469,9 +1475,6 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <source>Select time span...</source> <target>Odaberite vremenski raspon...</target> -<source>Show "%x"</source> -<target>Prikaži "%x"</target> - <source>Last session</source> <target>Zadnja sesija</target> @@ -1571,18 +1574,6 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <source>Searching for program updates...</source> <target>Tražim nadogradnju programa...</target> -<source>Close progress dialog</source> -<target>Zatvori prozor zadatka</target> - -<source>Log off</source> -<target>Odlogiraj se</target> - -<source>Standby</source> -<target>Spavaj</target> - -<source>Shut down</source> -<target>Isključi računalo</target> - <source>Paused</source> <target>Pauzirano</target> @@ -1613,18 +1604,21 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <source>Log</source> <target>Izvješće</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Instalacijske datoteke su oštećene. Molimo ponovno instalirajte FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Hvala Vam, %x, na vašoj donaciji i podršci!</target> +<source>Recommended range:</source> +<target>Predloženi raspon:</target> + <source>Password:</source> <target>Lozinka:</target> <source>Key password:</source> <target>Aktivacijski ključ:</target> +<source>Please enter a file path.</source> +<target>Molimo unesite putanju datoteke.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1742,6 +1736,15 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Zadržati izbrisane i prepisane datoteke u košu za smeće</target> + +<source>Delete and overwrite files permanently</source> +<target>Izbrisati i prepisat datoteke trajno</target> + +<source>Move files to a user-defined folder</source> +<target>Premjesti datoteke u mapu određenu od korsnika</target> + <source>Replace</source> <target>Zamjeni</target> @@ -1754,6 +1757,15 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <source>Append a time stamp to each file name</source> <target>Dodijeli vremensku oznaku za svaki naziv datoteke</target> +<source>On completion:</source> +<target>Pri dovršetku:</target> + +<source>On errors:</source> +<target>Uslijed grešaka:</target> + +<source>On success:</source> +<target>Pri uspješnom dovršetku:</target> + <source>Main config</source> <target>Glavne postavke</target> @@ -1775,9 +1787,6 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <source>Name</source> <target>Naziv</target> -<source>Items</source> -<target>Stavke</target> - <source>Percentage</source> <target>Postotak</target> @@ -1910,6 +1919,9 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <source>Cannot change process I/O priorities.</source> <target>Ne može se promjeniti proces I/O prioriteta.</target> +<source>Unable to shut down the system.</source> +<target>Nije moguće isključiti računalo.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Provjeravanje koša za smeće neuspješno za mapu %x.</target> @@ -1934,9 +1946,6 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <source>Portable</source> <target>Prenosivo</target> -<source>recommended</source> -<target>preporučljivo</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Spremi postavke u "%APPDATA%\FreeFileSync"</target> @@ -1988,8 +1997,8 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <source>Edit with FreeFileSync</source> <target>Uredi pomoću FreeFileSynca</target> -<source>The portable version cannot install into the selected folder.</source> -<target>Ova portabilna verzija se ne može instalirati u odabranu mapu.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>FreeFileSync prijenosna verzija se ne može instalirati u podfolder od %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Molimo odaberite lokalnu instalaciju ili odaberite drugu mapu za instalaciju.</target> diff --git a/FreeFileSync/Build/Languages/czech.lng b/FreeFileSync/Build/Languages/czech.lng index 48c27dec..fb30d713 100755 --- a/FreeFileSync/Build/Languages/czech.lng +++ b/FreeFileSync/Build/Languages/czech.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Kontrola Koše na složku %x ...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Nelze použít Koš pro následující složky. Soubory tak budou odstraněny permanentně:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>Pro některé složky nelze použít Koš a proto následující soubory budou odstraněny trvale, bez možnosti obnovy:</target> <source>An exception occurred</source> <target>Vyskytla se chyba</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Syntaxe:</target> -<source>global config file:</source> -<target>konfigurační soubory:</target> - <source>config files:</source> <target>konfigurační soubory:</target> <source>directory</source> <target>adresář</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Cesta k alternativnímu souboru GlobalSettings.xml.</target> +<source>global config file:</source> +<target>konfigurační soubory:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Libovolný počet konfiguračních souborů FreeFileSync typu .ffs_gui a/nebo .ffs_batch.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Libovolný počet alternativních párů adresářů na alespoň jednu konfiguraci.</target> -<source>Open configuration for editing without executing it.</source> -<target>Otevřít konfiguraci pro editaci bez jejího spuštění.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Otevřít konfiguraci pouze pro editaci aniž by byla spuštěna.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Cesta k alternativnímu souboru GlobalSettings.xml.</target> <source>Cannot find the following folders:</source> <target>Nelze najít následující složky:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Nastavit vlastnosti vpravo</target> -<source>Cannot write file %x.</source> -<target>Nelze zapsat soubor %x.</target> +<source>Cannot read file %x.</source> +<target>Nelze číst soubor %x.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Aktuálně: %y b <source>Operation not supported for different base folder types.</source> <target>Operace není podporována pro různé typy základních adresářů.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Nelze kopírovat symbolický odkaz %x do %y.</target> +<source>Cannot write file %x.</source> +<target>Nelze zapsat soubor %x.</target> <source>Cannot move file %x to %y.</source> <target>Nelze přesunout soubor %x do %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Nelze kopírovat symbolický odkaz %x do %y.</target> + <source>Unable to connect to %x.</source> <target>Nepodařilo se připojit k %x.</target> @@ -292,10 +295,7 @@ Aktuálně: %y b <target>Nelze číst adresář %x.</target> <source>Cannot read file attributes of %x.</source> -<target>Nelze číst atributy souboru %x.</target> - -<source>Cannot read file %x.</source> -<target>Nelze číst soubor %x.</target> +<target>Nelze číst vlastnosti souboru %x.</target> <source>Cannot create directory %x.</source> <target>Nelze vytvořit adresář %x.</target> @@ -307,7 +307,7 @@ Aktuálně: %y b <target>Nelze smazat adresář %x.</target> <source>Cannot write modification time of %x.</source> -<target>Nelze nastavit atribut času změny pro %x.</target> +<target>Nelze nastavit čas změny ve vlastnostech %x.</target> <source>Cannot determine final path for %x.</source> <target>Nelze určit výslednou cestu pro %x.</target> @@ -601,8 +601,8 @@ Příkaz je spuštěn když: <source>Automated Synchronization</source> <target>Automatická synchronizace</target> -<source>The following path does not support directory monitoring:</source> -<target>Následující cesta nepodporuje sledování adresářů:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>Protokol %x nepodporuje sledování adresářů:</target> <source>Directory monitoring active</source> <target>Sledování adresářů je aktivní</target> @@ -668,10 +668,10 @@ Příkaz je spuštěn když: <target>Kontrola souboru %x</target> <source>Updating attributes of %x</source> -<target>Aktualizace atributů souboru %x</target> +<target>Aktualizace vlastností souboru %x</target> <source>Cannot write file attributes of %x.</source> -<target>Nelze zapsat atributy souboru %x.</target> +<target>Nelze zapsat vlastnosti souboru %x.</target> <source>%x and %y have different content.</source> <target>%x a %y mají odlišný obsah.</target> @@ -718,8 +718,8 @@ Příkaz je spuštěn když: <source>Base folder:</source> <target>Základní složka:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>Verzovací složka bude synchronizována neboť je obsažena v základní nadřazené složce.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>Verzovaná složka je vnořena v základní nadřazené složce.</target> <source>Synchronizing folder pair:</source> <target>Zpracovávání páru složek:</target> @@ -733,6 +733,15 @@ Příkaz je spuštěn když: <source>job name</source> <target>název úlohy</target> +<source>Show summary</source> +<target>Zobrazit souhrn</target> + +<source>Sleep</source> +<target>Režim spánku</target> + +<source>Shut down</source> +<target>Vypnout počítač</target> + <source>Synchronization stopped</source> <target>Synchronizace zastavena</target> @@ -754,6 +763,9 @@ Příkaz je spuštěn když: <source>Synchronization completed successfully</source> <target>Synchronizace dokončena úspěšně</target> +<source>Executing command %x</source> +<target>Spuštění příkazu %x</target> + <source>Cleaning up old log files...</source> <target>Odstraňování starých žurnálů...</target> @@ -782,8 +794,8 @@ Příkaz je spuštěn když: <pluralform>Autoamticky opakovat za %x sekund...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>Pře&skočit další chyby</target> +<source>Ignore &all</source> +<target>Přeskočit &vše</target> <source>Retrying operation...</source> <target>Opakovaní operace...</target> @@ -890,12 +902,12 @@ Příkaz je spuštěn když: <source>&Find...</source> <target>&Najít...</target> -<source>&Reset layout</source> -<target>&Obnovit rozložení</target> - <source>&Export file list...</source> <target>&Exportovat seznam souborů...</target> +<source>&Reset layout</source> +<target>&Obnovit rozložení</target> + <source>&Tools</source> <target>&Nastavení</target> @@ -1031,9 +1043,6 @@ Příkaz je spuštěn když: <source>C&lear</source> <target>Vy&mazat</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Určit směr synchronizace pomocí databáze</target> - <source>Detect moved files</source> <target>Detekce přesunutých souborů</target> @@ -1054,38 +1063,23 @@ Příkaz je spuštěn když: <source>&Recycle bin</source> <target>&Koš</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Použít Koš při mazání nebo přepisu souborů</target> - <source>&Permanent</source> <target>&Trvale</target> -<source>Delete or overwrite files permanently</source> -<target>Smazat nebo přepsat soubory trvale</target> - <source>&Versioning</source> <target>&Verzování</target> -<source>Move files to a user-defined folder</source> -<target>Přesunout soubory do uživatelského adresáře</target> - <source>Naming convention:</source> <target>Pojmenování:</target> -<source>Handle errors:</source> -<target>Zpracování chyb:</target> - -<source>&Pop-up</source> -<target>&Hlášení</target> +<source>&Ignore errors</source> +<target>&Přeskočit chyby</target> <source>Show pop-up on errors or warnings</source> <target>Zobrazit hlášení při chybě nebo varování</target> -<source>Hide all error and warning messages</source> -<target>Skrýt všechny chyby a varování</target> - -<source>On completion:</source> -<target>Po dokončení:</target> +<source>Run a command after synchronization:</source> +<target>Po dokončení synchronizace spustit příkaz:</target> <source>OK</source> <target>OK</target> @@ -1123,6 +1117,9 @@ Příkaz je spuštěn když: <source>&Key file</source> <target>&Klíč</target> +<source>&SSH agent</source> +<target>&SSH agent</target> + <source>User name:</source> <target>Uživatelské jméno:</target> @@ -1141,11 +1138,8 @@ Příkaz je spuštěn když: <source>How to get best performance?</source> <target>Jak získat nejlepší rychlost?</target> -<source>SSH connections for directory reading:</source> -<target>SSH spojení pro čtení adresářů:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Navrhované rozmezí: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>Spojení pro čtení adresáře:</target> <source>SFTP channels per connection:</source> <target>SFTP kanálů na spojení:</target> @@ -1153,9 +1147,6 @@ Příkaz je spuštěn když: <source>Detect server limit</source> <target>Zjistit omezení serveru</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 spojení x 10 kanálů = 20 krát rychlejší načítání adresářů</target> - <source>Select a directory on the server:</source> <target>Výběr adresáře na serveru:</target> @@ -1195,6 +1186,9 @@ Příkaz je spuštěn když: <source>Bytes copied:</source> <target>Zkopírováno dat:</target> +<source>When finished:</source> +<target>Po dokončení:</target> + <source>Close</source> <target>Zavřít</target> @@ -1207,15 +1201,18 @@ Příkaz je spuštěn když: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Vytvoří dávkový souboru pro automatickou synchronizaci. Ke spuštění dávky jednoduše poklikejte na vytvořený soubor nebo využijte plánovač úloh vašeho systému: %x</target> -<source>&Stop</source> -<target>&Zastavit</target> +<source>Run minimized</source> +<target>Minimalizovat</target> + +<source>&Show error dialog</source> +<target>Zobrazit chybové &okno</target> + +<source>&Cancel</source> +<target>&Zrušit</target> <source>Stop synchronization at first error</source> <target>Ukončit synchronizaci při první chybě</target> -<source>Run minimized</source> -<target>Minimalizovat</target> - <source>Save log:</source> <target>Uložit žurnál:</target> @@ -1243,14 +1240,14 @@ This guarantees a consistent state even in case of a serious error. </source> <target>Kopírovat nejprve do pomocného souboru (*.ffs_tmp) před přepisem cíle. Tento postup zajišťuje bezpečné chování i v případě závažné chyby.</target> -<source>(recommended)</source> -<target>(doporučeno)</target> +<source>recommended</source> +<target>doporučeno</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Kopírovat sdílené nebo zamčené soubory pomocí služby Stínové kopie.</target> -<source>(requires administrator rights)</source> -<target>(vyžaduje administrátorská oprávnění)</target> +<source>requires administrator rights</source> +<target>vyžaduje administrátorská oprávnění</target> <source>Transfer file and folder permissions.</source> <target>Přenést přístupová oprávnění souborů a složek.</target> @@ -1282,14 +1279,17 @@ This guarantees a consistent state even in case of a serious error. <source>Source code written in C++ using:</source> <target>Zdrojový kód byl napsán kompletně v C++ pomocí:</target> -<source>Donation details</source> -<target>Podrobnosti</target> - <source>If you like FreeFileSync:</source> <target>Pokud se Vám FreeFileSync líbí:</target> -<source>Donate with PayPal</source> -<target>Přispět pomocí PayPal</target> +<source>Support with a donation</source> +<target>Podpořit darem</target> + +<source>Donation details</source> +<target>Podrobnosti</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>Automatická aktualizace byla správcem zakázána.</target> <source>Feedback and suggestions are welcome</source> <target>Komentáře a náměty jsou vždy vítány</target> @@ -1327,7 +1327,7 @@ This guarantees a consistent state even in case of a serious error. <source>Activate offline</source> <target>Aktivace off-line</target> -<source>Save as Batch Job</source> +<source>Save as a Batch Job</source> <target>Uložit jako dávku</target> <source>Delete Items</source> @@ -1366,11 +1366,17 @@ This guarantees a consistent state even in case of a serious error. <source>Overview</source> <target>Přehled</target> +<source>Show "%x"</source> +<target>Zobrazit "%x"</target> + <source>&Show details</source> <target>&Zobrazit podrobnosti</target> -<source>A new version of FreeFileSync is available:</source> -<target>Je dostupná novější verze FreeFileSync:</target> +<source>FreeFileSync %x is available!</source> +<target>Je k dostupná verze FreeFileSync %x!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Instalace programu je poškozena. Prosím nainstalujte znovu FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Místní cesta není k dispozici pro %x.</target> @@ -1466,9 +1472,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>Zadejte časové rozmezí...</target> -<source>Show "%x"</source> -<target>Zobrazit "%x"</target> - <source>Last session</source> <target>Poslední sezení</target> @@ -1568,18 +1571,6 @@ This guarantees a consistent state even in case of a serious error. <source>Searching for program updates...</source> <target>Hledání aktualizací programu ...</target> -<source>Close progress dialog</source> -<target>Zavřít průběh zpracování</target> - -<source>Log off</source> -<target>Odhlásit uživatele</target> - -<source>Standby</source> -<target>Přepnout do úsporného režimu</target> - -<source>Shut down</source> -<target>Vypnout počítač</target> - <source>Paused</source> <target>Pauza</target> @@ -1610,18 +1601,21 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>Záznam zpracování</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Instalace programu je poškozena. Prosím nainstalujte znovu FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Děkuji, %x, za příspěvek a podporu!</target> +<source>Recommended range:</source> +<target>Doporučený rozsah:</target> + <source>Password:</source> <target>Heslo:</target> <source>Key password:</source> <target>Klíč:</target> +<source>Please enter a file path.</source> +<target>Prosím zadejte cestu k souboru.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1739,6 +1733,15 @@ This guarantees a consistent state even in case of a serious error. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Použít Koš pro mazání nebo přepis souborů</target> + +<source>Delete and overwrite files permanently</source> +<target>Odstranit a přepsat soubory trvale</target> + +<source>Move files to a user-defined folder</source> +<target>Přesunout soubory do uživatelského adresáře</target> + <source>Replace</source> <target>Nahradit</target> @@ -1751,6 +1754,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>Přidat časovou značku ke jménu souboru</target> +<source>On completion:</source> +<target>Po dokončení:</target> + +<source>On errors:</source> +<target>Při chybě:</target> + +<source>On success:</source> +<target>Při dokončení:</target> + <source>Main config</source> <target>Hlavní nastavení</target> @@ -1772,9 +1784,6 @@ This guarantees a consistent state even in case of a serious error. <source>Name</source> <target>Název</target> -<source>Items</source> -<target>Položky</target> - <source>Percentage</source> <target>Procentní podíl</target> @@ -1860,7 +1869,7 @@ This guarantees a consistent state even in case of a serious error. <target>Nelze kopírovat soubor %x do %y.</target> <source>Cannot copy attributes from %x to %y.</source> -<target>Nelze kopírovat atributy z %x do %y.</target> +<target>Nelze kopírovat vlastnosti z %x do %y.</target> <source>%x TB</source> <target>%x TB</target> @@ -1907,6 +1916,9 @@ This guarantees a consistent state even in case of a serious error. <source>Cannot change process I/O priorities.</source> <target>Nelze nastavit priority procesu.</target> +<source>Unable to shut down the system.</source> +<target>Nepodařilo se vypnout systém.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Selhala kontrola Koše pro složku %x.</target> @@ -1931,9 +1943,6 @@ This guarantees a consistent state even in case of a serious error. <source>Portable</source> <target>Přenosná</target> -<source>recommended</source> -<target>doporučeno</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>uloží nastavení do složky "%APPDATA%\FreeFileSync"</target> @@ -1985,8 +1994,8 @@ This guarantees a consistent state even in case of a serious error. <source>Edit with FreeFileSync</source> <target>Upravit v FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>Přenosnou verzi aplikace nelze instalovat do vybrané složky.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>Přenosná verze FreeFileSync nemůže být instalována do složky %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Prosím zvolte lokální typ instalace nebo vyberte jinou složku.</target> diff --git a/FreeFileSync/Build/Languages/danish.lng b/FreeFileSync/Build/Languages/danish.lng index 3e64b5be..4f08824c 100755 --- a/FreeFileSync/Build/Languages/danish.lng +++ b/FreeFileSync/Build/Languages/danish.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Tjekker papirkurvs tilgængelighed for mappen %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Papirkurven kan ikke bruges til følgende mapper. Filerne slettes permanent:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>Papirkurven understøttere ikke følgende mapper. Slettede eller overskrevne filer kan ikke gendannes:</target> <source>An exception occurred</source> <target>Undtagelse opstod</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Syntaks:</target> -<source>global config file:</source> -<target>global indstillingsfil:</target> - <source>config files:</source> <target>indstillingsfiler:</target> <source>directory</source> <target>mappe</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Sti til alternativ GlobalSettings.xml fil.</target> +<source>global config file:</source> +<target>global indstillingsfil:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Vilkårligt antal FreeFileSync .ffs_gui og/eller .ffs_batch indstillingsfiler.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Vilkårligt antal alternative mappepar til højst en indstillingsfil.</target> -<source>Open configuration for editing without executing it.</source> -<target>Redigér indstillingsfil.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Åben valgte indstilling for at redigere den.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Sti til alternativ GlobalSettings.xml fil.</target> <source>Cannot find the following folders:</source> <target>Kan ikke finde følgende mapper:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Opdater attributter mod højre</target> -<source>Cannot write file %x.</source> -<target>Kan ikke oprette filen %x.</target> +<source>Cannot read file %x.</source> +<target>Kan ikke læse filen %x.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Aktuel: %y byte <source>Operation not supported for different base folder types.</source> <target>Handlingen understøtter ikke forskellige typer hovedmapper.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Kan ikke kopiere symlink fra %x til %y.</target> +<source>Cannot write file %x.</source> +<target>Kan ikke oprette filen %x.</target> <source>Cannot move file %x to %y.</source> <target>Kan ikke flytte filen %x til %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Kan ikke kopiere symlink fra %x til %y.</target> + <source>Unable to connect to %x.</source> <target>Kan ikke kontakte %x.</target> @@ -294,9 +297,6 @@ Aktuel: %y byte <source>Cannot read file attributes of %x.</source> <target>Kan ikke læse filattributterne på %x.</target> -<source>Cannot read file %x.</source> -<target>Kan ikke læse filen %x.</target> - <source>Cannot create directory %x.</source> <target>Kan ikke oprette mappen %x.</target> @@ -596,8 +596,8 @@ Kommandoen udføres hvis: <source>Automated Synchronization</source> <target>Automatisk synkronisering</target> -<source>The following path does not support directory monitoring:</source> -<target>Følgende placering understøtter ikke mappeovervågning:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>Protokollen %x understøttere ikke mappeovervågning:</target> <source>Directory monitoring active</source> <target>Mappeovervågning aktiv</target> @@ -713,8 +713,8 @@ Kommandoen udføres hvis: <source>Base folder:</source> <target>Basismappe:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>Versioneringsmappen synkroniseres, da den er indeholdt i en basismappe.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>Versioneringsmappen ligger i hovedmappen.</target> <source>Synchronizing folder pair:</source> <target>Synkroniserer mappepar:</target> @@ -728,6 +728,15 @@ Kommandoen udføres hvis: <source>job name</source> <target>Jobnavn</target> +<source>Show summary</source> +<target>Resultat</target> + +<source>Sleep</source> +<target>Slumre</target> + +<source>Shut down</source> +<target>Luk ned</target> + <source>Synchronization stopped</source> <target>Synkronisering afbrudt</target> @@ -749,6 +758,9 @@ Kommandoen udføres hvis: <source>Synchronization completed successfully</source> <target>Synkronisering gennemført</target> +<source>Executing command %x</source> +<target>Kører kommandoen %x</target> + <source>Cleaning up old log files...</source> <target>Fjerner gamle logfiler...</target> @@ -776,8 +788,8 @@ Kommandoen udføres hvis: <pluralform>Prøver igen om %x sekunder...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Ignorer efterfølgende fejl</target> +<source>Ignore &all</source> +<target>Ignorer &alle</target> <source>Retrying operation...</source> <target>Prøver igen...</target> @@ -884,12 +896,12 @@ Kommandoen udføres hvis: <source>&Find...</source> <target>S&øg...</target> -<source>&Reset layout</source> -<target>N&ulstil layout</target> - <source>&Export file list...</source> <target>&Eksporter filliste...</target> +<source>&Reset layout</source> +<target>N&ulstil layout</target> + <source>&Tools</source> <target>&Værktøj</target> @@ -1025,9 +1037,6 @@ Kommandoen udføres hvis: <source>C&lear</source> <target>R&yd</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Genkend synkretninger ved hjælp af databasefiler</target> - <source>Detect moved files</source> <target>Genkend flyttede filer</target> @@ -1048,38 +1057,23 @@ Kommandoen udføres hvis: <source>&Recycle bin</source> <target>&Papirkurv</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Flyt slettede og overskrevne filer til papirkurven</target> - <source>&Permanent</source> <target>&Permanent</target> -<source>Delete or overwrite files permanently</source> -<target>Slet eller overskriv filer permanent</target> - <source>&Versioning</source> <target>&Versionering</target> -<source>Move files to a user-defined folder</source> -<target>Flyt filer til brugerdefineret mappe</target> - <source>Naming convention:</source> <target>Navneregler:</target> -<source>Handle errors:</source> -<target>Fejlhåndtering:</target> - -<source>&Pop-up</source> -<target>&Besked</target> +<source>&Ignore errors</source> +<target>&Ignorer fejl</target> <source>Show pop-up on errors or warnings</source> <target>Vis fejlbeskeder og advarsler</target> -<source>Hide all error and warning messages</source> -<target>Skjul fejlbeskeder og advarsler</target> - -<source>On completion:</source> -<target>Ved gennemført:</target> +<source>Run a command after synchronization:</source> +<target>Kør kommando efter synkronisering:</target> <source>OK</source> <target>OK</target> @@ -1117,6 +1111,9 @@ Kommandoen udføres hvis: <source>&Key file</source> <target>&Nøglefil</target> +<source>&SSH agent</source> +<target>&SSH agent</target> + <source>User name:</source> <target>Brugernavn:</target> @@ -1135,11 +1132,8 @@ Kommandoen udføres hvis: <source>How to get best performance?</source> <target>Hvordan får du bedste ydelse?</target> -<source>SSH connections for directory reading:</source> -<target>SSH forbindelse for mappelæsning:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Foreslået interval: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>Forbindelser til mappelæsning:</target> <source>SFTP channels per connection:</source> <target>SFTP kanaler pr. forbindelse:</target> @@ -1147,9 +1141,6 @@ Kommandoen udføres hvis: <source>Detect server limit</source> <target>Genkend servergrænse</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 forbindelser x 10 kanaler = 20 gange hurtigere mappelæsning</target> - <source>Select a directory on the server:</source> <target>Vælg servermappe:</target> @@ -1189,6 +1180,9 @@ Kommandoen udføres hvis: <source>Bytes copied:</source> <target>Kopierede byte:</target> +<source>When finished:</source> +<target>Når gennemført:</target> + <source>Close</source> <target>Luk</target> @@ -1201,15 +1195,18 @@ Kommandoen udføres hvis: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Opret batchfil til automatisk synkronisering. Start med dobbeltklik på filen eller planlæg via opgavestyring: %x</target> -<source>&Stop</source> -<target>&Stop</target> +<source>Run minimized</source> +<target>Kør minimeret</target> + +<source>&Show error dialog</source> +<target>&Vis fejlbesked</target> + +<source>&Cancel</source> +<target>&Annuller</target> <source>Stop synchronization at first error</source> <target>Stop synkronisering ved første fejl</target> -<source>Run minimized</source> -<target>Kør minimeret</target> - <source>Save log:</source> <target>Gem log:</target> @@ -1240,14 +1237,14 @@ Kopiér til midlertidig fil (*.ffs_tmp) før overskrivning. Sikrer processen ved alvorlige fejl. </target> -<source>(recommended)</source> -<target>(anbefalet)</target> +<source>recommended</source> +<target>anbefales</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Kopiér delte eller låste filer med VSS kopiering.</target> -<source>(requires administrator rights)</source> -<target>(administrator)</target> +<source>requires administrator rights</source> +<target>kræver administratorrettigheder</target> <source>Transfer file and folder permissions.</source> <target>Overfør fil og mappetilladelser.</target> @@ -1279,14 +1276,17 @@ Sikrer processen ved alvorlige fejl. <source>Source code written in C++ using:</source> <target>Kildekoden er skrevet i C++ med hjælp fra:</target> -<source>Donation details</source> -<target>Donationsdetaljer</target> - <source>If you like FreeFileSync:</source> <target>Er du glad for FreeFileSync:</target> -<source>Donate with PayPal</source> -<target>Donér med PayPal</target> +<source>Support with a donation</source> +<target>Donér for at støtte</target> + +<source>Donation details</source> +<target>Donationsdetaljer</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>Autoopdatering deaktiveret af administrator.</target> <source>Feedback and suggestions are welcome</source> <target>Kritik og forslag er meget velkomne</target> @@ -1324,7 +1324,7 @@ Sikrer processen ved alvorlige fejl. <source>Activate offline</source> <target>Aktivér offline</target> -<source>Save as Batch Job</source> +<source>Save as a Batch Job</source> <target>Gem som batchfil</target> <source>Delete Items</source> @@ -1363,11 +1363,17 @@ Sikrer processen ved alvorlige fejl. <source>Overview</source> <target>Oversigt</target> +<source>Show "%x"</source> +<target>Vis "%x"</target> + <source>&Show details</source> <target>&Vis detaljer</target> -<source>A new version of FreeFileSync is available:</source> -<target>FreeFileSync er blevet opdateret:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x er udkommet!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Ødelagte installationsfiler. Geninstaller FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Placeringen er ikke tilgængelig for %x.</target> @@ -1459,9 +1465,6 @@ Sikrer processen ved alvorlige fejl. <source>Select time span...</source> <target>Vælg tidsinterval...</target> -<source>Show "%x"</source> -<target>Vis "%x"</target> - <source>Last session</source> <target>Sidste opgave</target> @@ -1561,18 +1564,6 @@ Sikrer processen ved alvorlige fejl. <source>Searching for program updates...</source> <target>Søger efter opdatering...</target> -<source>Close progress dialog</source> -<target>Luk dialogen</target> - -<source>Log off</source> -<target>Log af</target> - -<source>Standby</source> -<target>Standby</target> - -<source>Shut down</source> -<target>Luk ned</target> - <source>Paused</source> <target>Pauset</target> @@ -1603,18 +1594,21 @@ Sikrer processen ved alvorlige fejl. <source>Log</source> <target>Log</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Ødelagte installationsfiler. Geninstaller FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Tak %x for donationen og støtten!</target> +<source>Recommended range:</source> +<target>Anbefalet interval:</target> + <source>Password:</source> <target>Kodeord:</target> <source>Key password:</source> <target>Nøglekodeord:</target> +<source>Please enter a file path.</source> +<target>Angiv placering.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1729,6 +1723,15 @@ Sikrer processen ved alvorlige fejl. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Flyt slettede og overskrevne filer til papirkurv</target> + +<source>Delete and overwrite files permanently</source> +<target>Slet og overskriv permanent</target> + +<source>Move files to a user-defined folder</source> +<target>Flyt filer til brugerdefineret mappe</target> + <source>Replace</source> <target>Erstat</target> @@ -1741,6 +1744,15 @@ Sikrer processen ved alvorlige fejl. <source>Append a time stamp to each file name</source> <target>Føj tidsstempel til hvert filnavn</target> +<source>On completion:</source> +<target>Ved gennemført:</target> + +<source>On errors:</source> +<target>Ved fejl:</target> + +<source>On success:</source> +<target>Ved gennemført:</target> + <source>Main config</source> <target>Hovedindstilling</target> @@ -1762,9 +1774,6 @@ Sikrer processen ved alvorlige fejl. <source>Name</source> <target>Navn</target> -<source>Items</source> -<target>Emner</target> - <source>Percentage</source> <target>Procent</target> @@ -1894,6 +1903,9 @@ Sikrer processen ved alvorlige fejl. <source>Cannot change process I/O priorities.</source> <target>Kan ikke ændre I/O prioriteter.</target> +<source>Unable to shut down the system.</source> +<target>Kunne ikke lukke computeren.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Check papirkurv fejlede for mappen %x.</target> @@ -1918,9 +1930,6 @@ Sikrer processen ved alvorlige fejl. <source>Portable</source> <target>Portable</target> -<source>recommended</source> -<target>anbefales</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Gemmer indstillinger i "%APPDATA%\FreeFileSync"</target> @@ -1972,8 +1981,8 @@ Sikrer processen ved alvorlige fejl. <source>Edit with FreeFileSync</source> <target>Rediger med FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>Portable udgaven kan ikke installeres i den valgte mappe.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>FreeFileSync portable kan ikke installeres i en undermappe til %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Installer normalt, eller vælg en anden mappe.</target> diff --git a/FreeFileSync/Build/Languages/dutch.lng b/FreeFileSync/Build/Languages/dutch.lng index 572441f3..4748ed36 100755 --- a/FreeFileSync/Build/Languages/dutch.lng +++ b/FreeFileSync/Build/Languages/dutch.lng @@ -35,25 +35,25 @@ <target>Verplaatsen van bestand %x naar de prullenbak</target> <source>Moving folder %x to the recycle bin</source> -<target>Verplaatsen van de map %x naar de prullenbak</target> +<target>Map %x naar de prullenbak verplaatsen</target> <source>Moving symbolic link %x to the recycle bin</source> <target>Verplaatsen symbolische koppeling %x naar de prullenbak</target> <source>Deleting file %x</source> -<target>Verwijderen van bestand %x</target> +<target>Bestand %x verwijderen</target> <source>Deleting folder %x</source> -<target>Verwijderen van map %x</target> +<target>Map %x verwijderen</target> <source>Deleting symbolic link %x</source> <target>Symbolische koppeling %x verwijderen</target> <source>Checking recycle bin availability for folder %x...</source> -<target>Controleer beschikbaarheid voor de prullenbak map %x...</target> +<target>Beschikbaarheid van prullenbak controleren voor map %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>De prullenbak is niet beschikbaar voor de volgende mappen. De bestanden worden permanent verwijderd:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>De prullenbak wordt niet ondersteund door de volgende mappen. Verwijderde of overschreven bestanden kunnen niet worden hersteld:</target> <source>An exception occurred</source> <target>Er is een uitzondering opgetreden</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Syntax:</target> -<source>global config file:</source> -<target>globaal configuratiebestand:</target> - <source>config files:</source> <target>configuratiebestanden:</target> <source>directory</source> <target>directory</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Bestandspad naar plaatsvervangend GlobalSettings.xml bestand.</target> +<source>global config file:</source> +<target>globaal configuratiebestand:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Een willekeurig aantal FreeFileSync. ffs_gui en/of .ffs_batch configuratiebestanden.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Een willekeurig aantal alternatieve mapparen voor maximaal een configuratiebestand.</target> -<source>Open configuration for editing without executing it.</source> -<target>Open configuratie voor het bewerken, zonder het uit te voeren.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Open de geselecteerde configuratie om deze alleen te bewerken zonder deze uit te voeren.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Bestandspad naar plaatsvervangend GlobalSettings.xml bestand.</target> <source>Cannot find the following folders:</source> <target>De volgende mappen konden niet worden gevonden:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Update kenmerken aan de rechterzijde</target> -<source>Cannot write file %x.</source> -<target>Kan bestand %x niet schrijven.</target> +<source>Cannot read file %x.</source> +<target>Kan het bestand %x niet lezen.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Werkelijk: %y bytes <source>Operation not supported for different base folder types.</source> <target>Deze bewerking wordt niet ondersteund voor verschillende basis maptypen.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Kan de symbolische koppeling %x niet kopiëren naar %y.</target> +<source>Cannot write file %x.</source> +<target>Kan bestand %x niet schrijven.</target> <source>Cannot move file %x to %y.</source> <target>Het bestand %x kan niet naar %y verplaatst worden.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Kan de symbolische koppeling %x niet kopiëren naar %y.</target> + <source>Unable to connect to %x.</source> <target>Kan geen verbinding maken met %x.</target> @@ -294,9 +297,6 @@ Werkelijk: %y bytes <source>Cannot read file attributes of %x.</source> <target>Kan de bestandskenmerken van %x niet lezen.</target> -<source>Cannot read file %x.</source> -<target>Kan het bestand %x niet lezen.</target> - <source>Cannot create directory %x.</source> <target>Kan de map %x niet maken.</target> @@ -596,8 +596,8 @@ De opdracht wordt geactiveerd als: <source>Automated Synchronization</source> <target>Automatische synchronisatie</target> -<source>The following path does not support directory monitoring:</source> -<target>Het volgende pad ondersteunt geen map bewaking:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>Het %x protocol ondersteunt geen mapcontrole:</target> <source>Directory monitoring active</source> <target>Mapcontrole actief</target> @@ -687,7 +687,7 @@ De opdracht wordt geactiveerd als: <target>Bronmap %x niet gevonden.</target> <source>Please enter a target folder for versioning.</source> -<target>Geef een doelmap voor versiebeheer.</target> +<target>Voer een doelmap in voor versiebeheer.</target> <source>The following items have unresolved conflicts and will not be synchronized:</source> <target>De volgende items hebben onopgeloste conflicten en zullen niet worden gesynchroniseerd:</target> @@ -713,8 +713,8 @@ De opdracht wordt geactiveerd als: <source>Base folder:</source> <target>Basismap:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>De map versiebeheer worden gesynchroniseerd omdat het is opgenomen in een basismap.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>De map versiebeheer bevindt zich in een basismap.</target> <source>Synchronizing folder pair:</source> <target>Synchroniseren van map-paar:</target> @@ -728,6 +728,15 @@ De opdracht wordt geactiveerd als: <source>job name</source> <target>taaknaam</target> +<source>Show summary</source> +<target>Toon samenvatting</target> + +<source>Sleep</source> +<target>Slaapstand</target> + +<source>Shut down</source> +<target>Uitschakelen</target> + <source>Synchronization stopped</source> <target>Synchronisatie gestopt</target> @@ -749,6 +758,9 @@ De opdracht wordt geactiveerd als: <source>Synchronization completed successfully</source> <target>Synchronisatie succesvol voltooid</target> +<source>Executing command %x</source> +<target>Opdracht %x uitvoeren</target> + <source>Cleaning up old log files...</source> <target>Opruimen oude logboekbestanden...</target> @@ -776,8 +788,8 @@ De opdracht wordt geactiveerd als: <pluralform>Automatisch opnieuw proberen in %x seconden...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Latere fouten negeren</target> +<source>Ignore &all</source> +<target>Negeer &alles</target> <source>Retrying operation...</source> <target>Bewerking opnieuw proberen...</target> @@ -884,12 +896,12 @@ De opdracht wordt geactiveerd als: <source>&Find...</source> <target>&Zoeken...</target> -<source>&Reset layout</source> -<target>&Reset lay-out</target> - <source>&Export file list...</source> <target>&Exporteren bestandslijst...</target> +<source>&Reset layout</source> +<target>&Reset lay-out</target> + <source>&Tools</source> <target>&Gereedschap</target> @@ -963,7 +975,7 @@ De opdracht wordt geactiveerd als: <target>Totaal aantal te kopiëren bytes</target> <source>Folder pair:</source> -<target>Mappaar:</target> +<target>Map-paar:</target> <source>Main settings:</source> <target>Belangrijkste instellingen:</target> @@ -1025,9 +1037,6 @@ De opdracht wordt geactiveerd als: <source>C&lear</source> <target>&Wissen</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Detecteren van synchronisatie richtingen met behulp van databasebestanden</target> - <source>Detect moved files</source> <target>Detecteren van verplaatste bestanden</target> @@ -1048,38 +1057,23 @@ De opdracht wordt geactiveerd als: <source>&Recycle bin</source> <target>&Prullenbak</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Back-up de verwijderde en overschreven bestanden in de prullenbak</target> - <source>&Permanent</source> <target>&Permanent</target> -<source>Delete or overwrite files permanently</source> -<target>Bestanden permanent verwijderen of overschrijven</target> - <source>&Versioning</source> <target>&Versiebeheer</target> -<source>Move files to a user-defined folder</source> -<target>Verplaats bestanden naar een door de gebruiker gedefinieerde map</target> - <source>Naming convention:</source> <target>Naamgevingsconventie:</target> -<source>Handle errors:</source> -<target>Fouten afhandelen:</target> - -<source>&Pop-up</source> -<target>&Pop-up</target> +<source>&Ignore errors</source> +<target>&Negeer fouten</target> <source>Show pop-up on errors or warnings</source> <target>Toon pop-up bij fouten of waarschuwingen</target> -<source>Hide all error and warning messages</source> -<target>Verberg alle foutberichten en waarschuwingen</target> - -<source>On completion:</source> -<target>Na voltooiing:</target> +<source>Run a command after synchronization:</source> +<target>Voer een opdracht uit na de synchronisatie:</target> <source>OK</source> <target>OK</target> @@ -1117,6 +1111,9 @@ De opdracht wordt geactiveerd als: <source>&Key file</source> <target>&Sleutelbestand</target> +<source>&SSH agent</source> +<target>&SSH-agent(Putty)</target> + <source>User name:</source> <target>Gebruikersnaam:</target> @@ -1135,11 +1132,8 @@ De opdracht wordt geactiveerd als: <source>How to get best performance?</source> <target>Hoe kom je aan de beste prestaties?</target> -<source>SSH connections for directory reading:</source> -<target>SSH verbindingen om mappen te lezen:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Voorgesteld bereik: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>Verbindingen voor het lezen van mappen:</target> <source>SFTP channels per connection:</source> <target>SFTP kanalen per verbinding:</target> @@ -1147,9 +1141,6 @@ De opdracht wordt geactiveerd als: <source>Detect server limit</source> <target>Gedetecteerd server limiet</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 verbindingen x 10 kanalen = 20 keer sneller lezen van de mappen</target> - <source>Select a directory on the server:</source> <target>Selecteer een map op de server:</target> @@ -1189,6 +1180,9 @@ De opdracht wordt geactiveerd als: <source>Bytes copied:</source> <target>Gekopieerde bytes:</target> +<source>When finished:</source> +<target>Wanneer je gereed bent:</target> + <source>Close</source> <target>Sluiten</target> @@ -1201,15 +1195,18 @@ De opdracht wordt geactiveerd als: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Maak een batch-bestand om zonder toezicht te synchroniseren. Om te starten, dubbelklik op het bestand of maak een opdracht in de taakplanner: %x</target> -<source>&Stop</source> -<target>&Stop</target> +<source>Run minimized</source> +<target>Geminimaliseerd uitvoeren</target> + +<source>&Show error dialog</source> +<target>&Toon foutdialoog</target> + +<source>&Cancel</source> +<target>&Annuleer</target> <source>Stop synchronization at first error</source> <target>Synchronisatie bij eerste fout stoppen</target> -<source>Run minimized</source> -<target>Geminimaliseerd uitvoeren</target> - <source>Save log:</source> <target>Logbestand opslaan:</target> @@ -1240,14 +1237,14 @@ Kopiëren naar een tijdelijk bestand (*.ffs_tmp) voordat het doel wordt overschr Dit garandeert een consistente status zelfs in het geval van een ernstige fout. </target> -<source>(recommended)</source> -<target>(aanbevolen)</target> +<source>recommended</source> +<target>aanbevolen</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Gedeelde of vergrendelde bestanden met behulp van de Volume Schaduw copy-Service kopiëren.</target> -<source>(requires administrator rights)</source> -<target>(vereist beheerdersrechten)</target> +<source>requires administrator rights</source> +<target>vereist beheerdersrechten</target> <source>Transfer file and folder permissions.</source> <target>Overdracht van bestands- en mapmachtigingen.</target> @@ -1256,7 +1253,7 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. <target>Automatisch opnieuw proberen bij fouten:</target> <source>Retry count:</source> -<target>Aantal herhaalpogingen:</target> +<target>Probeer opnieuw te tellen:</target> <source>Delay (in seconds):</source> <target>Vertraging (in seconden):</target> @@ -1279,17 +1276,20 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. <source>Source code written in C++ using:</source> <target>Broncode werd in C++ geschreven met:</target> -<source>Donation details</source> -<target>Donatie details</target> - <source>If you like FreeFileSync:</source> <target>Als FreeFileSync je bevalt:</target> -<source>Donate with PayPal</source> -<target>Doneer met PayPal</target> +<source>Support with a donation</source> +<target>Steunen met een donatie</target> + +<source>Donation details</source> +<target>Donatie details</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>De automatische updater werd uitgeschakeld door de beheerder.</target> <source>Feedback and suggestions are welcome</source> -<target>Feedback en suggesties zijn welkom</target> +<target>Terugkoppeling en suggesties zijn welkom</target> <source>Home page</source> <target>Startpagina</target> @@ -1313,7 +1313,7 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. <target>Online activeren</target> <source>2. Retrieve an offline activation key from the following URL:</source> -<target>2. een offline activatie sleutel ophalen van de volgende URL:</target> +<target>2. Een offline activatie sleutel ophalen van de volgende URL:</target> <source>&Copy to clipboard</source> <target>&Naar klembord kopiëren</target> @@ -1324,8 +1324,8 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. <source>Activate offline</source> <target>Activeer offline</target> -<source>Save as Batch Job</source> -<target>Opslaan als batch opdracht</target> +<source>Save as a Batch Job</source> +<target>Opslaan als een batchverwerking</target> <source>Delete Items</source> <target>Items verwijderen</target> @@ -1363,11 +1363,17 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. <source>Overview</source> <target>Overzicht</target> +<source>Show "%x"</source> +<target>Toon "%x"</target> + <source>&Show details</source> <target>&Toon details</target> -<source>A new version of FreeFileSync is available:</source> -<target>Er is een nieuwe versie van FreeFileSync beschikbaar:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x is beschikbaar!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Installatiebestanden zijn beschadigd. Installeer FreeFileSync opnieuw.</target> <source>Local path not available for %x.</source> <target>Lokaal pad niet beschikbaar voor %x.</target> @@ -1459,9 +1465,6 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. <source>Select time span...</source> <target>Selecteer tijdsduur...</target> -<source>Show "%x"</source> -<target>Toon "%x"</target> - <source>Last session</source> <target>Laatste sessie</target> @@ -1561,18 +1564,6 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. <source>Searching for program updates...</source> <target>Zoeken naar programma-updates...</target> -<source>Close progress dialog</source> -<target>Voortgang dialoogvenster sluiten</target> - -<source>Log off</source> -<target>Afmelden</target> - -<source>Standby</source> -<target>Standby</target> - -<source>Shut down</source> -<target>Afsluiten</target> - <source>Paused</source> <target>Onderbroken</target> @@ -1603,18 +1594,21 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. <source>Log</source> <target>Logboek</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Installatiebestanden zijn beschadigd. Installeer FreeFileSync opnieuw.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Dank u, %x, voor uw donatie en ondersteuning!</target> +<source>Recommended range:</source> +<target>Aanbevolen bereik:</target> + <source>Password:</source> <target>Wachtwoord:</target> <source>Key password:</source> <target>Sleutel wachtwoord:</target> +<source>Please enter a file path.</source> +<target>Voer een bestandspad in.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1729,6 +1723,15 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Bewaar verwijderde en overschreven bestanden in de prullenbak</target> + +<source>Delete and overwrite files permanently</source> +<target>Verwijder en overschrijf bestanden permanent</target> + +<source>Move files to a user-defined folder</source> +<target>Verplaats bestanden naar een door de gebruiker gedefinieerde map</target> + <source>Replace</source> <target>Vervangen</target> @@ -1741,6 +1744,15 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. <source>Append a time stamp to each file name</source> <target>Aan elke bestandsnaam een tijdstempel toevoegen</target> +<source>On completion:</source> +<target>Na voltooiing:</target> + +<source>On errors:</source> +<target>Op fouten:</target> + +<source>On success:</source> +<target>Op succes:</target> + <source>Main config</source> <target>Hoofd configuratie</target> @@ -1762,9 +1774,6 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. <source>Name</source> <target>Naam</target> -<source>Items</source> -<target>Items</target> - <source>Percentage</source> <target>Percentage</target> @@ -1894,6 +1903,9 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. <source>Cannot change process I/O priorities.</source> <target>De input/output prioriteiten kunnen niet gewijzigd worden.</target> +<source>Unable to shut down the system.</source> +<target>Kan het systeem niet afsluiten.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Controle van de prullenbak voor map %x is mislukt.</target> @@ -1916,10 +1928,7 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. <target>Lokaal</target> <source>Portable</source> -<target>Mobiel</target> - -<source>recommended</source> -<target>aanbevolen</target> +<target>Draagbare</target> <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Instellingen opslaan in "%APPDATA%\FreeFileSync"</target> @@ -1972,8 +1981,8 @@ Dit garandeert een consistente status zelfs in het geval van een ernstige fout. <source>Edit with FreeFileSync</source> <target>Bewerken met FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>De mobiele versie kan niet in de geselecteerde map geinstalleerd worden.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>De draagbare versie van FreeFileSync kan niet worden geïnstalleerd in een submap van %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Kies voor een lokale installatie of selecteer een andere map voor de installatie.</target> diff --git a/FreeFileSync/Build/Languages/english_uk.lng b/FreeFileSync/Build/Languages/english_uk.lng index 3162a2d3..a926e1f4 100755 --- a/FreeFileSync/Build/Languages/english_uk.lng +++ b/FreeFileSync/Build/Languages/english_uk.lng @@ -7,51 +7,6 @@ <plural_definition>n == 1 ? 0 : 1</plural_definition> </header> -<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> -<target></target> - -<source>Please enter a file path.</source> -<target></target> - -<source>Recommended range:</source> -<target></target> - -<source>Sleep</source> -<target></target> - -<source>FreeFileSync %x is available!</source> -<target></target> - -<source>Support with a donation</source> -<target></target> - -<source>&Cancel</source> -<target></target> - -<source>Error dialog:</source> -<target></target> - -<source>Connections for directory reading:</source> -<target></target> - -<source>&SSH agent</source> -<target></target> - -<source>Stop on errors</source> -<target></target> - -<source>Ignore &all</source> -<target></target> - -<source>The %x protocol does not support directory monitoring:</source> -<target></target> - -<source>Open the selected configuration for editing only without executing it.</source> -<target></target> - -<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> -<target></target> - <source>Both sides have changed since last synchronization.</source> <target>Both sides have changed since last synchronisation.</target> @@ -97,6 +52,9 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Checking recycle bin availability for folder %x...</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</target> + <source>An exception occurred</source> <target>An exception occurred</target> @@ -145,6 +103,9 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Any number of alternative directory pairs for at most one config file.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Open the selected configuration for editing only without executing it.</target> + <source>Path to an alternate GlobalSettings.xml file.</source> <target>Path to an alternate GlobalSettings.xml file.</target> @@ -635,6 +596,9 @@ The command is triggered if: <source>Automated Synchronization</source> <target>Automated Synchronisation</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>The %x protocol does not support directory monitoring:</target> + <source>Directory monitoring active</source> <target>Directory monitoring active</target> @@ -749,8 +713,8 @@ The command is triggered if: <source>Base folder:</source> <target>Base folder:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>The versioning folder will be synchronised because it is contained in a base folder.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>The versioning folder is contained in a base folder.</target> <source>Synchronizing folder pair:</source> <target>Synchronising folder pair:</target> @@ -764,6 +728,15 @@ The command is triggered if: <source>job name</source> <target>job name</target> +<source>Show summary</source> +<target>Show summary</target> + +<source>Sleep</source> +<target>Sleep</target> + +<source>Shut down</source> +<target>Shut down</target> + <source>Synchronization stopped</source> <target>Synchronisation stopped</target> @@ -785,6 +758,9 @@ The command is triggered if: <source>Synchronization completed successfully</source> <target>Synchronisation completed successfully</target> +<source>Executing command %x</source> +<target>Executing command %x</target> + <source>Cleaning up old log files...</source> <target>Cleaning up old log files...</target> @@ -812,6 +788,9 @@ The command is triggered if: <pluralform>Automatic retry in %x seconds...</pluralform> </target> +<source>Ignore &all</source> +<target>Ignore &all</target> + <source>Retrying operation...</source> <target>Retrying operation...</target> @@ -1007,9 +986,6 @@ The command is triggered if: <source>Select a variant:</source> <target>Select a variant:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Detect synchronisation directions with the help of database files</target> - <source>Include &symbolic links:</source> <target>Include &symbolic links:</target> @@ -1090,11 +1066,14 @@ The command is triggered if: <source>Naming convention:</source> <target>Naming convention:</target> +<source>&Ignore errors</source> +<target>&Ignore errors</target> + <source>Show pop-up on errors or warnings</source> <target>Show pop-up on errors or warnings</target> -<source>On completion:</source> -<target>On completion:</target> +<source>Run a command after synchronization:</source> +<target>Run a command after synchronization:</target> <source>OK</source> <target>OK</target> @@ -1132,6 +1111,9 @@ The command is triggered if: <source>&Key file</source> <target>&Key file</target> +<source>&SSH agent</source> +<target>&SSH agent</target> + <source>User name:</source> <target>User name:</target> @@ -1150,6 +1132,9 @@ The command is triggered if: <source>How to get best performance?</source> <target>How to get best performance?</target> +<source>Connections for directory reading:</source> +<target>Connections for directory reading:</target> + <source>SFTP channels per connection:</source> <target>SFTP channels per connection:</target> @@ -1195,6 +1180,9 @@ The command is triggered if: <source>Bytes copied:</source> <target>Bytes copied:</target> +<source>When finished:</source> +<target>When finished:</target> + <source>Close</source> <target>Close</target> @@ -1207,15 +1195,18 @@ The command is triggered if: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Create a batch file for unattended synchronisation. To start, double-click this file or schedule in a task planner: %x</target> -<source>&Show</source> -<target>&Show</target> +<source>Run minimized</source> +<target>Run minimised</target> + +<source>&Show error dialog</source> +<target>&Show error dialog</target> + +<source>&Cancel</source> +<target>&Cancel</target> <source>Stop synchronization at first error</source> <target>Stop synchronisation at first error</target> -<source>Run minimized</source> -<target>Run minimised</target> - <source>Save log:</source> <target>Save log:</target> @@ -1246,14 +1237,14 @@ Copy to a temporary file (*.ffs_tmp) before overwriting target. This guarantees a consistent state even in case of a serious error. </target> -<source>(recommended)</source> -<target>(recommended)</target> +<source>recommended</source> +<target>recommended</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Copy shared or locked files using the Volume Shadow Copy Service.</target> -<source>(requires administrator rights)</source> -<target>(requires administrator rights)</target> +<source>requires administrator rights</source> +<target>requires administrator rights</target> <source>Transfer file and folder permissions.</source> <target>Transfer file and folder permissions.</target> @@ -1288,9 +1279,15 @@ This guarantees a consistent state even in case of a serious error. <source>If you like FreeFileSync:</source> <target>If you like FreeFileSync:</target> +<source>Support with a donation</source> +<target>Support with a donation</target> + <source>Donation details</source> <target>Donation details</target> +<source>The auto updater was disabled by the administrator.</source> +<target>The auto updater was disabled by the administrator.</target> + <source>Feedback and suggestions are welcome</source> <target>Feedback and suggestions are welcome</target> @@ -1327,8 +1324,8 @@ This guarantees a consistent state even in case of a serious error. <source>Activate offline</source> <target>Activate offline</target> -<source>Save as Batch Job</source> -<target>Save as Batch Job</target> +<source>Save as a Batch Job</source> +<target>Save as a Batch Job</target> <source>Delete Items</source> <target>Delete Items</target> @@ -1372,6 +1369,12 @@ This guarantees a consistent state even in case of a serious error. <source>&Show details</source> <target>&Show details</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x is available!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Installation files are corrupted. Please reinstall FreeFileSync.</target> + <source>Local path not available for %x.</source> <target>Local path not available for %x.</target> @@ -1561,12 +1564,6 @@ This guarantees a consistent state even in case of a serious error. <source>Searching for program updates...</source> <target>Searching for program updates...</target> -<source>Close progress dialog</source> -<target>Close progress dialogue</target> - -<source>Shut down</source> -<target>Shut down</target> - <source>Paused</source> <target>Paused</target> @@ -1597,18 +1594,21 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>Log</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Installation files are corrupted. Please reinstall FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Thank you, %x, for your donation and support!</target> +<source>Recommended range:</source> +<target>Recommended range:</target> + <source>Password:</source> <target>Password:</target> <source>Key password:</source> <target>Key password:</target> +<source>Please enter a file path.</source> +<target>Please enter a file path.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1663,6 +1663,9 @@ This guarantees a consistent state even in case of a serious error. <source>Show hidden dialogs and warning messages again?</source> <target>Show hidden dialogues and warning messages again?</target> +<source>&Show</source> +<target>&Show</target> + <source>Downloading update...</source> <target>Downloading update...</target> @@ -1720,11 +1723,11 @@ This guarantees a consistent state even in case of a serious error. <source>MB</source> <target>MB</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Back up deleted and overwritten files in the recycle bin</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Retain deleted and overwritten files in the recycle bin</target> -<source>Delete or overwrite files permanently</source> -<target>Delete or overwrite files permanently</target> +<source>Delete and overwrite files permanently</source> +<target>Delete and overwrite files permanently</target> <source>Move files to a user-defined folder</source> <target>Move files to a user-defined folder</target> @@ -1741,6 +1744,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>Append a time stamp to each file name</target> +<source>On completion:</source> +<target>On completion:</target> + +<source>On errors:</source> +<target>On errors:</target> + +<source>On success:</source> +<target>On success:</target> + <source>Main config</source> <target>Main config</target> @@ -1762,9 +1774,6 @@ This guarantees a consistent state even in case of a serious error. <source>Name</source> <target>Name</target> -<source>Items</source> -<target>Items</target> - <source>Percentage</source> <target>Percentage</target> @@ -1894,6 +1903,9 @@ This guarantees a consistent state even in case of a serious error. <source>Cannot change process I/O priorities.</source> <target>Cannot change process I/O priorities.</target> +<source>Unable to shut down the system.</source> +<target>Unable to shut down the system.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Checking recycle bin failed for folder %x.</target> @@ -1918,9 +1930,6 @@ This guarantees a consistent state even in case of a serious error. <source>Portable</source> <target>Portable</target> -<source>recommended</source> -<target>recommended</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Save settings to "%APPDATA%\FreeFileSync"</target> @@ -1972,6 +1981,9 @@ This guarantees a consistent state even in case of a serious error. <source>Edit with FreeFileSync</source> <target>Edit with FreeFileSync</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>The FreeFileSync portable version cannot install into a subfolder of %x.</target> + <source>Please choose the local installation type or select a different folder for installation.</source> <target>Please choose the local installation type or select a different folder for installation.</target> diff --git a/FreeFileSync/Build/Languages/finnish.lng b/FreeFileSync/Build/Languages/finnish.lng index ab8ea668..a0c3b95e 100755 --- a/FreeFileSync/Build/Languages/finnish.lng +++ b/FreeFileSync/Build/Languages/finnish.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Tarkistetaan hakemisto %x:n käyttöoikeus Roskakoriin ...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Roskakori ei ole käytettävissä näiden hakemistojen osalta. Tiedostot poistetaan sen sijaan lopullisesti:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>Roskakoria ei tueta näissä hakemistoissa. Poistettuja tai muutettuja tiedostoja ei voida palauttaa:</target> <source>An exception occurred</source> <target>Poikkeama havaittu</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Syntaksi:</target> -<source>global config file:</source> -<target>yleinen määritystiedosto:</target> - <source>config files:</source> <target>määritystiedostot:</target> <source>directory</source> <target>hakemisto</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Polku toiseen GlobalSettings.xml tiedostolle.</target> +<source>global config file:</source> +<target>yleinen määritystiedosto:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Vapaa määrä FreeFileSync .ffs_gui ja/tai .ffs_batch määrittelytiedostoja.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Vapaa määrä eri hakemistopareja yhdelle tietylle määritystiedostolle.</target> -<source>Open configuration for editing without executing it.</source> -<target>Avaa määrittely muutoksia varten, sitä suorittamatta.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Avaa asetus editointia varten, ei suoriteta.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Polku toiseen GlobalSettings.xml tiedostolle.</target> <source>Cannot find the following folders:</source> <target>Seuraavia hakemistoja ei löydy:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Päivitä määritteet oikealla</target> -<source>Cannot write file %x.</source> -<target>Tiedoston %x kirjoittaminen ei onnistu.</target> +<source>Cannot read file %x.</source> +<target>Tiedosto %x on lukukelvoton.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Todellinen: %y tavua <source>Operation not supported for different base folder types.</source> <target>Toiminto ei tue erilaisia lähdehakemistoja.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Pikakuvike %x - %y kopiointi epäonnistui.</target> +<source>Cannot write file %x.</source> +<target>Tiedoston %x kirjoittaminen ei onnistu.</target> <source>Cannot move file %x to %y.</source> <target>Tiedostoa %x ei voida siirtää kohtaan %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Pikakuvike %x - %y kopiointi epäonnistui.</target> + <source>Unable to connect to %x.</source> <target>Yhteyttä %x:n ei voi luoda.</target> @@ -294,9 +297,6 @@ Todellinen: %y tavua <source>Cannot read file attributes of %x.</source> <target>Tiedoston %x määritteitä ei voitu lukea.</target> -<source>Cannot read file %x.</source> -<target>Tiedosto %x on lukukelvoton.</target> - <source>Cannot create directory %x.</source> <target>Hakemistoa %x ei voitu luoda.</target> @@ -596,8 +596,8 @@ Käsky suoritetaan jos: <source>Automated Synchronization</source> <target>Automaattinen täsmäytys</target> -<source>The following path does not support directory monitoring:</source> -<target>Polku ei tue hakemiston monitorointia:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>Valittu protokolla %x ei tue seurantaa:</target> <source>Directory monitoring active</source> <target>Hakemistovalvonta päällä</target> @@ -713,8 +713,8 @@ Käsky suoritetaan jos: <source>Base folder:</source> <target>Juurihakemisto:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>Verioinnin hakemisto täsmäytetään, on osana juurihakemistoa.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>Versionnin hakemisto löytyy peruskansiosta.</target> <source>Synchronizing folder pair:</source> <target>Täsmäytetään hakemistoparia:</target> @@ -728,6 +728,15 @@ Käsky suoritetaan jos: <source>job name</source> <target>työnnimi</target> +<source>Show summary</source> +<target>Näytä yhteenveto</target> + +<source>Sleep</source> +<target>Lepotila</target> + +<source>Shut down</source> +<target>Sulje</target> + <source>Synchronization stopped</source> <target>Täsmäytys on pysäytetty</target> @@ -749,6 +758,9 @@ Käsky suoritetaan jos: <source>Synchronization completed successfully</source> <target>Täsmäytys päättyi onnistuneesti</target> +<source>Executing command %x</source> +<target>Suorita komentua %x</target> + <source>Cleaning up old log files...</source> <target>Siivotaan vanhat lokitiedostot...</target> @@ -776,8 +788,8 @@ Käsky suoritetaan jos: <pluralform>Uusi yritys %x sekunnin kuluttua...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Sivuta toistuvat virheet</target> +<source>Ignore &all</source> +<target>Ohita &kaikki</target> <source>Retrying operation...</source> <target>Yritetään uudestaan...</target> @@ -884,12 +896,12 @@ Käsky suoritetaan jos: <source>&Find...</source> <target>&Etsi...</target> -<source>&Reset layout</source> -<target>&Nollaa asettelu</target> - <source>&Export file list...</source> <target>&Vie tiedostojoukko...</target> +<source>&Reset layout</source> +<target>&Nollaa asettelu</target> + <source>&Tools</source> <target>&Asetukset</target> @@ -1025,9 +1037,6 @@ Käsky suoritetaan jos: <source>C&lear</source> <target>&Nollaa</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Tunnista tietokannan avulla täysmäyksen suuntaa</target> - <source>Detect moved files</source> <target>Tunnista siirretyt tiedostot</target> @@ -1048,41 +1057,26 @@ Käsky suoritetaan jos: <source>&Recycle bin</source> <target>&Roskakori</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Tallenna poistetut/korvatut tiedostot Roskakoriin</target> - <source>&Permanent</source> <target>&Pysyvä</target> -<source>Delete or overwrite files permanently</source> -<target>Poista tai korvaa tiedostoja pysyvästi</target> - <source>&Versioning</source> <target>&Versiointi</target> -<source>Move files to a user-defined folder</source> -<target>Siirrä tiedostot itse määräämäsi hakemistoon</target> - <source>Naming convention:</source> <target>Nimeämiskäytäntö:</target> -<source>Handle errors:</source> -<target>Hoida virheet:</target> - -<source>&Pop-up</source> -<target>&Pop-up</target> +<source>&Ignore errors</source> +<target>&Ohita virheet</target> <source>Show pop-up on errors or warnings</source> <target>Näytä ponnahdusikkuna virheiden tai varoituksien kohdalla</target> -<source>Hide all error and warning messages</source> -<target>Piilota kaikki virhe- ja varoitusviestit</target> - -<source>On completion:</source> -<target>Toimet kun valmis:</target> +<source>Run a command after synchronization:</source> +<target>Suorita käsky kun täsmäytys on tehty:</target> <source>OK</source> -<target>OK</target> +<target>Kyllä</target> <source>Arrange folder pair</source> <target>Järjestä hakemistoparit</target> @@ -1094,7 +1088,7 @@ Käsky suoritetaan jos: <target>Yhteystapa:</target> <source>Server name or IP address:</source> -<target>Palvelimen nimi ja IP:</target> +<target>Palvelimen nimi tai IP:</target> <source>Port:</source> <target>Portti:</target> @@ -1103,10 +1097,10 @@ Käsky suoritetaan jos: <target>Salaus:</target> <source>&Disabled</source> -<target>&Estetty</target> +<target>&ei käytössä</target> <source>&Explicit SSL/TLS</source> -<target>&Explisiittinen SSL/TLS</target> +<target>&Valikoiva SSL/TLS</target> <source>Authentication:</source> <target>Todennus:</target> @@ -1117,29 +1111,29 @@ Käsky suoritetaan jos: <source>&Key file</source> <target>&Avaintiedosto</target> +<source>&SSH agent</source> +<target>&SSH agentti</target> + <source>User name:</source> -<target>Käyttäjä:</target> +<target>Käyttäjänimi:</target> <source>Private key file:</source> -<target>Yksityinen avaintiedosto:</target> +<target>Avaintiedosto:</target> <source>&Show password</source> <target>&Näytä salasana</target> <source>Directory on server:</source> -<target>Palvelimen hakemisto:</target> +<target>Hakemisto palvelimella:</target> <source>Performance improvements:</source> -<target>Suorituskyvyn tehosteet:</target> +<target>Suorituskyvyn tehostus:</target> <source>How to get best performance?</source> <target>Miten saan parhaan suorituskyvyn?</target> -<source>SSH connections for directory reading:</source> -<target>SSH yhteys hakemistojen lukuun:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Suositeltu: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>Yhteyksiä hakemistojen lukemiseen:</target> <source>SFTP channels per connection:</source> <target>SFTP kanavia per yhteys:</target> @@ -1147,9 +1141,6 @@ Käsky suoritetaan jos: <source>Detect server limit</source> <target>Tunnista palvelimen rajat</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 yhteyttä x 10 kanavaa = 20 kertaa nopeampi hakemistojen luku</target> - <source>Select a directory on the server:</source> <target>Valitse palvelimelta hakemisto:</target> @@ -1163,7 +1154,7 @@ Käsky suoritetaan jos: <target>Vaihtoehto:</target> <source>&Don't show this dialog again</source> -<target>&Älä näytä tätä ruutua uudestaan</target> +<target>&Älä näytä tätä uudestaan</target> <source>Items found:</source> <target>Kohteita löytyi:</target> @@ -1189,6 +1180,9 @@ Käsky suoritetaan jos: <source>Bytes copied:</source> <target>Kopioituja tavuja:</target> +<source>When finished:</source> +<target>Kun valmis:</target> + <source>Close</source> <target>Sulje</target> @@ -1201,15 +1195,18 @@ Käsky suoritetaan jos: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Luo eräajotiedosto automaattista täsmäytystä varten. Käynnistä kaksoisnapsauttamalla tai ajasta tehtävä: %x</target> -<source>&Stop</source> -<target>&Lopeta</target> +<source>Run minimized</source> +<target>Suorita pienennettynä</target> + +<source>&Show error dialog</source> +<target>&Näytä virheilmoitus</target> + +<source>&Cancel</source> +<target>&Peruuta</target> <source>Stop synchronization at first error</source> <target>Lopeta täsmäytys ensimmäiseen virheeseen</target> -<source>Run minimized</source> -<target>Suorita pienennettynä</target> - <source>Save log:</source> <target>Tallenna loki:</target> @@ -1226,7 +1223,7 @@ Käsky suoritetaan jos: <target>&Säilytä suhteelliset polut</target> <source>&Overwrite existing files</source> -<target>&Ylikirjoita olemassa olevat tiedostot</target> +<target>&Korvaa olemassa olevat tiedostot</target> <source>The following settings are used for all synchronization jobs.</source> <target>Näitä asetuksia käytetään kaikkiin täsmäyksiin.</target> @@ -1236,18 +1233,18 @@ Copy to a temporary file (*.ffs_tmp) before overwriting target. This guarantees a consistent state even in case of a serious error. </source> <target> -Kopioi väliaikaistiedostoon (*.ffs_tmp) ennen kohteen ylikirjoitusta. +Kopioi väliaikaistiedostoon (*.ffs_tmp) ennen kohteen korvaamista. Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. </target> -<source>(recommended)</source> -<target>(suositus)</target> +<source>recommended</source> +<target>suositus</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Jaettujen tai lukittujen tiedostojen kopiointi käyttäen aseman tilannevedospalvelua.</target> -<source>(requires administrator rights)</source> -<target>(edellyttää pääkäyttäjän oikeuksia)</target> +<source>requires administrator rights</source> +<target>edellyttää järjestelmänvalvojan oikeuksia</target> <source>Transfer file and folder permissions.</source> <target>Siirrä tiedostojen ja hakemistojen käyttöoikeudet.</target> @@ -1279,14 +1276,17 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Source code written in C++ using:</source> <target>Koodattu C++-kielellä käyttäen:</target> -<source>Donation details</source> -<target>Lahjoituksen tiedot</target> - <source>If you like FreeFileSync:</source> <target>Jos pidät FreeFileSyncistä:</target> -<source>Donate with PayPal</source> -<target>Lahjoita PayPalilla</target> +<source>Support with a donation</source> +<target>Tue meitä lahjoituksella</target> + +<source>Donation details</source> +<target>Lahjoituksen tiedot</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>Järjestelmävalvoka keskeytti päivityksen.</target> <source>Feedback and suggestions are welcome</source> <target>Palaute ja uudet ehdotukset ovat tervetulleita</target> @@ -1324,8 +1324,8 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Activate offline</source> <target>Aktivoi yhteyttä</target> -<source>Save as Batch Job</source> -<target>Tallenna eräajona</target> +<source>Save as a Batch Job</source> +<target>Tallenna eräajona></target> <source>Delete Items</source> <target>Poista kohteet</target> @@ -1363,11 +1363,17 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Overview</source> <target>Yleiskatsaus</target> +<source>Show "%x"</source> +<target>Näytä "%x"</target> + <source>&Show details</source> <target>&Näytä tarkenteet</target> -<source>A new version of FreeFileSync is available:</source> -<target>FreeFileSyncin uusi versio on saatavilla:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x on saatavilla!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Asennustiedostot ovat viottuneet. Yritä asentaa FreeFileSync uudestaan.</target> <source>Local path not available for %x.</source> <target>Paikallinen polku %x puuttuu.</target> @@ -1459,9 +1465,6 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Select time span...</source> <target>Valitse aikajana...</target> -<source>Show "%x"</source> -<target>Näytä "%x"</target> - <source>Last session</source> <target>Viime istunto</target> @@ -1561,18 +1564,6 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Searching for program updates...</source> <target>Ohjelmapäivytystä haetaan...</target> -<source>Close progress dialog</source> -<target>Sulje etenämän dialoogi</target> - -<source>Log off</source> -<target>Kirjaudu ulos</target> - -<source>Standby</source> -<target>Lepotila</target> - -<source>Shut down</source> -<target>Sulje</target> - <source>Paused</source> <target>Pysäytetty</target> @@ -1603,17 +1594,20 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Log</source> <target>Loki</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Asennustiedostot ovat viottuneet. Yritä asentaa FreeFileSync uudestaan.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Kiitos %x, arvostan tukeasi ja lahjoitustasi!</target> +<source>Recommended range:</source> +<target>Suositeltu alue:</target> + <source>Password:</source> <target>Salasana:</target> <source>Key password:</source> -<target>Pää salasana:</target> +<target>Salasana:</target> + +<source>Please enter a file path.</source> +<target>Anna tiedostopolku.</target> <source> <pluralform>Copy the following item to another folder?</pluralform> @@ -1729,6 +1723,15 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>MB</source> <target>Mt</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Säilytä poistetut ja korjatut tiedostot roskakorissa</target> + +<source>Delete and overwrite files permanently</source> +<target>Poista ja korvaa tiedostot suoraan</target> + +<source>Move files to a user-defined folder</source> +<target>Siirrä tiedostot itse määräämäsi hakemistoon</target> + <source>Replace</source> <target>Korvaa</target> @@ -1741,6 +1744,15 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Append a time stamp to each file name</source> <target>Lisää tiedostoihin aikaleimat</target> +<source>On completion:</source> +<target>Kun valmis:</target> + +<source>On errors:</source> +<target>Kun virhe:</target> + +<source>On success:</source> +<target>Kun onnistui:</target> + <source>Main config</source> <target>Pääasetus</target> @@ -1762,9 +1774,6 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Name</source> <target>Nimi</target> -<source>Items</source> -<target>Kappaletta</target> - <source>Percentage</source> <target>Prosenttia</target> @@ -1894,6 +1903,9 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Cannot change process I/O priorities.</source> <target>Prosessin I/O-prioriteetin muutos ei onnistu.</target> +<source>Unable to shut down the system.</source> +<target>Järjestelmää ei voi sammuttaa.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Roskakorin tarkistus hakemistolle %x epäonnistui.</target> @@ -1918,9 +1930,6 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Portable</source> <target>Siirrettävä</target> -<source>recommended</source> -<target>suositus</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Tallenna asetukset "%APPDATA%\FreeFileSync"</target> @@ -1972,8 +1981,8 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Edit with FreeFileSync</source> <target>Muokkaa FreeFileSync:llä</target> -<source>The portable version cannot install into the selected folder.</source> -<target>Siirretävä versio ei voi asentaa tähän hakemistoon.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>FreeFileSync:n siirrettävä versio ei voi asentaa alikansioon %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Valitse paikallinen asennus tai vaihda asennushakemistoa.</target> diff --git a/FreeFileSync/Build/Languages/french.lng b/FreeFileSync/Build/Languages/french.lng index ad4e712b..625ea7c2 100755 --- a/FreeFileSync/Build/Languages/french.lng +++ b/FreeFileSync/Build/Languages/french.lng @@ -7,9 +7,6 @@ <plural_definition>n <= 1 ? 0 : 1</plural_definition> </header> -<source>The %x protocol does not support directory monitoring:</source> -<target></target> - <source>Both sides have changed since last synchronization.</source> <target>Les deux côtés ont changé depuis la dernière synchronisation.</target> @@ -55,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Contrôle de la disponibilité de la Corbeille pour le dossier %x ...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>La Corbeille n'est pas disponible pour les dossiers suivants. Les fichiers seront détruits définitivement :</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>La corbeille n'est pas supportée par les dossiers suivants. Les fichiers supprimés ou modifiés ne pourront pas être restaurés :</target> <source>An exception occurred</source> <target>Une erreur s'est produite</target> @@ -106,8 +103,8 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>N'importe quel nombre de paires de répertoires distincts pour au plus un fichier de configuration.</target> -<source>Open configuration for editing without executing it.</source> -<target>Ouvre la configuration pour une mise à jour sans exécution.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>L'ouverture de la configuration choisie pour être modifiée ne permet pas de l'exécuter.</target> <source>Path to an alternate GlobalSettings.xml file.</source> <target>Chemin d'un fichier GlobalSettings.xml distinct.</target> @@ -256,8 +253,8 @@ <source>Update attributes on right</source> <target>Mise à jour des attributs à droite</target> -<source>Cannot write file %x.</source> -<target>Impossible d'écrire le fichier %x.</target> +<source>Cannot read file %x.</source> +<target>Impossible de lire le fichier %x.</target> <source> Unexpected size of data stream. @@ -276,12 +273,15 @@ Trouvé : %y octets <source>Operation not supported for different base folder types.</source> <target>Opération non prise en charge pour dee dossiers de base de types différents.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Impossible de copier le lien symbolique %x vers %y.</target> +<source>Cannot write file %x.</source> +<target>Impossible d'écrire le fichier %x.</target> <source>Cannot move file %x to %y.</source> <target>Impossible de déplacer le fichier %x vers %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Impossible de copier le lien symbolique %x vers %y.</target> + <source>Unable to connect to %x.</source> <target>Impossible de se connecter à %x.</target> @@ -294,9 +294,6 @@ Trouvé : %y octets <source>Cannot read directory %x.</source> <target>Impossible de lire le répertoire %x.</target> -<source>Cannot read file %x.</source> -<target>Impossible de lire le fichier %x.</target> - <source>Cannot read file attributes of %x.</source> <target>Impossible de lire les attributs du fichier %x.</target> @@ -599,6 +596,9 @@ La commande est déclenchée si : <source>Automated Synchronization</source> <target>Synchronisation Automatique</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>Le protocole %x ne supporte pas le contrôle d'anuaire :</target> + <source>Directory monitoring active</source> <target>Gestion des répertoires active</target> @@ -713,8 +713,8 @@ La commande est déclenchée si : <source>Base folder:</source> <target>Dossier de base :</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>Le dossier de gestion des versions sera synchronisé car il est contenu dans le dossier de base.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>Le dossier de version est situé dans le dossier de base.</target> <source>Synchronizing folder pair:</source> <target>Synchronisation de la paire de dossiers :</target> @@ -728,6 +728,15 @@ La commande est déclenchée si : <source>job name</source> <target>nom du job</target> +<source>Show summary</source> +<target>Afficher le résumé</target> + +<source>Sleep</source> +<target>Mise en veille</target> + +<source>Shut down</source> +<target>Arrêt</target> + <source>Synchronization stopped</source> <target>Synchronisation arrêtée</target> @@ -749,6 +758,9 @@ La commande est déclenchée si : <source>Synchronization completed successfully</source> <target>Synchronisation terminée sans erreur</target> +<source>Executing command %x</source> +<target>Exécution de la commande %x</target> + <source>Cleaning up old log files...</source> <target>Nettoyage des anciens fichiers log ...</target> @@ -776,8 +788,8 @@ La commande est déclenchée si : <pluralform>Nouvel essai dans %x secondes ...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Ignorer les erreurs suivantes</target> +<source>Ignore &all</source> +<target>&Tout ignorer</target> <source>Retrying operation...</source> <target>Opération retentée ...</target> @@ -855,7 +867,7 @@ La commande est déclenchée si : <target>&Sauvegarder</target> <source>Save as &batch job...</source> -<target>Enregistrer en tant que job &batch ...</target> +<target>Enregistrer en tant que fichier de &commandes ...</target> <source>Start &comparison</source> <target>Démarrer la &comparaison</target> @@ -884,12 +896,12 @@ La commande est déclenchée si : <source>&Find...</source> <target>&Rechercher...</target> -<source>&Reset layout</source> -<target>&Réinitialiser la disposition</target> - <source>&Export file list...</source> <target>&Exportation de la liste des fichiers ...</target> +<source>&Reset layout</source> +<target>&Réinitialiser la disposition</target> + <source>&Tools</source> <target>Ou&tils</target> @@ -1025,9 +1037,6 @@ La commande est déclenchée si : <source>C&lear</source> <target>&Effacer</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Détection du sens de la synchronisation à l'aide de la base de données</target> - <source>Detect moved files</source> <target>Détection des fichiers déplacés</target> @@ -1048,38 +1057,23 @@ La commande est déclenchée si : <source>&Recycle bin</source> <target>&Corbeille</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Sauvegarder les fichier détruits ou écrasés dans la Corbeille</target> - <source>&Permanent</source> <target>&Permanent</target> -<source>Delete or overwrite files permanently</source> -<target>Supprimer ou écraser les fichiers définitivement</target> - <source>&Versioning</source> <target>Gestion des &Versions</target> -<source>Move files to a user-defined folder</source> -<target>Déplacer les fichiers vers un dossier utilisateur</target> - <source>Naming convention:</source> <target>Convention de nommage :</target> -<source>Handle errors:</source> -<target>Gestion des erreurs :</target> - -<source>&Pop-up</source> -<target>&Pop-up</target> +<source>&Ignore errors</source> +<target>&Ignorer les erreurs</target> <source>Show pop-up on errors or warnings</source> <target>Montrer les avertissements et les messages d'erreur</target> -<source>Hide all error and warning messages</source> -<target>Masquer tous les messages d'erreur et les avertissements</target> - -<source>On completion:</source> -<target>A la fin :</target> +<source>Run a command after synchronization:</source> +<target>Exécuter une commande après la synchronisation :</target> <source>OK</source> <target>OK</target> @@ -1117,6 +1111,9 @@ La commande est déclenchée si : <source>&Key file</source> <target>&Fichier clé</target> +<source>&SSH agent</source> +<target>Agent &SSH</target> + <source>User name:</source> <target>Nom de l'utilisateur :</target> @@ -1135,11 +1132,8 @@ La commande est déclenchée si : <source>How to get best performance?</source> <target>Comment améliorer les performances ?</target> -<source>SSH connections for directory reading:</source> -<target>Connexions SSH pour la lecture des répertoires :</target> - -<source>Suggested range: [1 - 10]</source> -<target>Champ suggéré: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>connexions pour la lecture des répertoires :</target> <source>SFTP channels per connection:</source> <target>Ports SFTP par connexion :</target> @@ -1147,9 +1141,6 @@ La commande est déclenchée si : <source>Detect server limit</source> <target>Détection des limites du serveur</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 connexions x 10 ports = lecture des répertoires 20 fois plus rapide</target> - <source>Select a directory on the server:</source> <target>Sélectionner un répertoire sur le serveur :</target> @@ -1189,6 +1180,9 @@ La commande est déclenchée si : <source>Bytes copied:</source> <target>Octets copiés :</target> +<source>When finished:</source> +<target>A la fin :</target> + <source>Close</source> <target>Fermer</target> @@ -1201,15 +1195,18 @@ La commande est déclenchée si : <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Créer un fichier batch pour une synchronisation non assitée. Pour démarrer, double-cliquez sur ce fichier ou planifiez-le dans le gestionnaire des tâches : %x</target> -<source>&Stop</source> -<target>&Stop</target> +<source>Run minimized</source> +<target>Exécution fenêtre réduite</target> + +<source>&Show error dialog</source> +<target>&Afficher la boîte de dialogue d'erreur</target> + +<source>&Cancel</source> +<target>&Annuler</target> <source>Stop synchronization at first error</source> <target>Arrêter la synchronisation à la première erreur</target> -<source>Run minimized</source> -<target>Exécution fenêtre réduite</target> - <source>Save log:</source> <target>Sauvegarde du fichier log :</target> @@ -1220,7 +1217,7 @@ La commande est déclenchée si : <target>Nombre maximal de fichiers log</target> <source>How can I schedule a batch job?</source> -<target>Comment plannifier un job batch ?</target> +<target>Comment plannifier un fichier de commandes ?</target> <source>&Keep relative paths</source> <target>&Conserver les chemins relatifs</target> @@ -1240,14 +1237,14 @@ Copie vers un fichier temporaire (*.ffs_tmp) avant le remplacement de la cible. Cela garantit la cohérence du système de fichiers en cas d'erreur grave. </target> -<source>(recommended)</source> -<target>(recommandé)</target> +<source>recommended</source> +<target>recommandée</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Copie les fichiers partagés ou verrouillés à l'aide du Service Volume Shadow Copy.</target> -<source>(requires administrator rights)</source> -<target>(nécessite les droits administrateur)</target> +<source>requires administrator rights</source> +<target>nécessite les droits d'administrateur</target> <source>Transfer file and folder permissions.</source> <target>Transfert des autorisations des fichiers et dossiers.</target> @@ -1279,14 +1276,17 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>Source code written in C++ using:</source> <target>Code source écrit en C++ utilisant :</target> -<source>Donation details</source> -<target>Détails pour les donations</target> - <source>If you like FreeFileSync:</source> <target>Si vous aimez FreeFileSync :</target> -<source>Donate with PayPal</source> -<target>Faites un don avec PayPal</target> +<source>Support with a donation</source> +<target>Soutenir avec un don</target> + +<source>Donation details</source> +<target>Détails pour les donations</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>La mise à jour automatique a été désactivée par l'administrateur.</target> <source>Feedback and suggestions are welcome</source> <target>Vos commentaires et vos suggestions sont les bienvenus</target> @@ -1324,8 +1324,8 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>Activate offline</source> <target>Activez hors ligne</target> -<source>Save as Batch Job</source> -<target>Sauvegarder comme Job Batch</target> +<source>Save as a Batch Job</source> +<target>Enregistrer en tant que Fichier de Commandes</target> <source>Delete Items</source> <target>Supprimer les Éléments</target> @@ -1363,11 +1363,17 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>Overview</source> <target>Aperçu</target> +<source>Show "%x"</source> +<target>Afficher "%x"</target> + <source>&Show details</source> <target>&Afficher les détails</target> -<source>A new version of FreeFileSync is available:</source> -<target>Une nouvelle version de FreeFileSync est disponible :</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x est disponible !</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Un ou plusieurs fichiers installés sont abîmés. Veuillez réinstaller FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Chemin local invalide pour %x.</target> @@ -1459,9 +1465,6 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>Select time span...</source> <target>Choisir un intervalle de temps ...</target> -<source>Show "%x"</source> -<target>Afficher "%x"</target> - <source>Last session</source> <target>Dernière session</target> @@ -1561,18 +1564,6 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>Searching for program updates...</source> <target>Recherche de mises à jour ...</target> -<source>Close progress dialog</source> -<target>Fermer la fenêtre de progression</target> - -<source>Log off</source> -<target>Déconnection</target> - -<source>Standby</source> -<target>Pause</target> - -<source>Shut down</source> -<target>Arrêt</target> - <source>Paused</source> <target>En pause</target> @@ -1603,18 +1594,21 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>Log</source> <target>Log</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Un ou plusieurs fichiers installés sont abîmés. Veuillez réinstaller FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Merci %x pour votre don et votre aide !</target> +<source>Recommended range:</source> +<target>Plage recommandée :</target> + <source>Password:</source> <target>Mot de passe :</target> <source>Key password:</source> <target>Mot de passe clé :</target> +<source>Please enter a file path.</source> +<target>Veuillez entrer un chemin d'accès.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1729,6 +1723,15 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>MB</source> <target>Mo</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Conserver les fichiers détruits ou remplacés dans la corbeille</target> + +<source>Delete and overwrite files permanently</source> +<target>Supprimer et remplacer les fichiers de façon permanente</target> + +<source>Move files to a user-defined folder</source> +<target>Déplacer les fichiers vers un dossier utilisateur</target> + <source>Replace</source> <target>Remplacer</target> @@ -1741,6 +1744,15 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>Append a time stamp to each file name</source> <target>Ajouter un horodatage à chaque nom de fichier</target> +<source>On completion:</source> +<target>A la fin :</target> + +<source>On errors:</source> +<target>En cas d'ereur :</target> + +<source>On success:</source> +<target>En cas de succès :</target> + <source>Main config</source> <target>Configuration principale</target> @@ -1762,9 +1774,6 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>Name</source> <target>Nom</target> -<source>Items</source> -<target>Éléments</target> - <source>Percentage</source> <target>Pourcentage</target> @@ -1894,6 +1903,9 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>Cannot change process I/O priorities.</source> <target>Impossible de modifier les priorités E/S des tâches.</target> +<source>Unable to shut down the system.</source> +<target>Impossible d'arrêter le système.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Echec de la vérification de la Corbeille pour le dossier %x.</target> @@ -1918,9 +1930,6 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>Portable</source> <target>Portable</target> -<source>recommended</source> -<target>recommandée</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Enregistrer la configuration dans "%APPDATA%\FreeFileSync"</target> @@ -1972,8 +1981,8 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>Edit with FreeFileSync</source> <target>Modification avec FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>La version portable ne peut être installée dans le dossier choisi.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>La version portable de FreeFileSync ne peut pas être intallée dans le sous-dossier de %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Veuillez choisir le type d'installation locale ou sélectionner un autre dossier pour cette installation.</target> diff --git a/FreeFileSync/Build/Languages/german.lng b/FreeFileSync/Build/Languages/german.lng index d40f7b5d..c39b0536 100755 --- a/FreeFileSync/Build/Languages/german.lng +++ b/FreeFileSync/Build/Languages/german.lng @@ -271,7 +271,7 @@ Tatsächlich: %y bytes <target>Die Berechtigungen von %x können nicht geschrieben werden.</target> <source>Operation not supported for different base folder types.</source> -<target>Der Vorgang wird für unterschiedliche Basisordner nicht unterstützt.</target> +<target>Der Vorgang wird für unterschiedliche Basisordnertypen nicht unterstützt.</target> <source>Cannot write file %x.</source> <target>Die Datei %x kann nicht geschrieben werden.</target> @@ -713,8 +713,8 @@ Die Befehlszeile wird ausgelöst, wenn: <source>Base folder:</source> <target>Basisordner:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>Der Versionierungsordner wird synchronisiert werden, weil er in einem Basisordner enthalten ist.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>Der Versionierungsordner ist in einem Basisordner enthalten.</target> <source>Synchronizing folder pair:</source> <target>Synchronisiere Ordnerpaar:</target> @@ -1072,7 +1072,7 @@ Die Befehlszeile wird ausgelöst, wenn: <source>Show pop-up on errors or warnings</source> <target>Ein Auswahlfenster bei Fehlern oder Warnungen anzeigen</target> -<source>Run command after synchronization:</source> +<source>Run a command after synchronization:</source> <target>Befehl nach Synchronisation ausführen:</target> <source>OK</source> @@ -1237,14 +1237,14 @@ Kopiere in eine temporäre Datei (*.ffs_tmp) bevor das Ziel überschrieben wird. Dadurch wird ein konsistenter Datenstand auch bei schweren Fehlern garantiert. </target> -<source>(recommended)</source> -<target>(Empfohlen)</target> +<source>recommended</source> +<target>empfohlen</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Kopiere gesperrte Dateien mit Hilfe des Volumenschattenkopie-Dienstes.</target> -<source>(requires administrator rights)</source> -<target>(Benötigt Administratorrechte)</target> +<source>requires administrator rights</source> +<target>Benötigt Administratorrechte</target> <source>Transfer file and folder permissions.</source> <target>Übertrage Datei- und Ordnerberechtigungen.</target> @@ -1285,6 +1285,9 @@ Dadurch wird ein konsistenter Datenstand auch bei schweren Fehlern garantiert. <source>Donation details</source> <target>Spendendetails</target> +<source>The auto updater was disabled by the administrator.</source> +<target>Die automatische Aktualisierung wurde vom Administrator deaktiviert.</target> + <source>Feedback and suggestions are welcome</source> <target>Feedback und Vorschläge sind willkommen</target> @@ -1321,7 +1324,7 @@ Dadurch wird ein konsistenter Datenstand auch bei schweren Fehlern garantiert. <source>Activate offline</source> <target>Offline aktivieren</target> -<source>Save as Batch Job</source> +<source>Save as a Batch Job</source> <target>Als Batchauftrag speichern</target> <source>Delete Items</source> @@ -1369,6 +1372,9 @@ Dadurch wird ein konsistenter Datenstand auch bei schweren Fehlern garantiert. <source>FreeFileSync %x is available!</source> <target>FreeFileSync %x ist verfügbar!</target> +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Die Installationsdateien sind beschädigt. Bitte installieren Sie FreeFileSync neu.</target> + <source>Local path not available for %x.</source> <target>Lokaler Pfad ist nicht verfügbar für %x.</target> @@ -1588,9 +1594,6 @@ Dadurch wird ein konsistenter Datenstand auch bei schweren Fehlern garantiert. <source>Log</source> <target>Protokoll</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Die Installationsdateien sind beschädigt. Bitte installieren Sie FreeFileSync neu.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Danke %x für die Spende und Unterstützung!</target> @@ -1720,11 +1723,11 @@ Dadurch wird ein konsistenter Datenstand auch bei schweren Fehlern garantiert. <source>MB</source> <target>MB</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Gelöschte und überschriebene Dateien im Papierkorb sichern</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Gelöschte und überschriebene Dateien im Papierkorb aufbewahren</target> -<source>Delete or overwrite files permanently</source> -<target>Dateien endgültig löschen oder überschreiben</target> +<source>Delete and overwrite files permanently</source> +<target>Dateien endgültig löschen und überschreiben</target> <source>Move files to a user-defined folder</source> <target>Dateien in einen benutzerdefinierten Ordner verschieben</target> @@ -1900,7 +1903,7 @@ Dadurch wird ein konsistenter Datenstand auch bei schweren Fehlern garantiert. <source>Cannot change process I/O priorities.</source> <target>Die Eingabe/Ausgabe Prioritäten für den Prozess können nicht geändert werden.</target> -<source>Unable to shut down system.</source> +<source>Unable to shut down the system.</source> <target>Das System kann nicht heruntergefahren werden.</target> <source>Checking recycle bin failed for folder %x.</source> @@ -1927,9 +1930,6 @@ Dadurch wird ein konsistenter Datenstand auch bei schweren Fehlern garantiert. <source>Portable</source> <target>Portabel</target> -<source>recommended</source> -<target>empfohlen</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Einstellungen unter "%APPDATA%\FreeFileSync" sichern</target> diff --git a/FreeFileSync/Build/Languages/greek.lng b/FreeFileSync/Build/Languages/greek.lng index 9522e703..d3565f61 100755 --- a/FreeFileSync/Build/Languages/greek.lng +++ b/FreeFileSync/Build/Languages/greek.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Έλεγχος της διαθεσιμότητας του κάδου ανακύκλωσης για το φάκελο %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Ο κάδος ανακύκλωσης δεν είναι διαθέσιμος για τους ακόλουθους φακέλους. Τα αρχεία θα διαγραφούν μόνιμα:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>Ο Κάδος Ανακύκλωσης δεν υποστηρίζεται στους ακόλουθους φακέλους. Αρχεία που διαγράφησαν ή αντικαταστάθηκαν δεν θα μπορούν να επαναφερθούν:</target> <source>An exception occurred</source> <target>Παρουσιάστηκε μια εξαίρεση</target> @@ -71,7 +71,7 @@ <target>Σφάλμα</target> <source>File %x does not contain a valid configuration.</source> -<target>Το αρχείο %x δεν περιέχει μια έγκυρη διάταξη.</target> +<target>Το αρχείο %x δεν περιέχει έγκυρες παραμέτρους.</target> <source>Unequal number of left and right directories specified.</source> <target>Έχει οριστεί άνισος αριθμός υποκαταλόγων δεξιά από ό,τι αριστερά.</target> @@ -80,7 +80,7 @@ <target>Το αρχείο διάταξης δεν πρέπει να περιλαμβάνει ρυθμίσεις στο επίπεδο του ζεύγους των υποκαταλόγων, όταν οι φάκελοι ορίζονται μέσω της γραμμής εργασιών.</target> <source>Directories cannot be set for more than one configuration file.</source> -<target>Δεν μπορούν να οριστούν φάκελοι για περισσότερα από ένα αρχεία διάταξης.</target> +<target>Δεν μπορούν να οριστούν φάκελοι για περισσότερα από ένα αρχεία παραμέτρων.</target> <source>Command line</source> <target>Γραμμή εντολών</target> @@ -88,26 +88,26 @@ <source>Syntax:</source> <target>Σύνταξη:</target> -<source>global config file:</source> -<target>αρχείο γενικών ρυθμίσεων:</target> - <source>config files:</source> <target>αρχεία ρυθμίσεων:</target> <source>directory</source> <target>υποκατάλογος</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Διαδρομή σε ένα εναλλακτικό αρχείο GlobalSettings.xml.</target> +<source>global config file:</source> +<target>αρχείο γενικών ρυθμίσεων:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> -<target>Οποιοσδήποτε αριθμός αρχείων διάταξης .ffs_gui ή/και .ffs_batch του FreeFileSync.</target> +<target>Οποιοσδήποτε αριθμός από αρχεία παραμέτρων .ffs_gui ή/και .ffs_batch του FreeFileSync.</target> <source>Any number of alternative directory pairs for at most one config file.</source> <target>Οποιοσδήποτε αριθμός από εναλλακτικά ζεύγη υποκαταλόγων για το πολύ ένα αρχείο ρυθμίσεων.</target> -<source>Open configuration for editing without executing it.</source> -<target>Άνοιγμα της διάταξης για διόρθωση χωρίς να εκτελεστεί.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Άνοιγμα του επιλεγμένου αρχείου παραμέτρων μόνο για διόρθωση, χωρίς να εκτελεστεί.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Διαδρομή σε ένα εναλλακτικό αρχείο GlobalSettings.xml.</target> <source>Cannot find the following folders:</source> <target>Οι ακόλουθοι φάκελοι δεν ήταν δυνατό να βρεθούν:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Ενημέρωση των χαρακτηριστικών στα δεξιά</target> -<source>Cannot write file %x.</source> -<target>Δεν μπορεί να γίνει εγγραφή του αρχείου %x.</target> +<source>Cannot read file %x.</source> +<target>Δεν μπορεί να γίνει ανάγνωση του αρχείου %x.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Actual: %y bytes <source>Operation not supported for different base folder types.</source> <target>Η λειτουργία δεν υποστηρίζεται για διαφορετικούς τύπους βασικών φακέλων.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Αδυναμία αντιγραφής του συμβολικού συνδέσμου %x στο %y.</target> +<source>Cannot write file %x.</source> +<target>Δεν μπορεί να γίνει εγγραφή του αρχείου %x.</target> <source>Cannot move file %x to %y.</source> <target>Δεν μπορεί το αρχείο %x να μεταφερθεί στο %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Αδυναμία αντιγραφής του συμβολικού συνδέσμου %x στο %y.</target> + <source>Unable to connect to %x.</source> <target>Δεν μπορεί να πραγματοποιηθεί σύνδεση με το %x.</target> @@ -294,9 +297,6 @@ Actual: %y bytes <source>Cannot read file attributes of %x.</source> <target>Δεν μπορεί να γίνει ανάγνωση των χαρακτηριστικών του αρχείου %x.</target> -<source>Cannot read file %x.</source> -<target>Δεν μπορεί να γίνει ανάγνωση του αρχείου %x.</target> - <source>Cannot create directory %x.</source> <target>Δεν μπορεί να δημιουργηθεί ο υποκατάλογος %x.</target> @@ -596,8 +596,8 @@ The command is triggered if: <source>Automated Synchronization</source> <target>Αυτοματοποιημένος Συγχρονισμός</target> -<source>The following path does not support directory monitoring:</source> -<target>Η παρακάτω διαδρομή δεν υποστηρίζει παρακολούθηση υποκαταλόγων:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>Το πρωτόκολο %x δεν υποστηρίζει παρακολούθηση καταλόγων:</target> <source>Directory monitoring active</source> <target>Η παρακολούθηση των υποκαταλόγων είναι ενεργή</target> @@ -713,8 +713,8 @@ The command is triggered if: <source>Base folder:</source> <target>Βασικός φάκελος:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>Ο φάκελος διατήρησης παλιών εκδόσεων θα συγχρονιστεί γιατί βρίσκεται μέσα σε έναν βασικό φάκελο.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>Ο φάκελος διατήρησης παλιών εκδόσεων βρίσκεται μέσα σε κάποιον βασικό φάκελο.</target> <source>Synchronizing folder pair:</source> <target>Συγχρονίζεται το ζευγάρι φακέλων:</target> @@ -728,6 +728,15 @@ The command is triggered if: <source>job name</source> <target>όνομα ενέργειας</target> +<source>Show summary</source> +<target>Εμφάνιση σύνοψης</target> + +<source>Sleep</source> +<target>Αναστολή λειτουργίας</target> + +<source>Shut down</source> +<target>Τερματισμός λειτουργίας</target> + <source>Synchronization stopped</source> <target>Διακοπή του συγχρονισμού</target> @@ -749,6 +758,9 @@ The command is triggered if: <source>Synchronization completed successfully</source> <target>Ο συγχρονισμός ολοκληρώθηκε επιτυχώς</target> +<source>Executing command %x</source> +<target>Εκτέλεση εντολής %x</target> + <source>Cleaning up old log files...</source> <target>Καθαρισμός των παλιών αρχείων καταγραφής...</target> @@ -776,8 +788,8 @@ The command is triggered if: <pluralform>Αυτόματη επανάληψη σε %x δευτερόλεπτα...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Αγνόηση επόμενων σφαλμάτων</target> +<source>Ignore &all</source> +<target>Παράβλεψη ό&λων</target> <source>Retrying operation...</source> <target>Επανάληψη της προσπάθειας...</target> @@ -884,12 +896,12 @@ The command is triggered if: <source>&Find...</source> <target>Εύ&ρεση...</target> -<source>&Reset layout</source> -<target>&Αρχικοποίηση εμφάνισης</target> - <source>&Export file list...</source> <target>Ε&ξαγωγή καταλόγου αρχείων...</target> +<source>&Reset layout</source> +<target>&Αρχικοποίηση εμφάνισης</target> + <source>&Tools</source> <target>&Εργαλεία</target> @@ -1025,9 +1037,6 @@ The command is triggered if: <source>C&lear</source> <target>&Καθαρισμός</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Ανίχνευση της κατεύθυνσης συγχρονισμού με τη βοήθεια αρχείων βάσης δεδομένων</target> - <source>Detect moved files</source> <target>Ανίχνευση των αρχείων που μεταφέρθηκαν</target> @@ -1048,38 +1057,23 @@ The command is triggered if: <source>&Recycle bin</source> <target>&Κάδος ανακύκλωσης</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Μεταφορά όλων των διαγραμμένων και αντικατεστημένων αρχείων στον κάδο ανακύκλωσης</target> - <source>&Permanent</source> <target>&Μόνιμη</target> -<source>Delete or overwrite files permanently</source> -<target>Μόνιμη διαγραφή ή αντικατάσταση των αρχείων</target> - <source>&Versioning</source> <target>&Διατήρηση παλιών εκδόσεων</target> -<source>Move files to a user-defined folder</source> -<target>Μεταφορά αρχείων σε έναν υποκατάλογο που ορίζεται από το χρήστη</target> - <source>Naming convention:</source> <target>Κανόνας ονοματοθεσίας:</target> -<source>Handle errors:</source> -<target>Χειρισμός σφαλμάτων:</target> - -<source>&Pop-up</source> -<target>&Αναδυόμενο</target> +<source>&Ignore errors</source> +<target>&Παράβλεψη σφαλμάτων</target> <source>Show pop-up on errors or warnings</source> <target>Εμφάνιση αναδυόμενου παράθυρου σε σφάλματα ή προειδοποιήσεις</target> -<source>Hide all error and warning messages</source> -<target>Απόκρυψη όλων των σφαλμάτων και προειδοποιήσεων</target> - -<source>On completion:</source> -<target>Μετά την ολοκλήρωση:</target> +<source>Run a command after synchronization:</source> +<target>Εκτέλεση εντολής μετά το συγχρονισμό:</target> <source>OK</source> <target>OK</target> @@ -1117,6 +1111,9 @@ The command is triggered if: <source>&Key file</source> <target>&Αρχείο κλειδιού</target> +<source>&SSH agent</source> +<target>Παράγοντας &SSH</target> + <source>User name:</source> <target>Όνομα χρήστη:</target> @@ -1135,11 +1132,8 @@ The command is triggered if: <source>How to get best performance?</source> <target>Πώς να έχετε την καλύτερη απόδοση;</target> -<source>SSH connections for directory reading:</source> -<target>SSH συνδέσεις για ανάγνωση του καταλόγου:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Προτεινόμενο εύρος: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>Συνδέσεις για ανάγνωση καταλόγου:</target> <source>SFTP channels per connection:</source> <target>Αριθμός καναλιών SFTP ανά σύνδεση:</target> @@ -1147,9 +1141,6 @@ The command is triggered if: <source>Detect server limit</source> <target>Ανίχνευση ορίου του εξυπηρετητή</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 συνδέσεις X 10 κανάλια = 20 φορές πιο γρήγορη ανάγνωση του καταλόγου</target> - <source>Select a directory on the server:</source> <target>Επιλογή ενός υποκαταλόγου στον διακομιστή:</target> @@ -1189,6 +1180,9 @@ The command is triggered if: <source>Bytes copied:</source> <target>Bytes που αντιγράφτηκαν:</target> +<source>When finished:</source> +<target>Μετά την ολοκλήρωση:</target> + <source>Close</source> <target>Κλείσιμο</target> @@ -1201,15 +1195,18 @@ The command is triggered if: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Δημιουργία ενός αρχείου δέσμης για αυτόματο συγχρονισμό. Για να ξεκινήσετε, κάντε διπλό κλικ σε αυτό το αρχείο ή ενσωματώστε το σε ένα χρονοδιάγραμμα εργασιών: %x</target> -<source>&Stop</source> -<target>&Διακοπή</target> +<source>Run minimized</source> +<target>Εκκίνηση σε ελαχιστοποιημένο παράθυρο</target> + +<source>&Show error dialog</source> +<target>Εμ&φάνιση ειδοποιήσεων σφαλμάτων</target> + +<source>&Cancel</source> +<target>Α&κύρωση</target> <source>Stop synchronization at first error</source> <target>Διακοπή του συγχρονισμού με το πρώτο σφάλμα</target> -<source>Run minimized</source> -<target>Εκκίνηση σε ελαχιστοποιημένο παράθυρο</target> - <source>Save log:</source> <target>Αποθήκευση αρχείου καταγραφής:</target> @@ -1240,14 +1237,14 @@ This guarantees a consistent state even in case of a serious error. Αυτό εγγυάται μια συνεπή κατάσταση ακόμα και στην περίπτωση σοβαρού σφάλματος. </target> -<source>(recommended)</source> -<target>(προτεινόμενο)</target> +<source>recommended</source> +<target>συνιστώμενη</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Αντιγραφή των κοινών ή κλειδωμένων αρχείων με τη χρήση της Υπηρεσίας Σκιωδών Αντιγράφων Τόμου.</target> -<source>(requires administrator rights)</source> -<target>(απαιτεί δικαιώματα διαχειριστή)</target> +<source>requires administrator rights</source> +<target>απαιτεί δικαιώματα διαχειριστή</target> <source>Transfer file and folder permissions.</source> <target>Μεταφορά των δικαιωμάτων πρόσβασης αρχείων και φακέλων.</target> @@ -1279,14 +1276,17 @@ This guarantees a consistent state even in case of a serious error. <source>Source code written in C++ using:</source> <target>Ο πηγαίος κώδικας γράφτηκε σε C++ χρησιμοποιώντας τα:</target> -<source>Donation details</source> -<target>Λεπτομέρειες δωρεάς</target> - <source>If you like FreeFileSync:</source> <target>Αν σας αρέσει το FreeFileSync:</target> -<source>Donate with PayPal</source> -<target>Κάντε μια δωρεά μέσω PayPal</target> +<source>Support with a donation</source> +<target>Υποστηρίξτε με μια δωρεά</target> + +<source>Donation details</source> +<target>Λεπτομέρειες δωρεάς</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>Η αυτόματη ενημέρωση απενεργοποιήθηκε από το διαχειριστή.</target> <source>Feedback and suggestions are welcome</source> <target>Τα σχόλια και οι προτάσεις σας είναι ευπρόσδεκτα</target> @@ -1324,14 +1324,14 @@ This guarantees a consistent state even in case of a serious error. <source>Activate offline</source> <target>Ενεργοποίηση χωρίς σύνδεση</target> -<source>Save as Batch Job</source> -<target>Αποθήκευση ως Δέσμη Εργασιών</target> +<source>Save as a Batch Job</source> +<target>Αποθήκευση ως Δέσμη Ενεργειών</target> <source>Delete Items</source> <target>Διαγραφή Στοιχείων</target> <source>Copy items</source> -<target>Αντιγραφή στοιχείων</target> +<target>Αντιγραφή Στοιχείων</target> <source>Options</source> <target>Επιλογές</target> @@ -1358,16 +1358,22 @@ This guarantees a consistent state even in case of a serious error. <target>Προβολή Ρυθμίσεων</target> <source>Configuration</source> -<target>Διάταξη</target> +<target>Παράμετροι</target> <source>Overview</source> <target>Σύνοψη</target> +<source>Show "%x"</source> +<target>Εμφάνιση της γραμμής "%x"</target> + <source>&Show details</source> <target>&Προβολή λεπτομερειών</target> -<source>A new version of FreeFileSync is available:</source> -<target>Μια νέα έκδοση του FreeFileSync είναι διαθέσιμη:</target> +<source>FreeFileSync %x is available!</source> +<target>Το FreeFileSync %x είναι διαθέσιμο!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Τα αρχεία εγκατάστασης είναι κατεστραμμένα. Παρακαλούμε επανεγκαταστείστε το FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Η τοπική διαδρομή δεν είναι διαθέσιμη για το %x.</target> @@ -1459,9 +1465,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>Επιλέξτε το χρονικό εύρος...</target> -<source>Show "%x"</source> -<target>Εμφάνιση της γραμμής "%x"</target> - <source>Last session</source> <target>Τελευταία χρήση</target> @@ -1469,7 +1472,7 @@ This guarantees a consistent state even in case of a serious error. <target>Σύγκριση Φακέλων και Συγχρονισμός</target> <source>Configuration saved</source> -<target>Η διάταξη αποθηκεύτηκε</target> +<target>Οι παράμετροι αποθηκεύτηκαν</target> <source>FreeFileSync batch</source> <target>Δέσμη ενεργειών του FreeFileSync</target> @@ -1561,18 +1564,6 @@ This guarantees a consistent state even in case of a serious error. <source>Searching for program updates...</source> <target>Αναζήτηση καινούριας έκδοσης...</target> -<source>Close progress dialog</source> -<target>Κλείσιμο του παράθυρου αναφοράς</target> - -<source>Log off</source> -<target>Αποσύνδεση</target> - -<source>Standby</source> -<target>Αναστολή λειτουργίας</target> - -<source>Shut down</source> -<target>Τερματισμός λειτουργίας</target> - <source>Paused</source> <target>Σε παύση</target> @@ -1603,18 +1594,21 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>Καταγραφή</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Τα αρχεία εγκατάστασης είναι κατεστραμμένα. Παρακαλούμε επανεγκαταστείστε το FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Σας ευχαριστούμε, %x, για τη δωρεά και την υποστήριξή σας!</target> +<source>Recommended range:</source> +<target>Προτεινόμενο εύρος:</target> + <source>Password:</source> <target>Συνθηματικό:</target> <source>Key password:</source> <target>Συνθηματικό κλειδιού:</target> +<source>Please enter a file path.</source> +<target>Παρακαλούμε εισάγετε μια διαδρομή αρχείου.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1729,6 +1723,15 @@ This guarantees a consistent state even in case of a serious error. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Διατήρηση διαγραμμένων και αντικατεστημένων αρχείων στον κάδο ανακύκλωσης</target> + +<source>Delete and overwrite files permanently</source> +<target>Μόνιμη διαγραφή και αντικατάσταση αρχείων</target> + +<source>Move files to a user-defined folder</source> +<target>Μεταφορά αρχείων σε έναν υποκατάλογο που ορίζεται από το χρήστη</target> + <source>Replace</source> <target>Αντικατάσταση προηγούμενης</target> @@ -1741,6 +1744,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>Προσάρτηση χρονικής σήμανσης στο όνομα κάθε αρχείου</target> +<source>On completion:</source> +<target>Μετά την ολοκλήρωση:</target> + +<source>On errors:</source> +<target>Μετά από σφάλμα:</target> + +<source>On success:</source> +<target>Μετά από επιτυχία:</target> + <source>Main config</source> <target>Κύρια διάταξη</target> @@ -1762,9 +1774,6 @@ This guarantees a consistent state even in case of a serious error. <source>Name</source> <target>Όνομα</target> -<source>Items</source> -<target>Στοιχεία</target> - <source>Percentage</source> <target>Ποσοστό</target> @@ -1894,6 +1903,9 @@ This guarantees a consistent state even in case of a serious error. <source>Cannot change process I/O priorities.</source> <target>Δεν μπορούν να αλλάξουν οι προτεραιότητες I/O της διεργασίας.</target> +<source>Unable to shut down the system.</source> +<target>Αδυναμία τερματισμού λειτουργίας του συστήματος.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Ο έλεγχος του κάδου ανακύκλωσης απέτυχε για τον υποκατάλογο %x.</target> @@ -1901,7 +1913,7 @@ This guarantees a consistent state even in case of a serious error. <target>Τα ακόλουθα στοιχεία XML δεν ήταν δυνατό να αναγνωσθούν:</target> <source>Configuration file %x is incomplete. The missing elements will be set to their default values.</source> -<target>Το αρχείο διάταξης %x είναι ατελές. Τα στοιχεία που λείπουν θα αντικατασταθούν με τις προεπιλεγμένες τιμές τους.</target> +<target>Το αρχείο παραμέτρων %x είναι ατελές. Τα στοιχεία που λείπουν θα αντικατασταθούν με τις προεπιλεγμένες τιμές τους.</target> <source>Prepare installation</source> <target>Προετοιμασία εγκατάστασης</target> @@ -1918,9 +1930,6 @@ This guarantees a consistent state even in case of a serious error. <source>Portable</source> <target>Φορητή</target> -<source>recommended</source> -<target>συνιστώμενη</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Αποθήκευση ρυθμίσεων στο "%APPDATA%\FreeFileSync"</target> @@ -1972,8 +1981,8 @@ This guarantees a consistent state even in case of a serious error. <source>Edit with FreeFileSync</source> <target>Επεξεργασία με FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>Η φορητή έκδοση δεν μπορεί να εγκατασταθεί στον επιλεγμένο φάκελο.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>Η φορητή έκδοση του FreeFileSync δεν μπορεί να εγκατασταθεί σε υποφάκελο του %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Παρακαλούμε επιλέξτε την τοπική εγκατάσταση ή επιλέξτε έναν διαφορετικό φάκελο για εγκατάσταση.</target> diff --git a/FreeFileSync/Build/Languages/hebrew.lng b/FreeFileSync/Build/Languages/hebrew.lng index bd8d2e1e..9ae0aab3 100755 --- a/FreeFileSync/Build/Languages/hebrew.lng +++ b/FreeFileSync/Build/Languages/hebrew.lng @@ -7,12 +7,6 @@ <plural_definition>n == 1 ? 0 : 1</plural_definition> </header> -<source> -<pluralform>Operation timed out after 1 second.</pluralform> -<pluralform>Operation timed out after %x seconds.</pluralform> -</source> -<target></target> - <source>Both sides have changed since last synchronization.</source> <target>שני הצדדים שונו מאז הסנכרון האחרון.</target> @@ -58,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>בודק זמינות סל מחזור עבור תיקייה %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>סל המיחזור אינו זמין עבור התיקיות הבאות. הקבצים יימחקו לחלוטין:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>תא המחזור אינו נתמך על ידי התיקיות הבאות. קבצים שנמחקו או הוחלפו לא יהיו ניתנים לשחזור:</target> <source>An exception occurred</source> <target>אירוע חריג</target> @@ -94,17 +88,14 @@ <source>Syntax:</source> <target>תחביר:</target> -<source>global config file:</source> -<target>קבצי תצורה גלובליים:</target> - <source>config files:</source> <target>קבצי תצורה:</target> <source>directory</source> <target>מחיצה</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>נתיב אל קובץ GlobalSettingd.xml אלטרנטיבי.</target> +<source>global config file:</source> +<target>קבצי תצורה גלובליים:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>כל כמות של קבצי FreeFileSync .ffs_gui ו\או קבצי קונפיגורציה .ffs_batch.</target> @@ -112,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>כל כמות של זוגות מחיצות אלטרנטיביות עבור קובץ תצורה אחד לפחות.</target> -<source>Open configuration for editing without executing it.</source> -<target>פתח הגדרות תצורה לעריכה ללא החלתם.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>פתח את התצורה הבאה לעריכה בלבד מבלי להפעיל אותה.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>נתיב אל קובץ GlobalSettingd.xml אלטרנטיבי.</target> <source>Cannot find the following folders:</source> <target>לא יכול למצוא את התיקיות הבאות:</target> @@ -259,8 +253,8 @@ <source>Update attributes on right</source> <target>עדכן תכונות בצד שמאל</target> -<source>Cannot write file %x.</source> -<target>לא יכול לכתוב קובץ %x.</target> +<source>Cannot read file %x.</source> +<target>לא יכול לקרוא קובץ %x.</target> <source> Unexpected size of data stream. @@ -279,12 +273,15 @@ Actual: %y bytes <source>Operation not supported for different base folder types.</source> <target>פעולה לא נתמכת עבור סוגים אחרים של תיקית בסיס.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>לא יכול להעתיק קישור סימבולי %x אל %y.</target> +<source>Cannot write file %x.</source> +<target>לא יכול לכתוב קובץ %x.</target> <source>Cannot move file %x to %y.</source> <target>לא יכול להעביר קובץ %x אל %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>לא יכול להעתיק קישור סימבולי %x אל %y.</target> + <source>Unable to connect to %x.</source> <target>לא יכול להתחבר אל %x.</target> @@ -297,9 +294,6 @@ Actual: %y bytes <source>Cannot read directory %x.</source> <target>לא ניתן לקרוא מחיצה %x.</target> -<source>Cannot read file %x.</source> -<target>לא יכול לקרוא קובץ %x.</target> - <source>Cannot read file attributes of %x.</source> <target>לא יכול לקרוא תכונות של קובץ %x.</target> @@ -358,6 +352,15 @@ Actual: %y bytes <target>לא ניתן לגשת אל %x.</target> <source> +<pluralform>Operation timed out after 1 second.</pluralform> +<pluralform>Operation timed out after %x seconds.</pluralform> +</source> +<target> +<pluralform>זמן הפעולה פקע לאחר שניה 1.</pluralform> +<pluralform>זמן הםעולה פקע לאחר %x שניות.</pluralform> +</target> + +<source> <pluralform>Cannot wait on more than 1 connection at a time.</pluralform> <pluralform>Cannot wait on more than %x connections at a time.</pluralform> </source> @@ -593,8 +596,8 @@ The command is triggered if: <source>Automated Synchronization</source> <target>סנכרון אוטומטי</target> -<source>The following path does not support directory monitoring:</source> -<target>הנתיב הבא אינו תומך בניטור מחיצה:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>הפרוטוקול %x אינו תומך בניטור מחיצה:</target> <source>Directory monitoring active</source> <target>ניטור מחיצות פעיל</target> @@ -710,8 +713,8 @@ The command is triggered if: <source>Base folder:</source> <target>תיקיית בסיס:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>תיקיית הגרסאות תסונכרן מכיוון שהיא כלולה בתיקיית בסיס.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>תיקיית ניהול הגירסאות נמצאת בתיקיית בסיס.</target> <source>Synchronizing folder pair:</source> <target>מסנכרן זוג תיקיות:</target> @@ -725,6 +728,15 @@ The command is triggered if: <source>job name</source> <target>שם משימה</target> +<source>Show summary</source> +<target>הצג תקציר</target> + +<source>Sleep</source> +<target>שינה</target> + +<source>Shut down</source> +<target>כבה מחשב</target> + <source>Synchronization stopped</source> <target>סנכרון הופסק</target> @@ -746,6 +758,9 @@ The command is triggered if: <source>Synchronization completed successfully</source> <target>סנכרון הסתיים בהצלחה</target> +<source>Executing command %x</source> +<target>מבצע פקודה %x</target> + <source>Cleaning up old log files...</source> <target>מנקה קבצי יומן ישנים...</target> @@ -773,8 +788,8 @@ The command is triggered if: <pluralform>נסיון מחדש אוטומטי בתוך %x שניות...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&התעלם מאזהרות נוספות</target> +<source>Ignore &all</source> +<target>התעלם &מהכל</target> <source>Retrying operation...</source> <target>מנסה שוב פעולה...</target> @@ -881,12 +896,12 @@ The command is triggered if: <source>&Find...</source> <target>&מצא...</target> -<source>&Reset layout</source> -<target>&אפס פריסה</target> - <source>&Export file list...</source> <target>&יצא רשימת קבצים...</target> +<source>&Reset layout</source> +<target>&אפס פריסה</target> + <source>&Tools</source> <target>&כלים</target> @@ -1022,9 +1037,6 @@ The command is triggered if: <source>C&lear</source> <target>א&פס</target> -<source>Detect synchronization directions with the help of database files</source> -<target>גלה כיווני סינכרון באמצעות קבצי בסיס נתונים</target> - <source>Detect moved files</source> <target>גלה קבצים מועברים</target> @@ -1045,38 +1057,23 @@ The command is triggered if: <source>&Recycle bin</source> <target>&סל מחזור</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>גבה קבצים שנמחקו או שנדרסו בסל המיחזור</target> - <source>&Permanent</source> <target>&קבוע</target> -<source>Delete or overwrite files permanently</source> -<target>מחק או דרוס קבצים לצמיתות</target> - <source>&Versioning</source> <target>&גרסאות</target> -<source>Move files to a user-defined folder</source> -<target>העבר קבצים לתיקייה המוגדרת ע"י המפעיל</target> - <source>Naming convention:</source> <target>מוסכמות לקביעת שמות:</target> -<source>Handle errors:</source> -<target>טפל בשגיאות:</target> - -<source>&Pop-up</source> -<target>&מוקפץ</target> +<source>&Ignore errors</source> +<target>&התעלם משגיאות</target> <source>Show pop-up on errors or warnings</source> <target>הראה חלונות מוקפצים עבור שגיאות או אזהרות</target> -<source>Hide all error and warning messages</source> -<target>הסתר את כל הודעות ההזהרה והשגיאה</target> - -<source>On completion:</source> -<target>עם הסיום:</target> +<source>Run a command after synchronization:</source> +<target>הרץ פקודה לאחר סינכרון:</target> <source>OK</source> <target>אשר</target> @@ -1114,6 +1111,9 @@ The command is triggered if: <source>&Key file</source> <target>&קטבץ מפתח</target> +<source>&SSH agent</source> +<target>סוכן &SSH</target> + <source>User name:</source> <target>שם משתמש:</target> @@ -1132,11 +1132,8 @@ The command is triggered if: <source>How to get best performance?</source> <target>כיצד לקבל את הביצועים הטובים ביותר?</target> -<source>SSH connections for directory reading:</source> -<target>חיבורי SSH לקריאת מחיצות:</target> - -<source>Suggested range: [1 - 10]</source> -<target>טווח מוצע: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>חיבורים לקריאת מחיצה:</target> <source>SFTP channels per connection:</source> <target>ערוצי SFTP לחיבור:</target> @@ -1144,9 +1141,6 @@ The command is triggered if: <source>Detect server limit</source> <target>גלה את גבול השרת</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 חיבורים x 10 ערוצים = קריאת מחיצה מהירה יותר פי 20</target> - <source>Select a directory on the server:</source> <target>בחר מחיצה על השרת:</target> @@ -1186,6 +1180,9 @@ The command is triggered if: <source>Bytes copied:</source> <target>בתים שהועתקו:</target> +<source>When finished:</source> +<target>לאחר הסיום:</target> + <source>Close</source> <target>סגור</target> @@ -1198,15 +1195,18 @@ The command is triggered if: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>צור קובץ אצווה לסינכרון ללא התערבות מפעיל. כדי להפעיל, הקלק הקלקה כפולה על הקובץ או תזמן במתכנן המשימות: %x</target> -<source>&Stop</source> -<target>&עצור</target> +<source>Run minimized</source> +<target>הרץ ממוזער</target> + +<source>&Show error dialog</source> +<target>&הצג דו-שיח שגיאה</target> + +<source>&Cancel</source> +<target>&ביטול</target> <source>Stop synchronization at first error</source> <target>עצור סנכרון עם הופעת שגיאה ראשונה</target> -<source>Run minimized</source> -<target>הרץ ממוזער</target> - <source>Save log:</source> <target>שמור יומן:</target> @@ -1237,14 +1237,14 @@ This guarantees a consistent state even in case of a serious error. זה מבטיח מצב עקבי גם במקרה של שגיאה חמורה. </target> -<source>(recommended)</source> -<target>(מומלץ)</target> +<source>recommended</source> +<target>מומלץ</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>העתק קבצים בשיתוף או בנעילה באמצעות שרות Volume Shadow Copy.</target> -<source>(requires administrator rights)</source> -<target>(נדרשות זכויות מנהל)</target> +<source>requires administrator rights</source> +<target>נדרשות זכויות מנהל מערכת</target> <source>Transfer file and folder permissions.</source> <target>הרשאות העברת קובץ ותיקייה.</target> @@ -1276,14 +1276,17 @@ This guarantees a consistent state even in case of a serious error. <source>Source code written in C++ using:</source> <target>קוד מקור נכתב ב- C++ באמצעות:</target> -<source>Donation details</source> -<target>פרטי תרומה:</target> - <source>If you like FreeFileSync:</source> <target>במידה ו-FreeFileSync מוצאת חן בעינכם:</target> -<source>Donate with PayPal</source> -<target>תרום עם פייפאל</target> +<source>Support with a donation</source> +<target>תמיכה באמצאות תרומה</target> + +<source>Donation details</source> +<target>פרטי תרומה:</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>עידכון אוטומטי הושבת על ידי מנהל מערכת.</target> <source>Feedback and suggestions are welcome</source> <target>משוב והצעות יתקבלו בברכה</target> @@ -1321,7 +1324,7 @@ This guarantees a consistent state even in case of a serious error. <source>Activate offline</source> <target>הפעלה בלתי מקוונת</target> -<source>Save as Batch Job</source> +<source>Save as a Batch Job</source> <target>שמור כמשימת אצווה</target> <source>Delete Items</source> @@ -1360,11 +1363,17 @@ This guarantees a consistent state even in case of a serious error. <source>Overview</source> <target>מבט כללי</target> +<source>Show "%x"</source> +<target>הראה "%x"</target> + <source>&Show details</source> <target>&הראה פרטים</target> -<source>A new version of FreeFileSync is available:</source> -<target>גירסה חדשה של FreeFileSync זמינה:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x זמין !</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>קבצי ההתקנה פגומים. בבקשה התקן מחדש את FreeFileSync.</target> <source>Local path not available for %x.</source> <target>נתיב מקומי לא זמין עבור %x.</target> @@ -1456,9 +1465,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>בחר תחום זמן...</target> -<source>Show "%x"</source> -<target>הראה "%x"</target> - <source>Last session</source> <target>פעילות אחרונה</target> @@ -1558,18 +1564,6 @@ This guarantees a consistent state even in case of a serious error. <source>Searching for program updates...</source> <target>מחפש עידכוני תוכנה...</target> -<source>Close progress dialog</source> -<target>סגור שיח התקדמות</target> - -<source>Log off</source> -<target>התנתק כמשתמש</target> - -<source>Standby</source> -<target>עבור למצב המתנה</target> - -<source>Shut down</source> -<target>כבה מחשב</target> - <source>Paused</source> <target>עצור</target> @@ -1600,18 +1594,21 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>יומן</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>קבצי ההתקנה פגומים. בבקשה התקן מחדש את FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>תודה לך %x, עבור תרומתך ותמיכתך!</target> +<source>Recommended range:</source> +<target>טווח מומלץ:</target> + <source>Password:</source> <target>סיסמה:</target> <source>Key password:</source> <target>סיסמת מפתח:</target> +<source>Please enter a file path.</source> +<target>בבקשה הכנס נתיב קובץ.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1726,6 +1723,15 @@ This guarantees a consistent state even in case of a serious error. <source>MB</source> <target>מגה-בייט</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>שמר קבצים שנמחקו והוחלפו בתא המיחזור</target> + +<source>Delete and overwrite files permanently</source> +<target>מחק והחלף קבצים לצמיתות</target> + +<source>Move files to a user-defined folder</source> +<target>העבר קבצים לתיקייה המוגדרת ע"י המפעיל</target> + <source>Replace</source> <target>החלף</target> @@ -1738,6 +1744,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>הוסף חתימת זמן לכל שם קובץ</target> +<source>On completion:</source> +<target>עם הסיום:</target> + +<source>On errors:</source> +<target>במקרה שגיאה:</target> + +<source>On success:</source> +<target>במקרה הצלחה:</target> + <source>Main config</source> <target>תצורה ראשית</target> @@ -1759,9 +1774,6 @@ This guarantees a consistent state even in case of a serious error. <source>Name</source> <target>שם</target> -<source>Items</source> -<target>פריטים</target> - <source>Percentage</source> <target>אחוז</target> @@ -1891,6 +1903,9 @@ This guarantees a consistent state even in case of a serious error. <source>Cannot change process I/O priorities.</source> <target>לא יכול לשנות קדימויות של תהליך קלט פלט.</target> +<source>Unable to shut down the system.</source> +<target>לא מסוגל לכבות את המערכת.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>בודק כשלון בתא מחזור עבור תיקייה %x.</target> @@ -1915,9 +1930,6 @@ This guarantees a consistent state even in case of a serious error. <source>Portable</source> <target>נייד</target> -<source>recommended</source> -<target>מומלץ</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>שמור נתונים ל "%APPDATA%\FreeFileSync"</target> @@ -1969,8 +1981,8 @@ This guarantees a consistent state even in case of a serious error. <source>Edit with FreeFileSync</source> <target>ערוך עם FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>הגירסה הניידת אינה יכולה להיות מותקנת לתיקייה שנבחרה.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>הגירסה הניידת של FreeFileSync אינה ניתנת להתקנה בתת תיקייה של %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>בבקשה בחר התקנה מקומית או בחר תיקייה אחרת להתקנה.</target> diff --git a/FreeFileSync/Build/Languages/hindi.lng b/FreeFileSync/Build/Languages/hindi.lng index fc413e9b..f15e5522 100755 --- a/FreeFileSync/Build/Languages/hindi.lng +++ b/FreeFileSync/Build/Languages/hindi.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>%x फ़ोल्डर के लिए रीसायकल बिन की उपलब्धता की जाँच हो रही है...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>रीसायकल बिन निम्न फ़ोलडर्स के लिए उपलब्ध नहीं है। फ़ाइल्स को स्थायी रूप से हटाया जाएगा:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>रीसायकल बिन निम्न फ़ोलडर्स द्वारा समर्थित नहीं है। हटायी गई या अधिलेखित फ़ाइल्स पुनर्स्थापित नहीं होगी:</target> <source>An exception occurred</source> <target>कोई अपवाद हुआ</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>वाक्य-विन्यास:</target> -<source>global config file:</source> -<target>वैश्विक कॉन्फ़िग फ़ाइल:</target> - <source>config files:</source> <target>कॉन्फ़िग फ़ाइल्स:</target> <source>directory</source> <target>निर्देशिका</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>वैकल्पिक GlobalSettings.xml फ़ाइल का पथ।</target> +<source>global config file:</source> +<target>वैश्विक कॉन्फ़िग फ़ाइल:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>कितने भी FreeFileSync .ffs_gui और/या .ffs_batch कॉन्फ़िगरेशन फ़ाइल्स।</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>कितने भी वैकलपिक निर्देशिका जोडे अधिक से अधिक एक कॉन्फ़िग फ़ाइल के लिए।</target> -<source>Open configuration for editing without executing it.</source> -<target>कॉन्फ़िगरेशन को बिना निष्पादित किए संपादन के लिए खोलें।</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>चयनित कॉन्फ़िगरेशन को बिना निष्पादित किए केवल संपादन के लिए खोलें।</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>वैकल्पिक GlobalSettings.xml फ़ाइल का पथ।</target> <source>Cannot find the following folders:</source> <target>निम्न फ़ोलडर्स नहीं मिले:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>दाईं तरफ के गुण अद्यतन करें</target> -<source>Cannot write file %x.</source> -<target>फ़ाइल %x लिखने में असमर्थ।</target> +<source>Cannot read file %x.</source> +<target>फ़ाइल %x पढ़ने में असमर्थ।</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Actual: %y bytes <source>Operation not supported for different base folder types.</source> <target>भिन्न आधार फ़ोल्डर प्रकारों के लिए कार्यवाई समर्थित नहीं।</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>सिंबॉलिक लिंक %x से %y प्रतिलिपित नहीं कर सकते।</target> +<source>Cannot write file %x.</source> +<target>फ़ाइल %x लिखने में असमर्थ।</target> <source>Cannot move file %x to %y.</source> <target>फ़ाइल %x से %y ले जा नाहीं सकते।</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>सिंबॉलिक लिंक %x से %y प्रतिलिपित नहीं कर सकते।</target> + <source>Unable to connect to %x.</source> <target>%x से कनेक्ट करने में असमर्थ।</target> @@ -294,9 +297,6 @@ Actual: %y bytes <source>Cannot read file attributes of %x.</source> <target>%x के फ़ाइल गुण पढ़ने में असमर्थ।</target> -<source>Cannot read file %x.</source> -<target>फ़ाइल %x पढ़ने में असमर्थ।</target> - <source>Cannot create directory %x.</source> <target>%x निर्देशिका बना नहीं सकते।</target> @@ -596,8 +596,8 @@ The command is triggered if: <source>Automated Synchronization</source> <target>स्वचालित सिंक्रनाइज़ेशन</target> -<source>The following path does not support directory monitoring:</source> -<target>निम्न पथ निर्देशिका निगरानी का समर्थन नहीं करता:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>%x प्रोटोकॉल निर्देशिका निगरानी का समर्थन नहीं करता:</target> <source>Directory monitoring active</source> <target>निर्देशिका निगरानी सक्रिय</target> @@ -713,8 +713,8 @@ The command is triggered if: <source>Base folder:</source> <target>आधार फ़ोल्डर:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>संस्करण फ़ोल्डर को सिंक्रनाइज़ किया जाएगा क्योंकी वह एक आधार फ़ोल्डर में निहित है।</target> +<source>The versioning folder is contained in a base folder.</source> +<target>संस्करण फ़ोल्डर आधार फ़ोल्डर में निहित है।</target> <source>Synchronizing folder pair:</source> <target>यह फ़ोल्डर जोडा सिंक्रनाइज़ हो रहा है:</target> @@ -728,6 +728,15 @@ The command is triggered if: <source>job name</source> <target>कार्य नाम</target> +<source>Show summary</source> +<target>सारांश दिखाएं</target> + +<source>Sleep</source> +<target>स्लीप</target> + +<source>Shut down</source> +<target>बंद करें</target> + <source>Synchronization stopped</source> <target>सिंक्रनाइज़ेशन बंद कर दिया गया</target> @@ -749,6 +758,9 @@ The command is triggered if: <source>Synchronization completed successfully</source> <target>सिंक्रनाइज़ेशन सफलतापूर्वक पूरा हुआ</target> +<source>Executing command %x</source> +<target>कार्यान्वित आदेश %x</target> + <source>Cleaning up old log files...</source> <target>पुराने लॉग फ़ाइल्स की सफाई हो रही है...</target> @@ -776,8 +788,8 @@ The command is triggered if: <pluralform>स्वचालित पुनःप्रयास %x सेकंड में...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>आगामी त्रुटियों को अनदेखा करें (&I)</target> +<source>Ignore &all</source> +<target>सभी अनदेखा करें (&a)</target> <source>Retrying operation...</source> <target>कार्यवाई का पुनःप्रयास हो रहा है...</target> @@ -884,12 +896,12 @@ The command is triggered if: <source>&Find...</source> <target>ढूंढें (&F)...</target> -<source>&Reset layout</source> -<target>अभिन्यास रीसेट करें (&R)</target> - <source>&Export file list...</source> <target>फ़ाइल सूचि निर्यात करें (&E)...</target> +<source>&Reset layout</source> +<target>अभिन्यास रीसेट करें (&R)</target> + <source>&Tools</source> <target>उपकरण (&T)</target> @@ -1025,9 +1037,6 @@ The command is triggered if: <source>C&lear</source> <target>हटाएं (&l)</target> -<source>Detect synchronization directions with the help of database files</source> -<target>डेटाबेस फ़ाइल्स की मदद से सिंक्रनाइज़ेशन दिशाओं का पता लगाएं</target> - <source>Detect moved files</source> <target>ले जाई गई फ़ाइल्स का पता लगाएं</target> @@ -1048,38 +1057,23 @@ The command is triggered if: <source>&Recycle bin</source> <target>रीसायकल बिन (&R)</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>रीसायकल बिन में हटाई या अधिलेखित फ़ाइल्स बैक अप करें</target> - <source>&Permanent</source> <target>स्थायी (&P)</target> -<source>Delete or overwrite files permanently</source> -<target>फ़ाइल्स स्थायी रूप से हटाएं या अधिलेखित करें</target> - <source>&Versioning</source> <target>संस्करण (&V)</target> -<source>Move files to a user-defined folder</source> -<target>फ़ाइल्स उपयोगकर्ता-परिभाषित फ़ोल्डर में ले जाएं</target> - <source>Naming convention:</source> <target>नामकरण नीति:</target> -<source>Handle errors:</source> -<target>त्रुटियां प्रहस्तन करें:</target> - -<source>&Pop-up</source> -<target>पॉप-अप (&P)</target> +<source>&Ignore errors</source> +<target>त्रुटियों को अनदेखा करें (&I)</target> <source>Show pop-up on errors or warnings</source> <target>त्रुटियों या चेतावनियों पर पॉप-अप दिखाएं</target> -<source>Hide all error and warning messages</source> -<target>सभी त्रुटि और चेतावनी संदेशों को छुपाएं</target> - -<source>On completion:</source> -<target>समापन उपरांत:</target> +<source>Run a command after synchronization:</source> +<target>सिंक्रनाइज़ेशन के बाद कोई आदेश चलाएँ:</target> <source>OK</source> <target>ठीक</target> @@ -1117,6 +1111,9 @@ The command is triggered if: <source>&Key file</source> <target>कुंजी फ़ाइल (&K)</target> +<source>&SSH agent</source> +<target>&SSH एजेंट</target> + <source>User name:</source> <target>उपयोगकर्ता नाम:</target> @@ -1135,11 +1132,8 @@ The command is triggered if: <source>How to get best performance?</source> <target>सर्वश्रेष्ठ प्रदर्शन कैसे पाएं?</target> -<source>SSH connections for directory reading:</source> -<target>निर्देशिका पठन के लिए SSH कनेक्शन्स:</target> - -<source>Suggested range: [1 - 10]</source> -<target>सुझाई श्रेणी: [१ - १०]</target> +<source>Connections for directory reading:</source> +<target>निर्देशिका पठन के लिए कनेक्शन्स:</target> <source>SFTP channels per connection:</source> <target>SFTP चैनल्स प्रति कनेक्शन:</target> @@ -1147,9 +1141,6 @@ The command is triggered if: <source>Detect server limit</source> <target>सर्वर सीमा का पता लगाएँ</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>२ कनेक्शन्स x १० चैनल्स = २० गुना तीव्रतम निर्देशिका पठन</target> - <source>Select a directory on the server:</source> <target>सर्वर पर कोई निर्देशिका चुनें:</target> @@ -1174,11 +1165,11 @@ The command is triggered if: <source>Time elapsed:</source> <target>बीता समय:</target> -<source>Bytes:</source> -<target>बाइट्स:</target> +<source>Bytes</source> +<target>बाइट्स</target> -<source>Items:</source> -<target>आइटम्स:</target> +<source>Items</source> +<target>आइटम्स</target> <source>Synchronizing...</source> <target>सिंक्रनाइज़ हो रहा है...</target> @@ -1189,6 +1180,9 @@ The command is triggered if: <source>Bytes copied:</source> <target>बाइट प्रतिलिपित:</target> +<source>When finished:</source> +<target>समाप्त होने पर:</target> + <source>Close</source> <target>बंद करें</target> @@ -1201,15 +1195,18 @@ The command is triggered if: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>उपस्थिति निरपेक्ष सिंक्रनाइज़ेशन के लिए बॅच फ़ाइल बनाएं। शुरू करने के लिए, किसी कार्य योजनाकार में यह फ़ाइल या अनुसूची डबल क्लिक करें: %x</target> -<source>&Stop</source> -<target>रोकें (&S)</target> +<source>Run minimized</source> +<target>छोटा (मिनिमाइज़) कर के चलाएँ</target> + +<source>&Show error dialog</source> +<target>त्रुटी संवाद बॉक्स दिखाएँ (&S)</target> + +<source>&Cancel</source> +<target>रद्द करें (&C)</target> <source>Stop synchronization at first error</source> <target>पहली त्रुटि पर सिंक्रनाइज़ेशन रोकें</target> -<source>Run minimized</source> -<target>छोटा (मिनिमाइज़) कर के चलाएँ</target> - <source>Save log:</source> <target>लॉग सहेजें:</target> @@ -1240,14 +1237,14 @@ This guarantees a consistent state even in case of a serious error. यह गंभीर त्रुटि की दशा में भी सुसंगत स्थिती सुनिश्चित करता है। </target> -<source>(recommended)</source> -<target>(अनुशंसित)</target> +<source>recommended</source> +<target>अनुशंसित</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>साझा या अवरोधित फ़ाइल्स वॉल्यूम शॅडो प्रतिलिपि सर्व्हिस के उपयोग से प्रतिलिपित करें।</target> -<source>(requires administrator rights)</source> -<target>(प्रबंधक अधिकार आवश्यक)</target> +<source>requires administrator rights</source> +<target>व्यवस्थापक विशेषाधिकार आवश्यक</target> <source>Transfer file and folder permissions.</source> <target>फ़ाइल और फ़ोल्डर अनुमतियाँ स्थानांतर करें।</target> @@ -1279,14 +1276,17 @@ This guarantees a consistent state even in case of a serious error. <source>Source code written in C++ using:</source> <target>स्रोत कोड C++ में लिखा गया इनके प्रयोग से:</target> -<source>Donation details</source> -<target>दान विवरण</target> - <source>If you like FreeFileSync:</source> <target>यदि आपको FreeFileSync पसंद है:</target> -<source>Donate with PayPal</source> -<target>PayPal (पेपॉल) द्वारा दान करें</target> +<source>Support with a donation</source> +<target>दान के साथ समर्थन करें</target> + +<source>Donation details</source> +<target>दान विवरण</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>स्वचालित अद्यतन व्यवस्थापक द्वारा अक्षम किया गया है।</target> <source>Feedback and suggestions are welcome</source> <target>प्रतिक्रिया और सुझावों का स्वागत है</target> @@ -1324,7 +1324,7 @@ This guarantees a consistent state even in case of a serious error. <source>Activate offline</source> <target>ऑफ़लाइन सक्रिय करें</target> -<source>Save as Batch Job</source> +<source>Save as a Batch Job</source> <target>बॅच जॉब के रूप में सहेजें</target> <source>Delete Items</source> @@ -1363,11 +1363,17 @@ This guarantees a consistent state even in case of a serious error. <source>Overview</source> <target>अवलोकन</target> +<source>Show "%x"</source> +<target>"%x" दिखाएं</target> + <source>&Show details</source> <target>विवरण दिखाएँ (&S)</target> -<source>A new version of FreeFileSync is available:</source> -<target>FreeFileSync का नया संस्करण उपलब्ध है:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x उपलब्ध है!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>स्थापना फ़ाइलें दूषित हैं। FreeFileSync पुनर्स्थापित करें।</target> <source>Local path not available for %x.</source> <target>%x के लिए स्थानीय पथ उपलब्ध नहीं है।</target> @@ -1459,9 +1465,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>समय अवधि चुनें...</target> -<source>Show "%x"</source> -<target>"%x" दिखाएं</target> - <source>Last session</source> <target>पिछला सत्र</target> @@ -1561,18 +1564,6 @@ This guarantees a consistent state even in case of a serious error. <source>Searching for program updates...</source> <target>प्रोग्राम अद्यतनों की खोज हो रही है...</target> -<source>Close progress dialog</source> -<target>प्रगति संवाद बॉक्स बंद करें</target> - -<source>Log off</source> -<target>लॉग ऑफ़</target> - -<source>Standby</source> -<target>स्टैंडबाय</target> - -<source>Shut down</source> -<target>बंद करें</target> - <source>Paused</source> <target>ठहरा</target> @@ -1603,18 +1594,21 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>लॉग</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>स्थापना फ़ाइलें दूषित हैं। FreeFileSync पुनर्स्थापित करें।</target> - <source>Thank you, %x, for your donation and support!</source> <target>धन्यवाद, %x, आपके दान और समर्थन के लिए!</target> +<source>Recommended range:</source> +<target>अनुशंसित श्रेणी:</target> + <source>Password:</source> <target>पासवर्ड:</target> <source>Key password:</source> <target>कुंजी पासवर्ड:</target> +<source>Please enter a file path.</source> +<target>कृपया कोई फ़ाइल पथ प्रविष्ट करें।</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1729,6 +1723,15 @@ This guarantees a consistent state even in case of a serious error. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>हटा दी गईं और अधिलेखित फ़ाइल्स को रीसायकल बिन में बनाए रखें</target> + +<source>Delete and overwrite files permanently</source> +<target>फ़ाइल्स को स्थाई रूप से हटाया और आधिलेखित करें</target> + +<source>Move files to a user-defined folder</source> +<target>फ़ाइल्स उपयोगकर्ता-परिभाषित फ़ोल्डर में ले जाएं</target> + <source>Replace</source> <target>बदलें</target> @@ -1741,6 +1744,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>प्रत्येक फ़ाइल नाम को समय मोहर जोडें</target> +<source>On completion:</source> +<target>समापन उपरांत:</target> + +<source>On errors:</source> +<target>त्रुटी पर:</target> + +<source>On success:</source> +<target>सफलता पर:</target> + <source>Main config</source> <target>मुख्य कॉन्फ़िग</target> @@ -1762,9 +1774,6 @@ This guarantees a consistent state even in case of a serious error. <source>Name</source> <target>नाम</target> -<source>Items</source> -<target>आइटम्स</target> - <source>Percentage</source> <target>प्रतिशत</target> @@ -1894,6 +1903,9 @@ This guarantees a consistent state even in case of a serious error. <source>Cannot change process I/O priorities.</source> <target>प्रक्रिया I/O प्राथमिकताओं को बदल नहीं सकते।</target> +<source>Unable to shut down the system.</source> +<target>सिस्टम को बंद करने में असमर्थ।</target> + <source>Checking recycle bin failed for folder %x.</source> <target>फ़ोल्डर %x के लिए रीसायकल बिन की जाँच विफल।</target> @@ -1918,9 +1930,6 @@ This guarantees a consistent state even in case of a serious error. <source>Portable</source> <target>पोर्टेबल</target> -<source>recommended</source> -<target>अनुशंसित</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>सेटिंग्ज़ "%APPDATA%\FreeFileSync" यहाँ सहेजें</target> @@ -1972,8 +1981,8 @@ This guarantees a consistent state even in case of a serious error. <source>Edit with FreeFileSync</source> <target>FreeFileSync के साथ संपादित करें</target> -<source>The portable version cannot install into the selected folder.</source> -<target>पोर्टेबल संस्करण चयनित फ़ोल्डर में स्थापित नहीं किया जा सकता।</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>FreeFileSync पोर्टेबल संस्करण %x के उप-फ़ोल्डर में स्थापित नहीं किया जा सकता।</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>स्थापना के लिए कृपया स्थानीय स्थापना प्रकार चयन करें या कोई और फ़ोल्डर चुनें।</target> diff --git a/FreeFileSync/Build/Languages/hungarian.lng b/FreeFileSync/Build/Languages/hungarian.lng index bb838559..2f28d3e3 100755 --- a/FreeFileSync/Build/Languages/hungarian.lng +++ b/FreeFileSync/Build/Languages/hungarian.lng @@ -17,13 +17,13 @@ <target>Az utolsó szinkronizálás óta nem történt változás.</target> <source>The database entry is not in sync considering current settings.</source> -<target>Az adatbázis-bejegyzés nincs összhangban figyelembe véve a jelenlegi beállításokat.</target> +<target>Az adatbázis-bejegyzés nincs összhangban, figyelembe véve a jelenlegi beállításokat.</target> <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source> -<target>Alapértelmezett szinkronizálási irányok beállítása: a régebbi fájlokat írja felül az újabbakkal.</target> +<target>Alapértelmezett szinkronizálási irányok beállítása: a régebbi állományokat írja felül az újabbakkal.</target> <source>Creating file %x</source> -<target>%x fájl létrehozása</target> +<target>%x állomány létrehozása</target> <source>Creating folder %x</source> <target>%x könyvtár létrehozása</target> @@ -32,7 +32,7 @@ <target>%x szimbolikus hivatkozás létrehozása</target> <source>Moving file %x to the recycle bin</source> -<target>%x fájlt a Lomtárba helyezi</target> +<target>%x állományt a Lomtárba helyezi</target> <source>Moving folder %x to the recycle bin</source> <target>%x könyvtárat a Lomtárba helyezi</target> @@ -41,7 +41,7 @@ <target>%x szimbolikus hivatkozást a Lomtárba helyezi</target> <source>Deleting file %x</source> -<target>%x fájl törlése</target> +<target>%x állomány törlése</target> <source>Deleting folder %x</source> <target>%x könyvtár törlése</target> @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>A Lomtár elérhetőségének ellenőrzése %x könyvtár vonatkozásában...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>A Lomtár nem elérhető a következő könyvtárak esetében. A fájlok ezért véglegesen törlődnek:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>A lomtár nem támogatott a következő könyvtáraknál. A törölt vagy felülírt állományokat nem lehet majd helyreállítani:</target> <source>An exception occurred</source> <target>Kivétel lépett fel</target> @@ -65,22 +65,22 @@ <target>Szintaktikai hiba</target> <source>Cannot find file %x.</source> -<target>Nem található a %x fájl.</target> +<target>Nem található a %x állomány.</target> <source>Error</source> <target>Hiba</target> <source>File %x does not contain a valid configuration.</source> -<target>%x fájl nem tartalmaz érvényes beállításokat.</target> +<target>%x állomány nem tartalmaz érvényes beállításokat.</target> <source>Unequal number of left and right directories specified.</source> <target>Eltérő számú bal- és jobboldali könyvtárat határozott meg.</target> <source>The config file must not contain settings at directory pair level when directories are set via command line.</source> -<target>A konfigurációs fájl nem tartalmazhat beállításokat könyvár-pár szinten, ha a könyvtárakat parancssorban állítjuk be.</target> +<target>A konfigurációs állomány nem tartalmazhat beállításokat könyvár-pár szinten, ha a könyvtárakat parancssorban állítjuk be.</target> <source>Directories cannot be set for more than one configuration file.</source> -<target>A könyvtárakat nem lehet egynél több konfigurációs fájlra beállítani.</target> +<target>A könyvtárakat nem lehet egynél több konfigurációs állományhoz beállítani.</target> <source>Command line</source> <target>Parancssor</target> @@ -88,26 +88,26 @@ <source>Syntax:</source> <target>Szintaxis:</target> -<source>global config file:</source> -<target>globális konfigurációs fájl:</target> - <source>config files:</source> -<target>konfigurációs fájlok:</target> +<target>konfigurációs állományok:</target> <source>directory</source> <target>könyvtár</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Útvonal egy alternatív GlobalSettings.xml fájlhoz.</target> +<source>global config file:</source> +<target>globális konfigurációs állomány:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> -<target>Tetszőleges számú .ffs_gui és/vagy .ffs_batch konfigurációs fájl készíthető a FreeFileSync-hez.</target> +<target>Tetszőleges számú .ffs_gui és/vagy .ffs_batch konfigurációs állomány készíthető a FreeFileSync-hez.</target> <source>Any number of alternative directory pairs for at most one config file.</source> -<target>Tetszőleges számú alternatív könyvtár-pár legfeljebb egy konfigurációs fájlban.</target> +<target>Tetszőleges számú alternatív könyvtár-pár legfeljebb egy konfigurációs állományban.</target> + +<source>Open the selected configuration for editing only without executing it.</source> +<target>A kiválasztott konfigurációt csak szerkesztésre nyissa meg végrehajtás nélkül.</target> -<source>Open configuration for editing without executing it.</source> -<target>Nyissa meg a konfigurációt szerkesztésre annak végrehajtása nélkül.</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Útvonal egy alternatív GlobalSettings.xml állományhoz.</target> <source>Cannot find the following folders:</source> <target>A következő könyvtárak nem találhatóak:</target> @@ -116,19 +116,19 @@ <target>Ha ezt a hibát figyelmen kívül hagyja, a könytárakat üresnek tekinti a program. A hiányzó könyvtárakat automatikusan létrehozza, amikor szükséges.</target> <source>File %x has an invalid date.</source> -<target>%x fájl dátuma érvénytelen.</target> +<target>%x állomány dátuma érvénytelen.</target> <source>Date:</source> <target>Dátum:</target> <source>Files have the same date but a different size.</source> -<target>A fájlok azonos dátumúak, de eltérő méretűek.</target> +<target>Az állományok azonos dátumúak, de eltérő méretűek.</target> <source>Size:</source> <target>Méret:</target> <source>Content comparison was skipped for excluded files.</source> -<target>A kizárt fájlok tartalmának összehasonlítása kihagyva.</target> +<target>A kizárt állományok tartalmának összehasonlítása kihagyva.</target> <source>Items differ in attributes only</source> <target>Az elemek csak attribútumaikban különböznek</target> @@ -137,13 +137,13 @@ <target>%x szimbolikus hivatkozás feloldása</target> <source>Comparing content of files %x</source> -<target>%x fájlok tartalmának összehasonlítása</target> +<target>%x állomány tartalmának összehasonlítása</target> <source>Generating file list...</source> -<target>Fájllista generálása...</target> +<target>Állomány-lista generálása...</target> <source>Fail-safe file copy</source> -<target>Hibamentes fájlmásolás</target> +<target>Hibamentes állomány-másolás</target> <source>Enabled</source> <target>Engedélyezett</target> @@ -152,13 +152,13 @@ <target>Letiltott</target> <source>Copy locked files</source> -<target>Zárolt fájlok másolása</target> +<target>Zárolt állományok másolása</target> <source>Copy file access permissions</source> -<target>A fájl hozzáférési jogosultságok másolása</target> +<target>Az állomány-hozzáférési jogosultságok másolása</target> <source>File time tolerance</source> -<target>Fájlok időkülönbségének tűréshatára</target> +<target>Állományok időkülönbségének tűréshatára</target> <source>Folder access timeout</source> <target>Könyvtár hozzáférés időtúllépés</target> @@ -170,10 +170,10 @@ <target>Könyvtárak zárolása szinkronizálás idejére</target> <source>Verify copied files</source> -<target>Másolt fájlok ellenőrzése</target> +<target>Másolt állományok ellenőrzése</target> <source>Using non-default global settings:</source> -<target>Nem az alap általános beállítások használata:</target> +<target>Nem az alapértelmezett általános beállítások használata:</target> <source>Starting comparison</source> <target>Összehasonlítás megkezdése</target> @@ -233,16 +233,16 @@ <target>Jobb oldali elem törlése</target> <source>Move file on left</source> -<target>Bal oldali fájl mozgatása</target> +<target>Bal oldali állomány mozgatása</target> <source>Move file on right</source> -<target>Jobb oldali fájl mozgatása</target> +<target>Jobb oldali állomány mozgatása</target> <source>Update left item</source> -<target>Bal oldal frissítése</target> +<target>Bal oldali elemek frissítése</target> <source>Update right item</source> -<target>Jobb oldal frissítése</target> +<target>Jobb oldali elemek frissítése</target> <source>Do nothing</source> <target>Nincs mit végrehajtani</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Attribútumok frissítése a jobb oldalon</target> -<source>Cannot write file %x.</source> -<target>%x fájl írása sikertelen.</target> +<source>Cannot read file %x.</source> +<target>%x állomány nem olvasható.</target> <source> Unexpected size of data stream. @@ -273,11 +273,14 @@ Tényleges: %y bájt <source>Operation not supported for different base folder types.</source> <target>A művelet nem támogatott különböző alapkönyvtártípusok esetén.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>%x szimbolikus hivatkozás nem másolható %y-ba.</target> +<source>Cannot write file %x.</source> +<target>%x állomány írása sikertelen.</target> <source>Cannot move file %x to %y.</source> -<target>%x fájl nem mozgatható %y-ba.</target> +<target>%x állomány nem mozgatható %y-ba.</target> + +<source>Cannot copy symbolic link %x to %y.</source> +<target>%x szimbolikus hivatkozás nem másolható %y-ba.</target> <source>Unable to connect to %x.</source> <target>Nem képes %x-hez kapcsolódni.</target> @@ -291,17 +294,14 @@ Tényleges: %y bájt <source>Cannot read directory %x.</source> <target>%x könyvtár nem olvasható.</target> -<source>Cannot read file %x.</source> -<target>%x fájl nem olvasható.</target> - <source>Cannot read file attributes of %x.</source> -<target>%x fájl attribútumai nem olvashatók.</target> +<target>%x állomány attribútumai nem olvashatók.</target> <source>Cannot create directory %x.</source> <target>%x könyvtár nem hozható létre.</target> <source>Cannot delete file %x.</source> -<target>%x fájl nem törölhető.</target> +<target>%x állomány nem törölhető.</target> <source>Cannot delete directory %x.</source> <target>%x könyvtár nem törölhető.</target> @@ -319,7 +319,7 @@ Tényleges: %y bájt <target>%x nem helyezhető Lomtárba.</target> <source>Cannot open file %x.</source> -<target>%x fájl nem nyitható meg.</target> +<target>%x állomány nem nyitható meg.</target> <source>Cannot find device %x.</source> <target>%x eszköz nem található.</target> @@ -394,28 +394,28 @@ Tényleges: %y bájt <target>%x GB</target> <source>Cannot load file %x.</source> -<target>%x fájl betöltése sikertelen.</target> +<target>%x állomány betöltése nem sikerült.</target> <source>Database file %x is incompatible.</source> -<target>%x adatbázisfájl inkompatibilis.</target> +<target>%x adatbázis-állomány nem kompatibilis.</target> <source>Initial synchronization:</source> <target>Kezdeti szinkronizálás:</target> <source>Database file %x does not yet exist.</source> -<target>%x adatbázisfájl még nem létezik.</target> +<target>%x adatbázis-állomány még nem létezik.</target> <source>Database file is corrupted:</source> -<target>A következő adatbázis fájl sérült:</target> +<target>A következő adatbázis állomány sérült:</target> <source>The database files do not yet contain information about the last synchronization.</source> -<target>Az adatbázis fájlok nem tartalmaznak információt a legutóbbi szinkronizálásról.</target> +<target>Az adatbázis állományok nem tartalmaznak információt a legutóbbi szinkronizálásról.</target> <source>Loading file %x...</source> -<target>%x fájl betöltése...</target> +<target>%x állomány betöltése...</target> <source>Saving file %x...</source> -<target>%x fájl mentése...</target> +<target>%x állomány mentése...</target> <source>Searching for folder %x...</source> <target>%x könyvtár keresése...</target> @@ -437,8 +437,8 @@ Tényleges: %y bájt <pluralform>%x sec</pluralform> </source> <target> -<pluralform>1 másodperc</pluralform> -<pluralform>%x másodperc</pluralform> +<pluralform>1 mp</pluralform> +<pluralform>%x mp</pluralform> </target> <source>Detecting abandoned lock...</source> @@ -454,7 +454,7 @@ Tényleges: %y bájt <target>Összes időszükséglet:</target> <source>Error parsing file %x, row %y, column %z.</source> -<target>Hiba történt a feldolgozás közben: %x fájl, %y sor, %z oszlop.</target> +<target>Hiba történt a feldolgozás közben: %x állomány, %y sor, %z oszlop.</target> <source>Cannot set directory lock for %x.</source> <target>%x könyvtár zárolása sikertelen.</target> @@ -472,10 +472,10 @@ Tényleges: %y bájt <target>Vizsgálat:</target> <source>/sec</source> -<target>/másodperc</target> +<target>/mp</target> <source>%x items/sec</source> -<target>%x elem/másodperc</target> +<target>%x elem/mp</target> <source>Show in Explorer</source> <target>Mutassa az Intézőben</target> @@ -496,10 +496,10 @@ Tényleges: %y bájt <target>%x számára nem lehet a kötet-nevet meghatározni.</target> <source>Volume name %x is not part of file path %y.</source> -<target>%x kötet-név nem része a(z) %y fájl elérési útvonalának.</target> +<target>%x kötet-név nem része a(z) %y állomány elérési útvonalának.</target> <source>Stop requested: Waiting for current operation to finish...</source> -<target>Megállás szükséges: várakozás a jelenlegi művelet befejezésére...</target> +<target>Leállást igényeltek: várakozás a jelenlegi művelet befejezésére...</target> <source>Unable to create time stamp for versioning:</source> <target>Nem képes időbélyegzés létrehozására a verzióképzéshez:</target> @@ -523,10 +523,10 @@ Tényleges: %y bájt <target>&Kilép</target> <source>&File</source> -<target>&Fájl</target> +<target>&Állomány</target> <source>&View help</source> -<target>&Nézd meg a súgót</target> +<target>&Lásd a súgót</target> <source>&About</source> <target>&A programról</target> @@ -547,7 +547,7 @@ Tényleges: %y bájt <target>3. Nyomd meg a Start gombot.</target> <source>To get started just import a .ffs_batch file.</source> -<target>Az induláshoz importálj egy .ffs_batch fájlt.</target> +<target>Az induláshoz importáljon egy .ffs_batch állományt.</target> <source>Folders to watch:</source> <target>Figyelendő könyvtárak:</target> @@ -562,7 +562,7 @@ Tényleges: %y bájt <target>Tallóz</target> <source>Idle time (in seconds):</source> -<target>Üresjárat időtartama (másodperc):</target> +<target>Üresjárat időtartama (másodpercben):</target> <source>Idle time between last detected change and execution of command</source> <target>Üresjárat időtartama az utolsó változás észlelése és a parancs végrehajtása között</target> @@ -577,7 +577,7 @@ The command is triggered if: </source> <target> A parancs végrehajtódik, ha: -- fájlok vagy alkönyvtárak megváltoznak +- állományok vagy alkönyvtárak megváltoznak - új könyvtárak jelennek meg (pl. USB-kulcs csatlakoztatása) </target> @@ -591,13 +591,13 @@ A parancs végrehajtódik, ha: <target>Build: %x</target> <source>All files</source> -<target>Összes fájl</target> +<target>Összes állomány</target> <source>Automated Synchronization</source> <target>Automatizált szinkronizálás</target> -<source>The following path does not support directory monitoring:</source> -<target>A következő útvonal nem támogatja a könyvtár-monitorozást:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>%x protokoll nem támogatja a könyvtár-figyelést:</target> <source>Directory monitoring active</source> <target>A könyvtár figyelés aktív</target> @@ -618,13 +618,13 @@ A parancs végrehajtódik, ha: <target>&Ismét</target> <source>File time and size</source> -<target>Fájl dátuma és mérete</target> +<target>Állomány dátuma és mérete</target> <source>File content</source> -<target>Fájl tartalma</target> +<target>Állomány tartalma</target> <source>File size</source> -<target>Fájl mérete</target> +<target>Állomány mérete</target> <source>Two way</source> <target>Kétirányú</target> @@ -642,7 +642,7 @@ A parancs végrehajtódik, ha: <target>Sokszoroz...</target> <source>Moving file %x to %y</source> -<target>%x fájl mozgatása ide: %y</target> +<target>%x állomány mozgatása ide: %y</target> <source>Moving folder %x to %y</source> <target>%x könyvtár mozgatása ide: %y</target> @@ -654,19 +654,19 @@ A parancs végrehajtódik, ha: <target>Régi verziók eltávolítása...</target> <source>Updating file %x</source> -<target>%x fájl frissítése</target> +<target>%x állomány frissítése</target> <source>Updating symbolic link %x</source> <target>%x szimbolikus hivatkozás frissítése</target> <source>Verifying file %x</source> -<target>%x fájl ellenőrzése</target> +<target>%x állomány ellenőrzése</target> <source>Updating attributes of %x</source> <target>%x attribútumainak frissítése</target> <source>Cannot write file attributes of %x.</source> -<target>%x fájl attribútumainak írása nem sikerült.</target> +<target>%x állomány attribútumainak írása nem sikerült.</target> <source>%x and %y have different content.</source> <target>%x és %y tartalma különböző.</target> @@ -702,22 +702,22 @@ A parancs végrehajtódik, ha: <target>Hozzáférhető:</target> <source>Some files will be synchronized as part of multiple base folders.</source> -<target>Egyes fájlokat több alapkönyvár részeként is szinkronizálni fog.</target> +<target>Egyes állományokat több alapkönyvár részeként is szinkronizálni fog.</target> <source>To avoid conflicts, set up exclude filters so that each updated file is considered by only one base folder.</source> -<target>Az ütközések elkerülése érdekében állítsa be úgy a kizáró szűrőket, hogy minden egyes felülírt fájl csak egy alapkönyvárban szerepeljen.</target> +<target>Az ütközések elkerülése érdekében állítsa be úgy a kizáró szűrőket, hogy minden egyes felülírt állomány csak egy alapkönyvárban szerepeljen.</target> <source>Versioning folder:</source> -<target>Verziókezelő könyvtár:</target> +<target>Verzióképző könyvtár:</target> <source>Base folder:</source> <target>Alapkönyvtár:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>A verziókezelő könyvtárat szinkronizálni fogja, mert az egy alapkönyvtárba van ágyazva.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>A verzióképző könyvtárat az alapkönyvtár tartalmazza.</target> <source>Synchronizing folder pair:</source> -<target>A szinkronizáló könyvtár-pár:</target> +<target>A szinkronizálódó könyvtár-pár:</target> <source>Generating database...</source> <target>Adatbázis generálása...</target> @@ -728,6 +728,15 @@ A parancs végrehajtódik, ha: <source>job name</source> <target>feladat neve</target> +<source>Show summary</source> +<target>Mutasd az összegzést</target> + +<source>Sleep</source> +<target>Alvó állapot</target> + +<source>Shut down</source> +<target>Leállítja a gépet</target> + <source>Synchronization stopped</source> <target>Szinkronizálás leállítva</target> @@ -749,8 +758,11 @@ A parancs végrehajtódik, ha: <source>Synchronization completed successfully</source> <target>A szinkronizálás sikeresen befejeződött</target> +<source>Executing command %x</source> +<target>%x parancs végrehajtása</target> + <source>Cleaning up old log files...</source> -<target>Régi log fájlok törlése...</target> +<target>Régi log állományok törlése...</target> <source>You can switch to FreeFileSync's main window to resolve this issue.</source> <target>E jelenség megoldásához kapcsoljon át a FreeFileSync fő ablakába.</target> @@ -772,12 +784,12 @@ A parancs végrehajtódik, ha: <pluralform>Automatic retry in %x seconds...</pluralform> </source> <target> -<pluralform>Automatikus ismételt próbálkozás 1 másodperc múlva...</pluralform> -<pluralform>Automatikus ismételt próbálkozás %x másodperc múlva...</pluralform> +<pluralform>Ismételt próbálkozás 1 másodperc múlva...</pluralform> +<pluralform>Ismételt próbálkozás %x másodperc múlva...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>F&igyelmen kívül hagyja az utána következő hibákat</target> +<source>Ignore &all</source> +<target>&Mindent kihagy</target> <source>Retrying operation...</source> <target>Újra próbálja a műveletet...</target> @@ -789,7 +801,7 @@ A parancs végrehajtódik, ha: <target>Könyvtár</target> <source>Symlink</source> -<target>Symlink</target> +<target>Szimbolikus link</target> <source>Full path</source> <target>Teljes elérési útvonal</target> @@ -884,12 +896,12 @@ A parancs végrehajtódik, ha: <source>&Find...</source> <target>Ke&res...</target> +<source>&Export file list...</source> +<target>&Exportálja az állománylistát...</target> + <source>&Reset layout</source> <target>&Alapállapotba állítja a megjelenést</target> -<source>&Export file list...</source> -<target>&Exportálja a fájllistát...</target> - <source>&Tools</source> <target>Es&zközök</target> @@ -951,13 +963,13 @@ A parancs végrehajtódik, ha: <target>Statisztika:</target> <source>Number of files and folders that will be deleted</source> -<target>A törlendő fájlok és könyvtárak száma</target> +<target>A törlendő állományok és könyvtárak száma</target> <source>Number of files that will be updated</source> -<target>Frissítendő fájlok száma</target> +<target>Frissítendő állományok száma</target> <source>Number of files and folders that will be created</source> -<target>A létrehozandó fájlok és könyvtárak száma</target> +<target>A létrehozandó állományok és könyvtárak száma</target> <source>Total bytes to copy</source> <target>Összesen másolandó bájtok</target> @@ -990,7 +1002,7 @@ A parancs végrehajtódik, ha: <target>Hagyja figyelmen kívül az &időeltolódást [óó:pp]</target> <source>List of file time offsets to ignore</source> -<target>A figyelmen kívül hagyandó fájl időpont-eltolások listája</target> +<target>A figyelmen kívül hagyandó állomány-időpont eltolások listája</target> <source>Example:</source> <target>Példa:</target> @@ -1011,7 +1023,7 @@ A parancs végrehajtódik, ha: <target>Idősáv (időtartam):</target> <source>File size:</source> -<target>Fájl méret:</target> +<target>Állomány mérete:</target> <source>Minimum:</source> <target>Minimum:</target> @@ -1020,16 +1032,13 @@ A parancs végrehajtódik, ha: <target>Maximum:</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> -<target>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.</target> +<target>Meghatározott állományok 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.</target> <source>C&lear</source> <target>&Töröl</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Érzékelje a szinkronizálási irányokat az adatbázis-fájlok segítségével</target> - <source>Detect moved files</source> -<target>Érzékelje a mozgatott fájlokat</target> +<target>Érzékelje a mozgatott állományokat</target> <source> - Not supported by all file systems @@ -1037,49 +1046,34 @@ A parancs végrehajtódik, ha: - Detection not available for first sync </source> <target> -- Nem minden fájlrendszer támogatja -- Adatbázis fájlokat igényel és készít +- Nem minden állományrendszer támogatja +- Adatbázis állományokat igényel és készít - Az érzékelés az első szinkronizálásnál nem biztosított </target> <source>Delete files:</source> -<target>Törölje a következő fájlokat:</target> +<target>Törölje a következő állományokat:</target> <source>&Recycle bin</source> <target>Lomtá&r</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Mentse a törölt és felülírt fájlokat a Lomtárba</target> - <source>&Permanent</source> <target>&Állandó</target> -<source>Delete or overwrite files permanently</source> -<target>Törölje vagy írja felül véglegesen a fájlokat</target> - <source>&Versioning</source> <target>&Verziókezelés</target> -<source>Move files to a user-defined folder</source> -<target>Mozgassa a fájlokat egy a felhasználó által meghatározott könyvtárba</target> - <source>Naming convention:</source> <target>Elnevezési megállapodás:</target> -<source>Handle errors:</source> -<target>Kezelje a hibákat:</target> - -<source>&Pop-up</source> -<target>&Párbeszédablak</target> +<source>&Ignore errors</source> +<target>F&igyelmen kívül hagyja a hibákat</target> <source>Show pop-up on errors or warnings</source> <target>Hiba vagy figyelmeztetés esetén mutasson párbeszédablakot</target> -<source>Hide all error and warning messages</source> -<target>Rejtse el az összes hibaüzenetet és figyelmeztetést</target> - -<source>On completion:</source> -<target>Végrehajtás alatt:</target> +<source>Run a command after synchronization:</source> +<target>Futtasson egy parancsot a szinkronizálás után:</target> <source>OK</source> <target>OK</target> @@ -1115,13 +1109,16 @@ A parancs végrehajtódik, ha: <target>&Jelszó</target> <source>&Key file</source> -<target>&Kulcs fájl</target> +<target>&Kulcs állomány</target> + +<source>&SSH agent</source> +<target>&SSH ügynök</target> <source>User name:</source> <target>Felhasználó név:</target> <source>Private key file:</source> -<target>Magánkulcs tároló fájl:</target> +<target>Magánkulcs állomány:</target> <source>&Show password</source> <target>Muta&ssa a jelszót</target> @@ -1135,11 +1132,8 @@ A parancs végrehajtódik, ha: <source>How to get best performance?</source> <target>Hogyan lehet elérni a legjobb teljesítményt?</target> -<source>SSH connections for directory reading:</source> -<target>SSH kapcsolat könyvtárak olvasásához:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Javasolt tartomány: [1 -10]</target> +<source>Connections for directory reading:</source> +<target>Kapcsolatok a könyvtár olvasásához:</target> <source>SFTP channels per connection:</source> <target>SFTP csatornák száma kapcsolatonként:</target> @@ -1147,9 +1141,6 @@ A parancs végrehajtódik, ha: <source>Detect server limit</source> <target>Szerver korlátainak észlelése</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 kapcsolat x 10 csatornával = hússzor gyorsabb könyvtár olvasás</target> - <source>Select a directory on the server:</source> <target>Válasszon egy könyvtárat szerveren:</target> @@ -1189,6 +1180,9 @@ A parancs végrehajtódik, ha: <source>Bytes copied:</source> <target>Másolt bitek száma:</target> +<source>When finished:</source> +<target>Ha befejezte:</target> + <source>Close</source> <target>Bezár</target> @@ -1199,25 +1193,28 @@ A parancs végrehajtódik, ha: <target>Leállít</target> <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> -<target>Készítsen egy parancsfájlt a felügyelet nélküli szinkronizáláshoz. Az indításhoz kattintson kétszer erre a fájlra vagy ütemezze a feladat-tervezőben: %x</target> +<target>Készítsen egy parancsállományt a felügyelet nélküli szinkronizáláshoz. Az indításhoz kattintson kétszer erre az állományra vagy ütemezze a feladat-tervezőben: %x</target> -<source>&Stop</source> -<target>&Stop</target> +<source>Run minimized</source> +<target>Minimalizálva fusson</target> + +<source>&Show error dialog</source> +<target>&Mutassa a hiba párbeszédablakot</target> + +<source>&Cancel</source> +<target>&Elvet</target> <source>Stop synchronization at first error</source> <target>Állítsa le a szinkronizálást az első hibánál</target> -<source>Run minimized</source> -<target>Minimalizálva fusson</target> - <source>Save log:</source> -<target>Mentse a következő napló-fájlt:</target> +<target>Mentse a következő naplóállományt:</target> <source>Limit:</source> <target>Határérték:</target> <source>Limit maximum number of log files</source> -<target>Naplófájlok maximális számának korlátja</target> +<target>Korlátozza a naplóállományok maximális számát</target> <source>How can I schedule a batch job?</source> <target>Hogyan tudok kötegelt feldolgozást ütemezni?</target> @@ -1226,7 +1223,7 @@ A parancs végrehajtódik, ha: <target>&Tartsa meg a relatív útvonalat</target> <source>&Overwrite existing files</source> -<target>&Felülírja a létező fájlokat</target> +<target>&Felülírja a létező állományokat</target> <source>The following settings are used for all synchronization jobs.</source> <target>A következő beállítások minden szinkronizálási feladatnál használja.</target> @@ -1236,21 +1233,21 @@ Copy to a temporary file (*.ffs_tmp) before overwriting target. This guarantees a consistent state even in case of a serious error. </source> <target> -Másolja először egy ideiglenes fájlba (*.ffs_tmp) mielőtt felülírja a célállományt. +Másolja először egy ideiglenes (*.ffs_tmp) állományba, mielőtt felülírja a célállományt. Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. </target> -<source>(recommended)</source> -<target>(ajánlott)</target> +<source>recommended</source> +<target>ajánlott</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> -<target>Megosztott vagy zárolt fájlok másolása a Kötet-árnyékmásolat szolgáltatás használatával.</target> +<target>Megosztott vagy zárolt állományok másolása a Kötet-árnyékmásolat szolgáltatás használatával.</target> -<source>(requires administrator rights)</source> -<target>(rendszergazdai jogosultság szükséges)</target> +<source>requires administrator rights</source> +<target>rendszergazdai jogosultság szükséges</target> <source>Transfer file and folder permissions.</source> -<target>Vigye át a fájl és könyvtár jogosultságokat.</target> +<target>Vigye át az állomány- és könyvtár-jogosultságokat.</target> <source>Automatic retry on error:</source> <target>Automatikus visszatérés a következő hibánál:</target> @@ -1259,7 +1256,7 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <target>Visszatérések száma:</target> <source>Delay (in seconds):</source> -<target>Késedelem (másodpercben):</target> +<target>Késés (másodpercben):</target> <source>Customize context menu:</source> <target>Környezeti menü testreszabása:</target> @@ -1279,14 +1276,17 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Source code written in C++ using:</source> <target>A programot C++-ban fejlesztették a következők felhasználásával:</target> -<source>Donation details</source> -<target>Támogatás részletei</target> - <source>If you like FreeFileSync:</source> <target>Ha szereted a FreeFileSync-et:</target> -<source>Donate with PayPal</source> -<target>Támogasd a PayPal segítségével</target> +<source>Support with a donation</source> +<target>Támogassa adománnyal</target> + +<source>Donation details</source> +<target>Támogatás részletei</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>Az automatikus frissítést a rendszergazda kapcsolta ki.</target> <source>Feedback and suggestions are welcome</source> <target>Várjuk a visszajelzéseket és az ötleteket</target> @@ -1310,7 +1310,7 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <target>1. Aktiválja most interneten keresztül:</target> <source>Activate online</source> -<target>Online aktiválás</target> +<target>Aktiválja online</target> <source>2. Retrieve an offline activation key from the following URL:</source> <target>2. Igényeljen egy offline aktiváló kulcsot a következő URL-ről:</target> @@ -1324,8 +1324,8 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Activate offline</source> <target>Aktiváljon online módon</target> -<source>Save as Batch Job</source> -<target>Mentse kötegelt feladatként</target> +<source>Save as a Batch Job</source> +<target>Mentse mint egy kötegelt (batch) feladatot</target> <source>Delete Items</source> <target>Törölje az elemeket</target> @@ -1363,11 +1363,17 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Overview</source> <target>Áttekintés</target> +<source>Show "%x"</source> +<target>"%x" mutatása</target> + <source>&Show details</source> <target>Muta&ssa a részleteket</target> -<source>A new version of FreeFileSync is available:</source> -<target>Elérhető a FreeFileSync új verziója:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x elérhető!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>A telepítő állományok sérültek. Installálja újra a FreeFileSync-et.</target> <source>Local path not available for %x.</source> <target>%x-hez a helyi útvonal nem érhető el.</target> @@ -1401,8 +1407,8 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <pluralform>%x files</pluralform> </source> <target> -<pluralform>1 fájlt</pluralform> -<pluralform>%x fájlt</pluralform> +<pluralform>1 állományt</pluralform> +<pluralform>%x állományt</pluralform> </target> <source> @@ -1459,9 +1465,6 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Select time span...</source> <target>Időintervallum kiválasztása...</target> -<source>Show "%x"</source> -<target>"%x" mutatása</target> - <source>Last session</source> <target>Utolsó munkamenet</target> @@ -1472,7 +1475,7 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <target>Beállítások elmentve</target> <source>FreeFileSync batch</source> -<target>FreeFileSync kötegelt fájl</target> +<target>FreeFileSync kötegelt állomány</target> <source>Do you want to save changes to %x?</source> <target>Akarod menteni a(z) %x változtatásait?</target> @@ -1490,49 +1493,49 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <target>Törölje a szűrőt</target> <source>Show files that exist on left side only</source> -<target>Mutassa a csak a bal oldalon létező fájlokat</target> +<target>Mutassa a csak a bal oldalon létező állományokat</target> <source>Show files that exist on right side only</source> -<target>Mutassa a csak a jobb oldalon létező fájlokat</target> +<target>Mutassa a csak a jobb oldalon létező állományokat</target> <source>Show files that are newer on left</source> -<target>Mutassa a fájlokat, amelyek a bal oldalon frissebbek</target> +<target>Mutassa az állományokat, amelyek a bal oldalon frissebbek</target> <source>Show files that are newer on right</source> -<target>Mutassa a fájlokat, amelyek a jobb oldalon frissebbek</target> +<target>Mutassa az állományokat, amelyek a jobb oldalon frissebbek</target> <source>Show files that are equal</source> -<target>Mutassa az egyező fájlokat</target> +<target>Mutassa az egyező állományokat</target> <source>Show files that are different</source> -<target>Mutassa az eltérő fájlokat</target> +<target>Mutassa az eltérő állományokat</target> <source>Show conflicts</source> <target>Mutassa az ütközéseket</target> <source>Show files that will be created on the left side</source> -<target>Mutassa a bal oldalon létrehozandó fájlokat</target> +<target>Mutassa a bal oldalon létrehozandó állományokat</target> <source>Show files that will be created on the right side</source> -<target>Mutassa a jobb oldalon létrehozandó fájlokat</target> +<target>Mutassa a jobb oldalon létrehozandó állományokat</target> <source>Show files that will be deleted on the left side</source> -<target>Mutassa a bal oldalon törlendő fájlokat</target> +<target>Mutassa a bal oldalon törlendő állományokat</target> <source>Show files that will be deleted on the right side</source> -<target>Mutassa a jobb oldalon törlendő fájlokat</target> +<target>Mutassa a jobb oldalon törlendő állományokat</target> <source>Show files that will be updated on the left side</source> -<target>Mutassa a bal oldalon a frissítendő fájlokat</target> +<target>Mutassa a bal oldalon a frissítendő állományokat</target> <source>Show files that will be updated on the right side</source> -<target>Mutassa a jobb oldalon a frissítendő fájlokat</target> +<target>Mutassa a jobb oldalon a frissítendő állományokat</target> <source>Show files that won't be copied</source> -<target>Mutassa a nem másolandó fájlokat</target> +<target>Mutassa az állományokat, amelyek nem kerülnek másolásra</target> <source>Show filtered or temporarily excluded files</source> -<target>Mutassa a szűrt vagy ideiglenesen kizárt fájlokat</target> +<target>Mutassa a szűrt vagy ideiglenesen kizárt állományokat</target> <source>Save as default</source> <target>Mentse mint alapértelmezést</target> @@ -1541,7 +1544,7 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <target>Szűrő</target> <source>All files are in sync</source> -<target>Az összes fájl szinkronizált</target> +<target>Az összes állomány szinkronizált</target> <source>Cannot find %x</source> <target>Nem található: %x</target> @@ -1556,23 +1559,11 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <target>Vesszővel elválasztott értékek (CSV)</target> <source>File list exported</source> -<target>A fájllista exportálása befejeződött</target> +<target>Az állománylista exportálása befejeződött</target> <source>Searching for program updates...</source> <target>Programfrissítés keresése...</target> -<source>Close progress dialog</source> -<target>Zárja be a folyamatjelző párbeszédablakot</target> - -<source>Log off</source> -<target>Kijelentkezik</target> - -<source>Standby</source> -<target>Készenléti állapot</target> - -<source>Shut down</source> -<target>Leállítja a gépet</target> - <source>Paused</source> <target>Megállítva</target> @@ -1603,18 +1594,21 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Log</source> <target>Napló</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>A telepítő fájlok sérültek. Installálja újra a FreeFileSync-et.</target> - <source>Thank you, %x, for your donation and support!</source> <target>%x, köszönöm Önnek adományát és támogatását!</target> +<source>Recommended range:</source> +<target>A javasolt tartomány:</target> + <source>Password:</source> <target>Jelszó:</target> <source>Key password:</source> <target>Kulcs jelszó:</target> +<source>Please enter a file path.</source> +<target>Kérem, adjon meg egy állomány-útvonalat.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1655,7 +1649,7 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <target>Integráljon a helyi menübe külső alkalmazásokat. A következő makrók érhetők el:</target> <source>Full file or folder path</source> -<target>Teljes fájl vagy könyvtár elérési útvonal</target> +<target>Teljes állomány vagy könyvtár elérési útvonal</target> <source>Parent folder path</source> <target>Szülő könyvtár elérési útvonala</target> @@ -1676,13 +1670,13 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <target>Frissítés letöltése...</target> <source>Identify equal files by comparing modification time and size.</source> -<target>Módosítási idő és méret összehasonlítása alapján azonosítsa az azonos fájlokat.</target> +<target>Módosítási idő és méret összehasonlítása alapján azonosítsa az azonos állományokat.</target> <source>Identify equal files by comparing the file content.</source> -<target>Tartalom összehasonlítása alapján azonosítsa az azonos fájlokat.</target> +<target>Tartalom összehasonlítása alapján azonosítsa az azonos állományokat.</target> <source>Identify equal files by comparing their file size.</source> -<target>A fájlméret összehasonlítása alapján azonosítsa az azonos fájlokat.</target> +<target>Az állományméret összehasonlítása alapján azonosítsa az azonos állományokat.</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Változások keresése és bemutatása mindkét oldalon. A törléseket, mozgatásokat és ütközéseket automatikusan ismeri fel egy adatbázis segítségével.</target> @@ -1691,7 +1685,7 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <target>A baloldali könyvtár tükörmásolatát készíti el úgy, hogy a jobb oldali könyvtár egyezzen meg.</target> <source>Copy new and updated files to the right folder.</source> -<target>Másolja az új és módosult fájlokat a jobb oldali könyvtárba.</target> +<target>Másolja az új és módosult állományokat a jobb oldali könyvtárba.</target> <source>Configure your own synchronization rules.</source> <target>Állítsa be a saját szinkronizálási szabályait.</target> @@ -1729,17 +1723,35 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>A felülírt vagy törölt állományok megőrzése a lomtárban</target> + +<source>Delete and overwrite files permanently</source> +<target>Véglegesen törli és felülírja az állományokat</target> + +<source>Move files to a user-defined folder</source> +<target>Mozgassa az állományokat egy a felhasználó által meghatározott könyvtárba</target> + <source>Replace</source> <target>Felülír</target> <source>Move files and replace if existing</source> -<target>Mozgassa a fájlokat és írja felül amennyiben léteztek</target> +<target>Mozgassa és írja felül az állományokat ha léteznek</target> <source>Time stamp</source> <target>Időbélyeg</target> <source>Append a time stamp to each file name</source> -<target>Minden fájlnévhez adjon egy-egy időbélyeget</target> +<target>Minden állománynévhez adjon egy-egy időbélyeget</target> + +<source>On completion:</source> +<target>Végrehajtás alatt:</target> + +<source>On errors:</source> +<target>Hiba esetén:</target> + +<source>On success:</source> +<target>Ha sikeres volt:</target> <source>Main config</source> <target>Alapbeállítások</target> @@ -1751,25 +1763,22 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <target>Hagyja feloldatlan ütközésként</target> <source>File</source> -<target>Fájl</target> +<target>Állomány</target> <source>YYYY-MM-DD hhmmss</source> <target>ÉÉÉÉ-HH-NN óóppmm</target> <source>Files</source> -<target>Fájlok</target> +<target>Állományok</target> <source>Name</source> <target>Név</target> -<source>Items</source> -<target>Elemek</target> - <source>Percentage</source> <target>Százalék</target> <source>Failed to retrieve update information.</source> -<target>Nem sikerült letölteni a frissítési információt.</target> +<target>Nem sikerült kinyerni a frissítési információt.</target> <source>Automatic updates:</source> <target>Automatikus frissítések:</target> @@ -1829,7 +1838,7 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <target>%x könyvtárat nem sikerült monitorozni.</target> <source>The file is locked by another process:</source> -<target>A fájlt egy másik processz zárolta:</target> +<target>Az állományt egy másik folyamat zárolta:</target> <source>Cannot read security context of %x.</source> <target>%x biztonsági környezete nem olvasható.</target> @@ -1847,7 +1856,7 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <target>%x nem megfelelő könyvtárnév.</target> <source>Cannot copy file %x to %y.</source> -<target>%x fájl nem másolható %y-ba.</target> +<target>%x állomány nem másolható %y-ba.</target> <source>Cannot copy attributes from %x to %y.</source> <target>Az attribútumok nem másolhatók %x-ből %y-ba.</target> @@ -1894,6 +1903,9 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Cannot change process I/O priorities.</source> <target>Nem sikerült a folyamatok I/O prioritását megváltoztatni.</target> +<source>Unable to shut down the system.</source> +<target>Nem képes leállítani a rendszert.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>%x könyvtár vonatkozásában a lomtár ellenőrzése meghiúsult.</target> @@ -1901,7 +1913,7 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <target>A következő XML elemek nem olvashatók:</target> <source>Configuration file %x is incomplete. The missing elements will be set to their default values.</source> -<target>%x konfigurációs fájl nem teljes. A hiányzó elemeket az alapértelmezés szerinti értékekkel helyettesíti.</target> +<target>%x konfigurációs állomány nem teljes. A hiányzó elemeket az alapértelmezés szerinti értékekkel helyettesíti.</target> <source>Prepare installation</source> <target>Telepítés előkészítése</target> @@ -1918,14 +1930,11 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Portable</source> <target>Hordozható</target> -<source>recommended</source> -<target>ajánlott</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Beállítások mentése a "%APPDATA%\FreeFileSync" mappába</target> <source>Register FreeFileSync file extensions</source> -<target>A FreeFileSync fájlkiterjesztéseinek regisztrálása</target> +<target>A FreeFileSync állomány-kiterjesztéseinek regisztrálása</target> <source>Create Explorer context menu entries</source> <target>Készítsen környezetfüggő menüsorokat az Explorerbe</target> @@ -1937,7 +1946,7 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <target>Ne írjon a rendszerleíró adatbázisba</target> <source>Just copy the files</source> -<target>Csak a fájlok másolása</target> +<target>Csak másolja az állományokat</target> <source>Choose a directory for installation:</source> <target>Válassza ki a telepítési mappát:</target> @@ -1952,16 +1961,16 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <target>Start menü</target> <source>Registering FreeFileSync file extensions</source> -<target>A FreeFileSync fájlkiterjesztéseinek regisztrálása</target> +<target>A FreeFileSync állomány-kiterjesztéseinek regisztrálása</target> <source>Unregistering FreeFileSync file extensions</source> -<target>A FreeFileSync fájlkiterjesztések regisztrációjának törlése</target> +<target>A FreeFileSync állomány-kiterjesztések regisztrációjának törlése</target> <source>FreeFileSync Configuration</source> <target>FreeFileSync konfigurálása</target> <source>FreeFileSync Batch File</source> -<target>FreeFileSync kötegelt fájl</target> +<target>FreeFileSync kötegelt állomány</target> <source>FreeFileSync Synchronization Database</source> <target>FreeFileSync szinkronizációs adatbázis</target> @@ -1972,8 +1981,8 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Edit with FreeFileSync</source> <target>Szerkesztés FreeFileSync-kel</target> -<source>The portable version cannot install into the selected folder.</source> -<target>A hordozható verziót nem lehet a kiválasztott könyvtárba telepíteni.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>A FreeFileSync hordozható változatát nem lehet telepíteni %x egyik alkönyvtárába.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Válassza a helyi telepítési módot vagy válasszon másik könytárat a telepítéshez.</target> diff --git a/FreeFileSync/Build/Languages/italian.lng b/FreeFileSync/Build/Languages/italian.lng index 2f455e9b..eebfcd49 100755 --- a/FreeFileSync/Build/Languages/italian.lng +++ b/FreeFileSync/Build/Languages/italian.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Controllo di disponibilità Cestino per la cartella %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Il cestino non è disponibile per le seguenti cartelle. I file verranno invece eliminati in modo permanente:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>Il cestino non è supportato dalle seguenti cartelle. I file cancellati o sovrascritti non potranno essere ripristinati:</target> <source>An exception occurred</source> <target>Si è verificata una eccezione</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Sintassi:</target> -<source>global config file:</source> -<target>file di configurazione globale:</target> - <source>config files:</source> <target>file di configurazione:</target> <source>directory</source> <target>directory</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Percorso di un file GlobalSettings.xml alternativo.</target> +<source>global config file:</source> +<target>file di configurazione globale:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Qualsiasi numero di FreeFileSync.ffs_gui e/o File di configurazione .ffs_batch.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Qualsiasi numero di coppie di directory alternative per al massimo un file di configurazione.</target> -<source>Open configuration for editing without executing it.</source> -<target>Apri configurazione per la modifica senza eseguirlo.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Apri la configurazione selezionata solo per la modifica senza eseguirla.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Percorso di un file GlobalSettings.xml alternativo.</target> <source>Cannot find the following folders:</source> <target>Impossibile trovare le seguenti cartelle:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Aggiorna attributi a destra</target> -<source>Cannot write file %x.</source> -<target>Impossibile scrivere il file %x.</target> +<source>Cannot read file %x.</source> +<target>Impossibile leggere il file %x.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Attuale: %y byte <source>Operation not supported for different base folder types.</source> <target>Operazione non supportata per i diversi tipi di cartelle di base.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Impossibile copiare collegamento %x per %y.</target> +<source>Cannot write file %x.</source> +<target>Impossibile scrivere il file %x.</target> <source>Cannot move file %x to %y.</source> <target>Impossibile spostare il file %x in %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Impossibile copiare collegamento %x per %y.</target> + <source>Unable to connect to %x.</source> <target>Impossibile connettersi a %x.</target> @@ -291,9 +294,6 @@ Attuale: %y byte <source>Cannot read directory %x.</source> <target>Impossibile leggere la directory %x.</target> -<source>Cannot read file %x.</source> -<target>Impossibile leggere il file %x.</target> - <source>Cannot read file attributes of %x.</source> <target>Impossibile leggere gli attributi del file %x.</target> @@ -596,8 +596,8 @@ Il comando è attivato se: <source>Automated Synchronization</source> <target>Sincronizzazione automatizzata</target> -<source>The following path does not support directory monitoring:</source> -<target>Il seguente percorso non supporta il Monitoraggio Cartella:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>Il protocollo %x non supporta il monitoraggio della directory:</target> <source>Directory monitoring active</source> <target>Monitoraggio Cartella attivo</target> @@ -713,8 +713,8 @@ Il comando è attivato se: <source>Base folder:</source> <target>Cartella base:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>La cartella delle versioni sarà sincronizzata poiché è contenuta in una cartella base.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>La cartella delle versioni è contenuta in una cartella di base.</target> <source>Synchronizing folder pair:</source> <target>Sincronizzazione della coppia di cartelle:</target> @@ -728,6 +728,15 @@ Il comando è attivato se: <source>job name</source> <target>nome del lavoro</target> +<source>Show summary</source> +<target>Mostra il riepilogo</target> + +<source>Sleep</source> +<target>Sospendi</target> + +<source>Shut down</source> +<target>Arresta</target> + <source>Synchronization stopped</source> <target>Sincronizzazione fermata</target> @@ -749,6 +758,9 @@ Il comando è attivato se: <source>Synchronization completed successfully</source> <target>Sincronizzazione completata con successo</target> +<source>Executing command %x</source> +<target>Esecuzione del comando %x</target> + <source>Cleaning up old log files...</source> <target>Pulizia vecchi file di log ...</target> @@ -776,8 +788,8 @@ Il comando è attivato se: <pluralform>Riprova Automatica in %x secondi...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Ignora errori successivi</target> +<source>Ignore &all</source> +<target>Ignora &tutto</target> <source>Retrying operation...</source> <target>Riprovare l'Operazione...</target> @@ -884,12 +896,12 @@ Il comando è attivato se: <source>&Find...</source> <target>&Trova ...</target> -<source>&Reset layout</source> -<target>&Ripristina layout</target> - <source>&Export file list...</source> <target>&Esporta l'elenco dei file...</target> +<source>&Reset layout</source> +<target>&Ripristina layout</target> + <source>&Tools</source> <target>&Strumenti</target> @@ -1025,9 +1037,6 @@ Il comando è attivato se: <source>C&lear</source> <target>Cance&lla</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Rileva indicazioni sincronizzazione con l'aiuto del file di database</target> - <source>Detect moved files</source> <target>Rileva file spostati</target> @@ -1048,38 +1057,23 @@ Il comando è attivato se: <source>&Recycle bin</source> <target>&Cestino</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Eseguire il back up dei file cancellati o sovrascritti nel cestino</target> - <source>&Permanent</source> <target>&Permanente</target> -<source>Delete or overwrite files permanently</source> -<target>Elimina o sovrascrivi i file definitivamente</target> - <source>&Versioning</source> <target>&Versione</target> -<source>Move files to a user-defined folder</source> -<target>Spostare i file in una cartella definita dall'utente</target> - <source>Naming convention:</source> <target>Modalità di rinomina:</target> -<source>Handle errors:</source> -<target>Gestire gli errori:</target> - -<source>&Pop-up</source> -<target>&Pop-up</target> +<source>&Ignore errors</source> +<target>&Ignora errori</target> <source>Show pop-up on errors or warnings</source> <target>Mostra pop-up di errore o avviso</target> -<source>Hide all error and warning messages</source> -<target>Nascondi tutti gli errori e i messaggi d'avviso</target> - -<source>On completion:</source> -<target>Al termine:</target> +<source>Run a command after synchronization:</source> +<target>Esegui un comando dopo la sincronizzazione:</target> <source>OK</source> <target>OK</target> @@ -1117,6 +1111,9 @@ Il comando è attivato se: <source>&Key file</source> <target>File di &chiave</target> +<source>&SSH agent</source> +<target>Agente &SSH</target> + <source>User name:</source> <target>Nome utente:</target> @@ -1135,11 +1132,8 @@ Il comando è attivato se: <source>How to get best performance?</source> <target>Come ottenere le migliori prestazioni?</target> -<source>SSH connections for directory reading:</source> -<target>Connessioni SSH per la lettura di directory:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Intervallo suggerito: [1-10]</target> +<source>Connections for directory reading:</source> +<target>Collegamenti per la lettura delle directory:</target> <source>SFTP channels per connection:</source> <target>Canali SFTP per il collegamento:</target> @@ -1147,9 +1141,6 @@ Il comando è attivato se: <source>Detect server limit</source> <target>Rilevare limite del server</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 collegamenti x 10 canali = 20 volte più veloce la lettura della directory</target> - <source>Select a directory on the server:</source> <target>Selezionare una directory sul server:</target> @@ -1189,6 +1180,9 @@ Il comando è attivato se: <source>Bytes copied:</source> <target>Byte copiati:</target> +<source>When finished:</source> +<target>Al termine:</target> + <source>Close</source> <target>Chiudi</target> @@ -1201,15 +1195,18 @@ Il comando è attivato se: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Creare un file batch per la sincronizzazione automatica. Per iniziare, fare doppio clic su questo file o programmarlo in un pianificatore di compiti: %x</target> -<source>&Stop</source> -<target>&Stop</target> +<source>Run minimized</source> +<target>Esegui minimizzato</target> + +<source>&Show error dialog</source> +<target>&Mostra la finestra di errore</target> + +<source>&Cancel</source> +<target>&Cancella</target> <source>Stop synchronization at first error</source> <target>Interrompere la sincronizzazione al primo errore</target> -<source>Run minimized</source> -<target>Esegui minimizzato</target> - <source>Save log:</source> <target>Salva log:</target> @@ -1240,14 +1237,14 @@ Copiare in un file temporaneo ( *.ffs_tmp ) prima di sovrascrivere il bersaglio. Questo garantisce uno stato consistente anche in caso di errore grave. </target> -<source>(recommended)</source> -<target>(consigliato)</target> +<source>recommended</source> +<target>raccommandata</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Copiare file condivisi o bloccati con il Volume Shadow Copy Service.</target> -<source>(requires administrator rights)</source> -<target>(richiede i diritti di amministratore)</target> +<source>requires administrator rights</source> +<target>richiede i diritti di amministratore</target> <source>Transfer file and folder permissions.</source> <target>Trasferimento autorizzazioni di file e cartelle.</target> @@ -1279,14 +1276,17 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Source code written in C++ using:</source> <target>Codice sorgente scritto in C++ utilizzando:</target> -<source>Donation details</source> -<target>dettagli Donazione</target> - <source>If you like FreeFileSync:</source> <target>Se ti piace FreeFileSync:</target> -<source>Donate with PayPal</source> -<target>Fai una donazione con PayPal</target> +<source>Support with a donation</source> +<target>Supporto con una donazione</target> + +<source>Donation details</source> +<target>dettagli Donazione</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>L'aggiornamento automatico è stato disabilitato dall'amministratore.</target> <source>Feedback and suggestions are welcome</source> <target>Ogni commento o suggerimento è ben accetto</target> @@ -1324,8 +1324,8 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Activate offline</source> <target>Attiva offline</target> -<source>Save as Batch Job</source> -<target>Salva come Processo Batch</target> +<source>Save as a Batch Job</source> +<target>Salva come Lavoro Batch</target> <source>Delete Items</source> <target>Elimina Elementi</target> @@ -1363,11 +1363,17 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Overview</source> <target>Anteprima</target> +<source>Show "%x"</source> +<target>Mostra "%x"</target> + <source>&Show details</source> <target>&Mostra dettagli</target> -<source>A new version of FreeFileSync is available:</source> -<target>E' disponibile una nuova versione di FreeFileSync:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x è disponibile!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>I file di installazione sono danneggiati. Si prega di reinstallare FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Percorso locale non disponibile per %x.</target> @@ -1459,9 +1465,6 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Select time span...</source> <target>Seleziona intervallo di tempo...</target> -<source>Show "%x"</source> -<target>Mostra "%x"</target> - <source>Last session</source> <target>Ultima sessione</target> @@ -1561,18 +1564,6 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Searching for program updates...</source> <target>Ricerca di aggiornamenti al programma...</target> -<source>Close progress dialog</source> -<target>Chiudi stato di avanzamento</target> - -<source>Log off</source> -<target>Termina sessione</target> - -<source>Standby</source> -<target>Sospendi</target> - -<source>Shut down</source> -<target>Arresta</target> - <source>Paused</source> <target>In pausa</target> @@ -1603,18 +1594,21 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Log</source> <target>Log</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>I file di installazione sono danneggiati. Si prega di reinstallare FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Grazie, %x, per la vostra donazione e il supporto!</target> +<source>Recommended range:</source> +<target>Intervallo consigliato:</target> + <source>Password:</source> <target>Password:</target> <source>Key password:</source> <target>Chiave password:</target> +<source>Please enter a file path.</source> +<target>Si prega di inserire un percorso di file.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1729,6 +1723,15 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Conservare i file cancellati e sovrascritti nel cestino</target> + +<source>Delete and overwrite files permanently</source> +<target>Elimina e sovrascrivi i file in modo permanente</target> + +<source>Move files to a user-defined folder</source> +<target>Spostare i file in una cartella definita dall'utente</target> + <source>Replace</source> <target>Sostituisci</target> @@ -1741,6 +1744,15 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Append a time stamp to each file name</source> <target>Aggiunge un'impronta per ogni nome di file</target> +<source>On completion:</source> +<target>Al termine:</target> + +<source>On errors:</source> +<target>In caso di errori:</target> + +<source>On success:</source> +<target>In caso di successo:</target> + <source>Main config</source> <target>Config principale</target> @@ -1762,9 +1774,6 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Name</source> <target>Nome</target> -<source>Items</source> -<target>Oggetti</target> - <source>Percentage</source> <target>Percentuale</target> @@ -1894,6 +1903,9 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Cannot change process I/O priorities.</source> <target>Impossibile modificare le priorità I/O del processo.</target> +<source>Unable to shut down the system.</source> +<target>Impossibile chiudere il sistema.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Controllo cestino non riuscito per la cartella %x.</target> @@ -1918,9 +1930,6 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Portable</source> <target>Portatile</target> -<source>recommended</source> -<target>raccommandata</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Salva impostazioni in "%APPDATA%\FreeFileSync"</target> @@ -1972,8 +1981,8 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Edit with FreeFileSync</source> <target>Modifica con FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>Non è possibile installare nella cartella selezionata la versione portatile.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>La versione portatile FreeFileSync non può essere installata in una sottocartella di %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Scegliere il tipo di installazione locale o selezionare una cartella diversa per l'installazione.</target> diff --git a/FreeFileSync/Build/Languages/japanese.lng b/FreeFileSync/Build/Languages/japanese.lng index ecfdde41..0347da63 100755 --- a/FreeFileSync/Build/Languages/japanese.lng +++ b/FreeFileSync/Build/Languages/japanese.lng @@ -7,9 +7,6 @@ <plural_definition>0</plural_definition> </header> -<source>The %x protocol does not support directory monitoring:</source> -<target></target> - <source>Both sides have changed since last synchronization.</source> <target>前回最後の同期処理以降、両側とも変更があります.</target> @@ -55,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>フォルダ %x をゴミ箱として使用できるかを確認中...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>以下のフォルダではゴミ箱を利用できません。代替手段としてファイルの完全削除を利用することが出来ます:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>次のフォルダではゴミ箱に対応していないため、ファイルの削除、または上書き操作された場合、元に戻せません:</target> <source>An exception occurred</source> <target>例外が発生しました</target> @@ -91,17 +88,14 @@ <source>Syntax:</source> <target>構文:</target> -<source>global config file:</source> -<target>グローバル構成ファイル:</target> - <source>config files:</source> <target>構成ファイル:</target> <source>directory</source> <target>ディレクトリ</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>代替グローバル設定.xml ファイルのパス.</target> +<source>global config file:</source> +<target>グローバル構成ファイル:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>任意の数の FreeFileSync 構成設定ファイル(.ffs_gui および/または .ffs_batch).</target> @@ -109,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>任意の数の代替ディレクトリペア(ひとつの構成ファイル).</target> -<source>Open configuration for editing without executing it.</source> -<target>実行しないで編集のために構成設定を開く.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>選択された構成を実行しないで編集用に開きます.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>代替グローバル設定.xml ファイルのパス.</target> <source>Cannot find the following folders:</source> <target>以下のフォルダがみつかりません:</target> @@ -256,8 +253,8 @@ <source>Update attributes on right</source> <target>右の属性を更新</target> -<source>Cannot write file %x.</source> -<target>ファイル %x に書き込めません.</target> +<source>Cannot read file %x.</source> +<target>ファイル %x を読み込めません.</target> <source> Unexpected size of data stream. @@ -276,12 +273,15 @@ Actual: %y bytes <source>Operation not supported for different base folder types.</source> <target>別の基準フォルダタイプでは対応していない操作.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>シンボリックリンク %x を %y にコピーできません.</target> +<source>Cannot write file %x.</source> +<target>ファイル %x に書き込めません.</target> <source>Cannot move file %x to %y.</source> <target>ファイル %x を %y に移動できません.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>シンボリックリンク %x を %y にコピーできません.</target> + <source>Unable to connect to %x.</source> <target>%x に接続できません.</target> @@ -294,9 +294,6 @@ Actual: %y bytes <source>Cannot read directory %x.</source> <target>ディレクトリ %x を読み取れません.</target> -<source>Cannot read file %x.</source> -<target>ファイル %x を読み込めません.</target> - <source>Cannot read file attributes of %x.</source> <target>%x のファイル属性を読み込めません.</target> @@ -594,6 +591,9 @@ The command is triggered if: <source>Automated Synchronization</source> <target>自動同期</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>%x プロトコルはディレクトリの監視に対応していません:</target> + <source>Directory monitoring active</source> <target>ディレクトリの監視アクティブ</target> @@ -708,8 +708,8 @@ The command is triggered if: <source>Base folder:</source> <target>基準フォルダ:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>このバージョン管理フォルダは、基準フォルダに含まれるため同期の対象となります.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>バージョン管理フォルダは、基準フォルダ内に含まれています.</target> <source>Synchronizing folder pair:</source> <target>フォルダペアを同期処理:</target> @@ -723,6 +723,15 @@ The command is triggered if: <source>job name</source> <target>ジョブ名</target> +<source>Show summary</source> +<target>概要を表示</target> + +<source>Sleep</source> +<target>スリープ</target> + +<source>Shut down</source> +<target>シャットダウン</target> + <source>Synchronization stopped</source> <target>同期処理を停止</target> @@ -744,6 +753,9 @@ The command is triggered if: <source>Synchronization completed successfully</source> <target>同期処理はすべてが正常に完了しました</target> +<source>Executing command %x</source> +<target>コマンド %x を実行中</target> + <source>Cleaning up old log files...</source> <target>古いログファイルをクリーン...</target> @@ -770,8 +782,8 @@ The command is triggered if: <pluralform>%x 秒後に自動的に再試行...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>以降のエラーは無視する(&I)</target> +<source>Ignore &all</source> +<target>すべて無視(&A)</target> <source>Retrying operation...</source> <target>処理を再試行中...</target> @@ -878,12 +890,12 @@ The command is triggered if: <source>&Find...</source> <target>検索(&F)...</target> -<source>&Reset layout</source> -<target>レイアウトをリセット(&R)</target> - <source>&Export file list...</source> <target>ファイル一覧をエクスポート(&E)...</target> +<source>&Reset layout</source> +<target>レイアウトをリセット(&R)</target> + <source>&Tools</source> <target>ツール(&T)</target> @@ -1019,9 +1031,6 @@ The command is triggered if: <source>C&lear</source> <target>クリア(&L)</target> -<source>Detect synchronization directions with the help of database files</source> -<target>データベースファイルを利用して、同期の方向を検出します。</target> - <source>Detect moved files</source> <target>移動済みのファイルを検出する</target> @@ -1042,38 +1051,23 @@ The command is triggered if: <source>&Recycle bin</source> <target>ゴミ箱(&R)</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>ファイルを削除/上書きする時に、ゴミ箱にバックアップをとる</target> - <source>&Permanent</source> <target>完全消去(&P)</target> -<source>Delete or overwrite files permanently</source> -<target>ファイルを上書き/または完全に消去します</target> - <source>&Versioning</source> <target>バージョン管理(&V)</target> -<source>Move files to a user-defined folder</source> -<target>ユーザ定義のフォルダにファイルを移動</target> - <source>Naming convention:</source> <target>命名規則:</target> -<source>Handle errors:</source> -<target>エラーの取り扱い:</target> - -<source>&Pop-up</source> -<target>ポップアップ(&P)</target> +<source>&Ignore errors</source> +<target>エラーを無視(&I)</target> <source>Show pop-up on errors or warnings</source> <target>エラーと警告をポップアップで表示</target> -<source>Hide all error and warning messages</source> -<target>すべてのエラーと警告メッセージを非表示</target> - -<source>On completion:</source> -<target>完了時の動作:</target> +<source>Run a command after synchronization:</source> +<target>同期処理後に実行するコマンド:</target> <source>OK</source> <target>OK</target> @@ -1111,6 +1105,9 @@ The command is triggered if: <source>&Key file</source> <target>キーファイル(&K)</target> +<source>&SSH agent</source> +<target>&SSH エージェント</target> + <source>User name:</source> <target>ユーザ名:</target> @@ -1129,11 +1126,8 @@ The command is triggered if: <source>How to get best performance?</source> <target>最適なパフォーマンスとは?</target> -<source>SSH connections for directory reading:</source> -<target>ディレクトリ読み取りのSSH接続:</target> - -<source>Suggested range: [1 - 10]</source> -<target>推奨される範囲: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>ディレクトリの読み取り接続数:</target> <source>SFTP channels per connection:</source> <target>接続当たりの SFTP チャンネル数:</target> @@ -1141,9 +1135,6 @@ The command is triggered if: <source>Detect server limit</source> <target>サーバ制限の検出</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 接続 x 10 チャンネル = ディレクトリ読み取りが 20 倍高速化</target> - <source>Select a directory on the server:</source> <target>サーバ上のディレクトリを選択:</target> @@ -1183,6 +1174,9 @@ The command is triggered if: <source>Bytes copied:</source> <target>バイトをコピー済:</target> +<source>When finished:</source> +<target>完了後:</target> + <source>Close</source> <target>閉じる</target> @@ -1195,15 +1189,18 @@ The command is triggered if: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>無人で同期を行う為のバッチファイルを作成 - このファイルか、タスクプランナーからスケジュールをダブルクリックすることで開始: %x</target> -<source>&Stop</source> -<target>停止(&S)</target> +<source>Run minimized</source> +<target>最小化で起動</target> + +<source>&Show error dialog</source> +<target>エラーダイアログを表示(&S)</target> + +<source>&Cancel</source> +<target>キャンセル(&C)</target> <source>Stop synchronization at first error</source> <target>最初のエラーで同期処理を停止</target> -<source>Run minimized</source> -<target>最小化で起動</target> - <source>Save log:</source> <target>ログ保存:</target> @@ -1234,14 +1231,14 @@ This guarantees a consistent state even in case of a serious error. これにより、エラーが発生した場合も一貫性ある状態が保証されます. </target> -<source>(recommended)</source> -<target>(推奨)</target> +<source>recommended</source> +<target>推奨</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>共有、ロックされたファイルをボリュームシャドウコピーサービスを使用してコピー.</target> -<source>(requires administrator rights)</source> -<target>(管理者権限が必要)</target> +<source>requires administrator rights</source> +<target>管理者権限が必要</target> <source>Transfer file and folder permissions.</source> <target>ファイルとフォルダのパーミッションを転送します.</target> @@ -1273,14 +1270,17 @@ This guarantees a consistent state even in case of a serious error. <source>Source code written in C++ using:</source> <target>ソースコードは C++ で書かれています:</target> -<source>Donation details</source> -<target>寄付の詳細</target> - <source>If you like FreeFileSync:</source> <target>FreeFileSync を気に入ってくれた方へ:</target> -<source>Donate with PayPal</source> -<target>PayPal から寄付</target> +<source>Support with a donation</source> +<target>寄付によるサポート</target> + +<source>Donation details</source> +<target>寄付の詳細</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>自動アップデートは管理者によって無効にされています.</target> <source>Feedback and suggestions are welcome</source> <target>フィードバック、提案などはこちらから</target> @@ -1318,7 +1318,7 @@ This guarantees a consistent state even in case of a serious error. <source>Activate offline</source> <target>オフライン アクティベート</target> -<source>Save as Batch Job</source> +<source>Save as a Batch Job</source> <target>一括ジョブを保存</target> <source>Delete Items</source> @@ -1357,11 +1357,17 @@ This guarantees a consistent state even in case of a serious error. <source>Overview</source> <target>概要</target> +<source>Show "%x"</source> +<target>"%x" で表示</target> + <source>&Show details</source> <target>詳細表示(&S)</target> -<source>A new version of FreeFileSync is available:</source> -<target>FreeFileSync の新しいバージョンが利用できます:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x が利用できます!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>インストール ファイルが破損しています、FreeFileSync を再インストールしてください.</target> <source>Local path not available for %x.</source> <target>利用できないローカスパス %x.</target> @@ -1449,9 +1455,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>タイムスパンを選択...</target> -<source>Show "%x"</source> -<target>"%x" で表示</target> - <source>Last session</source> <target>最後のセッション</target> @@ -1551,18 +1554,6 @@ This guarantees a consistent state even in case of a serious error. <source>Searching for program updates...</source> <target>アップデートを検索しています...</target> -<source>Close progress dialog</source> -<target>進捗ダイアログを閉じる</target> - -<source>Log off</source> -<target>ログオフ</target> - -<source>Standby</source> -<target>スリープ</target> - -<source>Shut down</source> -<target>シャットダウン</target> - <source>Paused</source> <target>一時停止中</target> @@ -1593,18 +1584,21 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>ログ</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>インストール ファイルが破損しています、FreeFileSync を再インストールしてください.</target> - <source>Thank you, %x, for your donation and support!</source> <target>ありがとう %x, あなたの寄付と支援に感謝します!!</target> +<source>Recommended range:</source> +<target>推奨される範囲:</target> + <source>Password:</source> <target>パスワード:</target> <source>Key password:</source> <target>キーパスワード:</target> +<source>Please enter a file path.</source> +<target>ファイルパスを入力.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1716,6 +1710,15 @@ This guarantees a consistent state even in case of a serious error. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>削除、上書きされたファイルをゴミ箱内に保持する</target> + +<source>Delete and overwrite files permanently</source> +<target>ファイルを完全に削除、または上書きする</target> + +<source>Move files to a user-defined folder</source> +<target>ユーザ定義のフォルダにファイルを移動</target> + <source>Replace</source> <target>置換</target> @@ -1728,6 +1731,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>各ファイル名にタイムスタンプを付加</target> +<source>On completion:</source> +<target>完了時の動作:</target> + +<source>On errors:</source> +<target>処理の失敗時:</target> + +<source>On success:</source> +<target>処理の成功時:</target> + <source>Main config</source> <target>メイン構成</target> @@ -1749,9 +1761,6 @@ This guarantees a consistent state even in case of a serious error. <source>Name</source> <target>名前</target> -<source>Items</source> -<target>項目</target> - <source>Percentage</source> <target>パーセント</target> @@ -1878,6 +1887,9 @@ This guarantees a consistent state even in case of a serious error. <source>Cannot change process I/O priorities.</source> <target>プロセスの I/O 優先度を変更できません.</target> +<source>Unable to shut down the system.</source> +<target>システムをシャットダウンできません.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>フォルダ %x のゴミ箱のチェックに失敗.</target> @@ -1902,9 +1914,6 @@ This guarantees a consistent state even in case of a serious error. <source>Portable</source> <target>ポータブル</target> -<source>recommended</source> -<target>推奨</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>設定の保存先 "%APPDATA%\FreeFileSync"</target> @@ -1956,8 +1965,8 @@ This guarantees a consistent state even in case of a serious error. <source>Edit with FreeFileSync</source> <target>FreeFileSync で編集</target> -<source>The portable version cannot install into the selected folder.</source> -<target>選択したフォルダにはポータブル版をインストールできません.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>FreeFileSync ポータブル版は %x のサブフォルダにはインストールできません.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>ローカル インストールを選択するか、別のインストール先を選択してください.</target> diff --git a/FreeFileSync/Build/Languages/korean.lng b/FreeFileSync/Build/Languages/korean.lng index c877df9c..6e0191b8 100755 --- a/FreeFileSync/Build/Languages/korean.lng +++ b/FreeFileSync/Build/Languages/korean.lng @@ -52,14 +52,14 @@ <source>Checking recycle bin availability for folder %x...</source> <target>폴더 %x을(를) 위한 휴지통 가용성 여부 확인 중...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>다음 폴더들을 위해 휴지통을 사용할 수 없습니다. 대신 파일들을 영구 삭제합니다:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>다음 폴더에서는 휴지통이 지원되지 않습니다. 삭제되거나 덮어 씌어진 파일은 복원할 수 없습니다:</target> <source>An exception occurred</source> <target>예외 발생</target> <source>A directory path is expected after %x.</source> -<target>%x 이후 일반적으로 디렉토리 경로가 하나 나옵니다.</target> +<target>%x 이후 일반적으로 디렉터리 경로가 하나 나옵니다.</target> <source>Syntax error</source> <target>구문 오류</target> @@ -77,10 +77,10 @@ <target>지정된 좌측 및 우측 디렉터리 개수가 같지 않음.</target> <source>The config file must not contain settings at directory pair level when directories are set via command line.</source> -<target>명령줄을 통해 설정된 디렉토리의 경우, 설정 파일은 디렉토리 페어 상의 설정을 포함할 수 없습니다.</target> +<target>명령줄을 통해 설정된 디렉터리의 경우, 설정 파일은 디렉터리 페어 상의 설정을 포함할 수 없습니다.</target> <source>Directories cannot be set for more than one configuration file.</source> -<target>디렉토리는 하나 이상의 설정 파일을 위해 설정될 수 없습니다.</target> +<target>디렉터리는 하나 이상의 설정 파일을 위해 설정될 수 없습니다.</target> <source>Command line</source> <target>명령줄(커맨드라인)</target> @@ -88,26 +88,26 @@ <source>Syntax:</source> <target>구문(Syntax):</target> -<source>global config file:</source> -<target>전체 설정 파일:</target> - <source>config files:</source> <target>설정 파일:</target> <source>directory</source> -<target>디렉토리</target> +<target>디렉터리</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>GlobalSettings.xml 대체 파일에 대한 경로.</target> +<source>global config file:</source> +<target>전체 설정 파일:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>FreeFileSync .ffs_gui 또는 .ffs_batch 설정 파일 개수.</target> <source>Any number of alternative directory pairs for at most one config file.</source> -<target>최대 1개 설정파일에 대한 대체 디렉토리 페어 개수.</target> +<target>최대 1개 설정파일에 대한 대체 디렉터리 페어 개수.</target> -<source>Open configuration for editing without executing it.</source> -<target>실행하지 않은 상태로 편집 구성 열기.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>선택한 구성을 실행하지 않고 편집을 위해서만 열기.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>GlobalSettings.xml 대체 파일에 대한 경로.</target> <source>Cannot find the following folders:</source> <target>다음 폴더를 찾을 수 없습니다:</target> @@ -167,7 +167,7 @@ <target>배경 우선 순위로 실행</target> <source>Lock directories during sync</source> -<target>동기화 중 디렉토리 잠금</target> +<target>동기화 중 디렉터리 잠금</target> <source>Verify copied files</source> <target>복사된 파일 확인</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>우측 속성 업데이트</target> -<source>Cannot write file %x.</source> -<target>파일 %x을(를) 쓸 수 없습니다.</target> +<source>Cannot read file %x.</source> +<target>파일 %x을(를) 읽을 수 없습니다.</target> <source> Unexpected size of data stream. @@ -262,9 +262,9 @@ Expected: %x bytes Actual: %y bytes </source> <target> -예상 밖의 데이터 스트림 사이즈 -예상 사이즈: %x 바이트 -실제 사이즈: %y 바이트 +예상치 못한 데이터 스트림 크기 +예상 크기: %x 바이트 +실제 크기: %y 바이트 </target> <source>Cannot write permissions of %x.</source> @@ -273,12 +273,15 @@ Actual: %y bytes <source>Operation not supported for different base folder types.</source> <target>다른 기본 폴더 유형에 대해 지원되지 않는 동작입니다.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>심볼릭 링크 %x을(를) %y(으)로 복사할 수 없습니다.</target> +<source>Cannot write file %x.</source> +<target>파일 %x을(를) 쓸 수 없습니다.</target> <source>Cannot move file %x to %y.</source> <target>파일 %x을(를) %y(으)로 이동할 수 없습니다.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>심볼릭 링크 %x을(를) %y(으)로 복사할 수 없습니다.</target> + <source>Unable to connect to %x.</source> <target>%x에 연결할 수 없습니다.</target> @@ -286,25 +289,22 @@ Actual: %y bytes <target>서버 %x에 대한 정보를 가져 오는데 실패했습니다.</target> <source>Cannot open directory %x.</source> -<target>디렉토리 %x을(를) 열 수 없습니다.</target> +<target>디렉터리 %x을(를) 열 수 없습니다.</target> <source>Cannot read directory %x.</source> -<target>디렉토리 %x을(를) 읽을 수 없습니다.</target> +<target>디렉터리 %x을(를) 읽을 수 없습니다.</target> <source>Cannot read file attributes of %x.</source> <target>%x의 파일 속성을 읽을 수 없습니다.</target> -<source>Cannot read file %x.</source> -<target>파일 %x을(를) 읽을 수 없습니다.</target> - <source>Cannot create directory %x.</source> -<target>디렉토리 %x을(를) 생성할 수 없습니다.</target> +<target>디렉터리 %x을(를) 생성할 수 없습니다.</target> <source>Cannot delete file %x.</source> <target>파일 %x을(를) 삭제할 수 없습니다.</target> <source>Cannot delete directory %x.</source> -<target>디렉토리 %x을(를) 삭제할 수 없습니다.</target> +<target>디렉터리 %x을(를) 삭제할 수 없습니다.</target> <source>Cannot write modification time of %x.</source> <target>%x의 수정 시간을 쓸 수 없습니다.</target> @@ -424,7 +424,7 @@ Actual: %y bytes <target>프로세스 정보를 얻을 수 없습니다.</target> <source>Waiting while directory is locked:</source> -<target>디렉토리 잠금 대기 중:</target> +<target>디렉터리 잠금 대기 중:</target> <source>Lock owner:</source> <target>잠금 권한자:</target> @@ -453,7 +453,7 @@ Actual: %y bytes <target>분석 오류 - 파일: %x; 행: %y; 열: %z.</target> <source>Cannot set directory lock for %x.</source> -<target>%x 에 대한 디렉토리 잠금을 설정할 수 없습니다.</target> +<target>%x 에 대한 디렉터리 잠금을 설정할 수 없습니다.</target> <source> <pluralform>1 thread</pluralform> @@ -479,10 +479,10 @@ Actual: %y bytes <target>기본값 응용 프로그램으로 열기</target> <source>Browse directory</source> -<target>디렉토리 찾아보기</target> +<target>디렉터리 찾아보기</target> <source>Cannot access the Volume Shadow Copy Service.</source> -<target>Volume Shadow Copy Service에 접근할 수 없습니다.</target> +<target>볼륨 섀도 복사본 서비스에 접근할 수 없습니다.</target> <source>Please run the 64-bit version of FreeFileSync to create shadow copies on this system.</source> <target>본 운영체제에서의 Shadow Copy 생성은 FreeFileSync 64-비트 버전을 사용하시기 바랍니다.</target> @@ -500,7 +500,7 @@ Actual: %y bytes <target>버전 관리를 위한 타임 스탬프 생성 불가:</target> <source>Drag && drop</source> -<target>드래그 앤 드랍(&&) [마우스로 파일 끌어다 놓기]</target> +<target>끌어서 놓기(&&) [드래그-앤-드랍]</target> <source>Cannot find folder %x.</source> <target>%x 폴더를 찾을 수 없습니다.</target> @@ -591,14 +591,14 @@ The command is triggered if: <source>Automated Synchronization</source> <target>자동 동기화</target> -<source>The following path does not support directory monitoring:</source> -<target>다음 경로는 디렉토리 모니터링을 지원하지 않습니다:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>%x 프로토콜은 디렉터리 모니터링을 지원하지 않습니다:</target> <source>Directory monitoring active</source> -<target>디렉토리 모니터링 활성화</target> +<target>디렉터리 모니터링 활성화</target> <source>Waiting until all directories are available...</source> -<target>모든 디렉토리가 사용 가능할 때까지 대기 중...</target> +<target>모든 디렉터리가 사용 가능할 때까지 대기 중...</target> <source>&Restore</source> <target>복원(&R)</target> @@ -708,8 +708,8 @@ The command is triggered if: <source>Base folder:</source> <target>기본 폴더:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>버전 관리 폴더는 기본 폴더에 포함되어 있기 때문에 동기화됩니다.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>버전 관리 폴더는 기본 폴더에 포함돼 있습니다.</target> <source>Synchronizing folder pair:</source> <target>폴더 페어 동기화 진행 중:</target> @@ -723,6 +723,15 @@ The command is triggered if: <source>job name</source> <target>작업 이름</target> +<source>Show summary</source> +<target>요약 표시</target> + +<source>Sleep</source> +<target>절전</target> + +<source>Shut down</source> +<target>종료</target> + <source>Synchronization stopped</source> <target>동기화 중단</target> @@ -744,6 +753,9 @@ The command is triggered if: <source>Synchronization completed successfully</source> <target>동기화가 성공적으로 완료 됐습니다</target> +<source>Executing command %x</source> +<target>%x 명령 실행 중</target> + <source>Cleaning up old log files...</source> <target>이전 로그 파일 정리 중...</target> @@ -770,8 +782,8 @@ The command is triggered if: <pluralform>%x초 이내에 자동 재시도...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>이후 오류 무시(&I)</target> +<source>Ignore &all</source> +<target>전체 무시(&a)</target> <source>Retrying operation...</source> <target>작업 재시도 중...</target> @@ -878,12 +890,12 @@ The command is triggered if: <source>&Find...</source> <target>찾기(&F)...</target> -<source>&Reset layout</source> -<target>레이아웃 리셋(&R)</target> - <source>&Export file list...</source> <target>파일 리스트 내보내기(&E)...</target> +<source>&Reset layout</source> +<target>레이아웃 다시 설정(&R)</target> + <source>&Tools</source> <target>도구(&T)</target> @@ -891,7 +903,7 @@ The command is triggered if: <target>업데이트 바로 확인(&C)</target> <source>Check &automatically once a week</source> -<target>자동으로 주당 1회 확인(&a)</target> +<target>일주일에 한 번 자동 확인(&a)</target> <source>Cancel</source> <target>취소</target> @@ -1019,9 +1031,6 @@ The command is triggered if: <source>C&lear</source> <target>제거(&l)</target> -<source>Detect synchronization directions with the help of database files</source> -<target>데이터베이스 파일로 동기화 방향 감지</target> - <source>Detect moved files</source> <target>이동 파일 탐지</target> @@ -1042,41 +1051,26 @@ The command is triggered if: <source>&Recycle bin</source> <target>휴지통(&R)</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>휴지통에 삭제되고 덮어 씌어진 파일 백업</target> - <source>&Permanent</source> <target>영구(&P)</target> -<source>Delete or overwrite files permanently</source> -<target>파일 영구 삭제 또는 덮어쓰기</target> - <source>&Versioning</source> <target>버전 관리(&V)</target> -<source>Move files to a user-defined folder</source> -<target>사용자 정의 폴더로 파일 이동</target> - <source>Naming convention:</source> <target>이름 지정:</target> -<source>Handle errors:</source> -<target>오류 발생시:</target> - -<source>&Pop-up</source> -<target>팝업(&P)</target> +<source>&Ignore errors</source> +<target>오류 무시(&I)</target> <source>Show pop-up on errors or warnings</source> <target>오류 또는 경고에 대한 팝업 보이기</target> -<source>Hide all error and warning messages</source> -<target>모든 오류/경고 메세지 숨기기</target> - -<source>On completion:</source> -<target>완료 시:</target> +<source>Run a command after synchronization:</source> +<target>동기화 이후 명령 실행:</target> <source>OK</source> -<target>OK</target> +<target>확인</target> <source>Arrange folder pair</source> <target>폴더 페어 정렬</target> @@ -1111,8 +1105,11 @@ The command is triggered if: <source>&Key file</source> <target>키 파일(&K)</target> +<source>&SSH agent</source> +<target>SSH 에이전트(&S)</target> + <source>User name:</source> -<target>사용자 명:</target> +<target>사용자 이름:</target> <source>Private key file:</source> <target>개인 키 파일:</target> @@ -1121,7 +1118,7 @@ The command is triggered if: <target>비밀번호 표시(&S)</target> <source>Directory on server:</source> -<target>서버 디렉토리:</target> +<target>서버 디렉터리:</target> <source>Performance improvements:</source> <target>성능 향상:</target> @@ -1129,11 +1126,8 @@ The command is triggered if: <source>How to get best performance?</source> <target>최상의 성능을 얻는 방법은?</target> -<source>SSH connections for directory reading:</source> -<target>디렉토리 읽기를 위한 SSH 연결:</target> - -<source>Suggested range: [1 - 10]</source> -<target>권장 범위: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>디렉토리 읽기를 위한 연결:</target> <source>SFTP channels per connection:</source> <target>연결 당 SFTP 채널 수:</target> @@ -1141,11 +1135,8 @@ The command is triggered if: <source>Detect server limit</source> <target>서버 한계 감지</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 연결 x 10 채널 = 20배 빠른 디렉토리 읽기</target> - <source>Select a directory on the server:</source> -<target>서버 디렉토리 선택:</target> +<target>서버 디렉터리 선택:</target> <source>Select Folder</source> <target>폴더 선택</target> @@ -1183,6 +1174,9 @@ The command is triggered if: <source>Bytes copied:</source> <target>복사된 바이트:</target> +<source>When finished:</source> +<target>완료 시:</target> + <source>Close</source> <target>닫기</target> @@ -1195,15 +1189,18 @@ The command is triggered if: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>직접 지켜보지 않는 자동 동기화의 경우, 배치 파일을 만듭니다. 시작하려면 파일을 더블 클릭하거나 작업 플래너에서 일정을 만드십시오: %x</target> -<source>&Stop</source> -<target>중지(&S)</target> +<source>Run minimized</source> +<target>최소화 실행</target> + +<source>&Show error dialog</source> +<target>오류 대화 상자 표시(&S)</target> + +<source>&Cancel</source> +<target>취소(&C)</target> <source>Stop synchronization at first error</source> <target>첫 오류 발생 시 동기화 중지</target> -<source>Run minimized</source> -<target>최소화 실행</target> - <source>Save log:</source> <target>로그 저장:</target> @@ -1234,14 +1231,14 @@ This guarantees a consistent state even in case of a serious error. 이는 심각한 오류 발생시에도 일관된 상태 유지를 보장합니다. </target> -<source>(recommended)</source> -<target>(권장)</target> +<source>recommended</source> +<target>추천(맞춤)</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> -<target>Volume Shadow Copy Service를 사용하여 공유 또는 잠긴 파일 복사.</target> +<target>볼륨 섀도 복사본 서비스를 사용하여 공유 또는 잠긴 파일 복사.</target> -<source>(requires administrator rights)</source> -<target>(관리자 권한 필요)</target> +<source>requires administrator rights</source> +<target>관리자 권한 필요</target> <source>Transfer file and folder permissions.</source> <target>파일 및 폴더 권한 전송.</target> @@ -1273,14 +1270,17 @@ This guarantees a consistent state even in case of a serious error. <source>Source code written in C++ using:</source> <target>소스코드는 C++ 언어로 아래 툴을 사용하여 작성되었습니다:</target> -<source>Donation details</source> -<target>기부 관련 세부정보</target> - <source>If you like FreeFileSync:</source> <target>FreeFileSync를 위한 기부:</target> -<source>Donate with PayPal</source> -<target>PayPal로 기부하기</target> +<source>Support with a donation</source> +<target>기부금 지원</target> + +<source>Donation details</source> +<target>기부 관련 세부정보</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>관리자가 자동 업데이터를 비활성화했습니다.</target> <source>Feedback and suggestions are welcome</source> <target>모든 의견 및 건의/제안을 환영합니다</target> @@ -1318,7 +1318,7 @@ This guarantees a consistent state even in case of a serious error. <source>Activate offline</source> <target>오프라인 활성화</target> -<source>Save as Batch Job</source> +<source>Save as a Batch Job</source> <target>일괄 작업으로 저장</target> <source>Delete Items</source> @@ -1357,11 +1357,17 @@ This guarantees a consistent state even in case of a serious error. <source>Overview</source> <target>개요</target> +<source>Show "%x"</source> +<target>"%x" 표시</target> + <source>&Show details</source> <target>세부정보 표시(&S)</target> -<source>A new version of FreeFileSync is available:</source> -<target>FreeFileSync 신규 버전 출시:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x 버전 출시!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>설치 파일이 손상되었습니다. FreeFileSync를 다시 설치하십시오.</target> <source>Local path not available for %x.</source> <target>%x에서 로컬 경로를 사용할 수 없습니다.</target> @@ -1385,7 +1391,7 @@ This guarantees a consistent state even in case of a serious error. <pluralform>%x directories</pluralform> </source> <target> -<pluralform>%x개 디렉토리</pluralform> +<pluralform>%x개 디렉터리</pluralform> </target> <source> @@ -1449,9 +1455,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>시간간격(타임스팬) 선택...</target> -<source>Show "%x"</source> -<target>"%x" 표시</target> - <source>Last session</source> <target>마지막 세션</target> @@ -1551,18 +1554,6 @@ This guarantees a consistent state even in case of a serious error. <source>Searching for program updates...</source> <target>프로그램 업데이트 검색 중...</target> -<source>Close progress dialog</source> -<target>진행 표시 창 닫기</target> - -<source>Log off</source> -<target>로그오프</target> - -<source>Standby</source> -<target>대기</target> - -<source>Shut down</source> -<target>종료</target> - <source>Paused</source> <target>일시정지 중</target> @@ -1593,18 +1584,21 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>로그</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>설치 파일이 손상되었습니다. FreeFileSync를 다시 설치하십시오.</target> - <source>Thank you, %x, for your donation and support!</source> <target>%x님의 기부와 지원에 감사드립니다!</target> +<source>Recommended range:</source> +<target>권장 범위:</target> + <source>Password:</source> <target>비밀번호:</target> <source>Key password:</source> <target>키 비밀번호:</target> +<source>Please enter a file path.</source> +<target>파일 경로를 입력하세요.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1716,6 +1710,15 @@ This guarantees a consistent state even in case of a serious error. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>삭제 되거나 덮어 쓴 파일을 휴지통에 보관</target> + +<source>Delete and overwrite files permanently</source> +<target>영구적으로 파일 삭제 및 덮어 쓰기</target> + +<source>Move files to a user-defined folder</source> +<target>사용자 정의 폴더로 파일 이동</target> + <source>Replace</source> <target>대체</target> @@ -1728,6 +1731,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>각 파일 이름마다 타임 스탬프 추가</target> +<source>On completion:</source> +<target>완료 시:</target> + +<source>On errors:</source> +<target>오류 발생 시:</target> + +<source>On success:</source> +<target>성공 시:</target> + <source>Main config</source> <target>주요 설정</target> @@ -1749,9 +1761,6 @@ This guarantees a consistent state even in case of a serious error. <source>Name</source> <target>이름</target> -<source>Items</source> -<target>항목</target> - <source>Percentage</source> <target>퍼센티지(%)</target> @@ -1813,7 +1822,7 @@ This guarantees a consistent state even in case of a serious error. <target>%x에 대한 장치 알림 등록을 할 수 없습니다.</target> <source>Cannot monitor directory %x.</source> -<target>디렉토리 %x을(를) 모니터링 할 수 없습니다.</target> +<target>디렉터리 %x을(를) 모니터링 할 수 없습니다.</target> <source>The file is locked by another process:</source> <target>파일이 다른 프로세스에 의해 잠겨 있습니다:</target> @@ -1831,7 +1840,7 @@ This guarantees a consistent state even in case of a serious error. <target>%x에서 %y(으)로의 권한을 복사할 수 없습니다.</target> <source>%x is not a regular directory name.</source> -<target>%x(은)는 일반 디렉토리 이름이 아닙니다.</target> +<target>%x(은)는 일반 디렉터리 이름이 아닙니다.</target> <source>Cannot copy file %x to %y.</source> <target>파일 %x을(를) %y(으)로 복사할 수 없습니다.</target> @@ -1878,6 +1887,9 @@ This guarantees a consistent state even in case of a serious error. <source>Cannot change process I/O priorities.</source> <target>프로세스 I/O 우선순위 변경을 할 수 없습니다.</target> +<source>Unable to shut down the system.</source> +<target>시스템을 종료할 수 없습니다.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>폴더 %x에 관한 휴지통 실패 확인 중.</target> @@ -1885,7 +1897,7 @@ This guarantees a consistent state even in case of a serious error. <target>다음 XML 요소를 읽을 수 없습니다:</target> <source>Configuration file %x is incomplete. The missing elements will be set to their default values.</source> -<target>구성 파일 %x(이)가 불완전합니다. 누락된 요소는 기본 값으로 설정됩니다.</target> +<target>구성 파일 %x이(가) 불완전합니다. 누락된 요소는 기본 값으로 설정됩니다.</target> <source>Prepare installation</source> <target>설치 준비</target> @@ -1902,9 +1914,6 @@ This guarantees a consistent state even in case of a serious error. <source>Portable</source> <target>포터블</target> -<source>recommended</source> -<target>권장</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>"%APPDATA%\FreeFileSync"에 설정 저장</target> @@ -1915,7 +1924,7 @@ This guarantees a consistent state even in case of a serious error. <target>익스플로러 컨텍스트 메뉴 항목 생성</target> <source>Save settings in installation directory</source> -<target>설치 디렉토리에 설정 저장</target> +<target>설치 디렉터리에 설정 저장</target> <source>Do not write to Registry</source> <target>레지스트리에 기록 안 함</target> @@ -1924,7 +1933,7 @@ This guarantees a consistent state even in case of a serious error. <target>파일만 복사</target> <source>Choose a directory for installation:</source> -<target>설치할 디렉토리를 선택하세요:</target> +<target>설치할 디렉터리를 선택하세요:</target> <source>Create shortcuts:</source> <target>바로가기 생성:</target> @@ -1956,8 +1965,8 @@ This guarantees a consistent state even in case of a serious error. <source>Edit with FreeFileSync</source> <target>FreeFileSync로 편집</target> -<source>The portable version cannot install into the selected folder.</source> -<target>휴대용 버전은 선택한 폴더에 설치할 수 없습니다.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>FreeFileSync 휴대용 버전은 %x의 하위 폴더에 설치할 수 없습니다.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>로컬 설치 유형을 선택하거나 설치할 다른 폴더를 선택하십시오.</target> diff --git a/FreeFileSync/Build/Languages/lithuanian.lng b/FreeFileSync/Build/Languages/lithuanian.lng index 572cf40a..6e8b1ed5 100755 --- a/FreeFileSync/Build/Languages/lithuanian.lng +++ b/FreeFileSync/Build/Languages/lithuanian.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Tikrinamas šiukšliadėžės prieinamumas aplankui %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Šiuklšliadėžė šiems aplankams yra nepasiekiama. Failai bus negrįžtamai ištrinti:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>Šiukšlinė šių aplankų nepalaiko. Bus neįmanoma atkurti ištrintų arba perrašytų failų:</target> <source>An exception occurred</source> <target>Atsirado išimtis</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Sintaksė:</target> -<source>global config file:</source> -<target>bendrinis konfigūracinis failas:</target> - <source>config files:</source> <target>konfigūracinis failas:</target> <source>directory</source> <target>katalogas</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Kelias iki alternatyvaus GlobalSettings.xml failo.</target> +<source>global config file:</source> +<target>bendrinis konfigūracinis failas:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Neribotas kiekis FreeFileSync .ffs_gui ir/arba .ffs_batch konfigūracinių failų.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Bet koks skaičius alternatyvių katalogų grupuojams tik su vienu konfigūraciniu failu.</target> -<source>Open configuration for editing without executing it.</source> -<target>Atidaryti parinktis ir keisti jų konfiguraciją, ne aktyvuojant jų.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Nepaleidžiant atidaryti pasirinktą konfiguraciją tiktai redagavimui.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Kelias iki alternatyvaus GlobalSettings.xml failo.</target> <source>Cannot find the following folders:</source> <target>Nepavyksta rasti šių aplankų:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Atnaujinti atributus dešinėje</target> -<source>Cannot write file %x.</source> -<target>Nepavyksta įrašyti failo %x.</target> +<source>Cannot read file %x.</source> +<target>Nepavyksta nuskaityti failo %x.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Esamas: %y baitai <source>Operation not supported for different base folder types.</source> <target>Veiksmas yra nesuderinamas dėl skirtingų aplankų savybių.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Nepavyko nukopijuoti simbolinės nuorodos %x į %y.</target> +<source>Cannot write file %x.</source> +<target>Nepavyksta įrašyti failo %x.</target> <source>Cannot move file %x to %y.</source> <target>Nepavyksta perkelti failo %x į %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Nepavyko nukopijuoti simbolinės nuorodos %x į %y.</target> + <source>Unable to connect to %x.</source> <target>Nepavyko prisijungti prie %x.</target> @@ -294,9 +297,6 @@ Esamas: %y baitai <source>Cannot read file attributes of %x.</source> <target>Nepavyko perskaityti failo %x atributų.</target> -<source>Cannot read file %x.</source> -<target>Nepavyksta nuskaityti failo %x.</target> - <source>Cannot create directory %x.</source> <target>Nepavyksta sukurti katalogo %x.</target> @@ -601,8 +601,8 @@ Komanda inicijuojama jei: <source>Automated Synchronization</source> <target>Automatinis Suvienodinimas</target> -<source>The following path does not support directory monitoring:</source> -<target>Ši nuoroda nepalaiko katalogo stebėjimo:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>%x protokolas nepalaiko katalogo stebėjimo:</target> <source>Directory monitoring active</source> <target>Katalogų stebėjimas yra aktyvus</target> @@ -718,8 +718,8 @@ Komanda inicijuojama jei: <source>Base folder:</source> <target>Pagrindinis aplankas:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>>Versijų valdymo aplankas bus suvienodintas todėl, kad jis turi pagrindinį aplanką.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>Versijų aplankas yra pagrindiniame aplanke.</target> <source>Synchronizing folder pair:</source> <target>Suvienodinama aplankų pora:</target> @@ -733,6 +733,15 @@ Komanda inicijuojama jei: <source>job name</source> <target>Užduoties pavadinimas</target> +<source>Show summary</source> +<target>Rodyti suvestinę</target> + +<source>Sleep</source> +<target>Miego režimas</target> + +<source>Shut down</source> +<target>Išjungti kompiuterį</target> + <source>Synchronization stopped</source> <target>Suvienodinimas sustabdytas</target> @@ -754,6 +763,9 @@ Komanda inicijuojama jei: <source>Synchronization completed successfully</source> <target>Suvienodinimas sėkmingai baigtas</target> +<source>Executing command %x</source> +<target>Vykdyti komandą %x</target> + <source>Cleaning up old log files...</source> <target>Išvalomi seni žurnalo įrašai...</target> @@ -782,8 +794,8 @@ Komanda inicijuojama jei: <pluralform>Automatinis pakartojimas po %x sekundžių...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Ignoruoti tolimesnes klaidas</target> +<source>Ignore &all</source> +<target>Ignoruoti &visus</target> <source>Retrying operation...</source> <target>Paleisti veiksmą iš naujo...</target> @@ -890,12 +902,12 @@ Komanda inicijuojama jei: <source>&Find...</source> <target>&Ieškoti...</target> -<source>&Reset layout</source> -<target>&Išnaujo nustatyti išdėstymą</target> - <source>&Export file list...</source> <target>&Eksportuoti failų sąrašą...</target> +<source>&Reset layout</source> +<target>&Išnaujo nustatyti išdėstymą</target> + <source>&Tools</source> <target>&Įrankiai</target> @@ -1031,9 +1043,6 @@ Komanda inicijuojama jei: <source>C&lear</source> <target>&Išvalyti</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Aptikti suvienodinimo kryptis, naudojant duomenų bazės failus</target> - <source>Detect moved files</source> <target>Rasti perkeltus failus</target> @@ -1054,38 +1063,23 @@ Komanda inicijuojama jei: <source>&Recycle bin</source> <target>&Šiukšliadėžė</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Padaryti šiukšlių dėžėje esančių ištrintų ar perrašytų failų atsarginę kopiją</target> - <source>&Permanent</source> <target>&Pastovus</target> -<source>Delete or overwrite files permanently</source> -<target>Trinti ar perrašyti failus visam laikui</target> - <source>&Versioning</source> <target>&Atsarginės versijos kūrimas</target> -<source>Move files to a user-defined folder</source> -<target>Perkelti failus į vartotojo nustatytą katalogą</target> - <source>Naming convention:</source> <target>Pavadinimų taisyklės:</target> -<source>Handle errors:</source> -<target>Klaidų taisymas:</target> - -<source>&Pop-up</source> -<target>&Iškylančiame</target> +<source>&Ignore errors</source> +<target>&Ignoruoti klaidas</target> <source>Show pop-up on errors or warnings</source> <target>Rodyti pranešimą esant klaidoms ar perspėjimams</target> -<source>Hide all error and warning messages</source> -<target>Slėpti visus klaidų ir perspėjimų pranešimus</target> - -<source>On completion:</source> -<target>Pasibaigus:</target> +<source>Run a command after synchronization:</source> +<target>Po sinchronizavimo vykdyti komandą:</target> <source>OK</source> <target>Gerai</target> @@ -1123,6 +1117,9 @@ Komanda inicijuojama jei: <source>&Key file</source> <target>&Rakto failas</target> +<source>&SSH agent</source> +<target>&SSH-agent'as</target> + <source>User name:</source> <target>Vartotojo vardas:</target> @@ -1141,11 +1138,8 @@ Komanda inicijuojama jei: <source>How to get best performance?</source> <target>Kaip gauti geriausius rezultatus?</target> -<source>SSH connections for directory reading:</source> -<target>Aplanko nuskaitymas naudojant SSH jungtį:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Rekomenduojamas diapazonas: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>Prisijungimai katalogų nuskaitymui:</target> <source>SFTP channels per connection:</source> <target>SFTP kanalai per jungtį:</target> @@ -1153,9 +1147,6 @@ Komanda inicijuojama jei: <source>Detect server limit</source> <target>Aptikti serverio ribas</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 jungtys x 10 kanalų = 20 kartų greitesnis aplanko nuskaitymas</target> - <source>Select a directory on the server:</source> <target>Pažymėti katalogą serveryje:</target> @@ -1195,6 +1186,9 @@ Komanda inicijuojama jei: <source>Bytes copied:</source> <target>Nukopijuota baitų:</target> +<source>When finished:</source> +<target>Kai pabaigta:</target> + <source>Close</source> <target>Uždaryti</target> @@ -1207,15 +1201,18 @@ Komanda inicijuojama jei: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Sukurti paleidimo failą suvienodinimui be priežiūros. Norint jį paleisti reikia paspausti and failo du kartus pele arba nustatyti su užduočių planuotoju: %x</target> -<source>&Stop</source> -<target>&Sustabdyti</target> +<source>Run minimized</source> +<target>Vykdyti sumažinus</target> + +<source>&Show error dialog</source> +<target>&Rodyti klaidų dialogą</target> + +<source>&Cancel</source> +<target>&Uždaryti</target> <source>Stop synchronization at first error</source> <target>Stabdyti suvienodinimą, pirmai klaidai įvykus</target> -<source>Run minimized</source> -<target>Vykdyti sumažinus</target> - <source>Save log:</source> <target>Išsaugoti žurnalą:</target> @@ -1246,14 +1243,14 @@ Kopijuoti į laikiną failą (*.ffs_tmp) prieš pakeičiant parinktis. Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. </target> -<source>(recommended)</source> -<target>(rekomenduojama)</target> +<source>recommended</source> +<target>rekomenduojama</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Kopijuoti bendrintus arba užrakintus failus naudojant duomenų šešėlinės kopijos paslaugą.</target> -<source>(requires administrator rights)</source> -<target>(administratoriaus teisės būtinos)</target> +<source>requires administrator rights</source> +<target>reikalingos administratoriaus teisės</target> <source>Transfer file and folder permissions.</source> <target>Failų ir aplankų perkėlimo leidimai.</target> @@ -1285,14 +1282,17 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>Source code written in C++ using:</source> <target>Šaltinio kodas parašytas su C++ naudojant:</target> -<source>Donation details</source> -<target>Išsamiau apie aukojimą</target> - <source>If you like FreeFileSync:</source> <target>Jei Jums patinka FreeFileSync:</target> -<source>Donate with PayPal</source> -<target>Paremkite per PayPal</target> +<source>Support with a donation</source> +<target>Pailaikymas su paaukojimu</target> + +<source>Donation details</source> +<target>Išsamiau apie aukojimą</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>Automatinis atnaujinimas yra išjungtas administratoriaus.</target> <source>Feedback and suggestions are welcome</source> <target>Nuomonė ir patarimai laukiami</target> @@ -1330,8 +1330,8 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>Activate offline</source> <target>Aktyvuoti neprisijungus</target> -<source>Save as Batch Job</source> -<target>Išsaugoti kaip užduočių paketą</target> +<source>Save as a Batch Job</source> +<target>Išsuagoti kaip paketinį failą</target> <source>Delete Items</source> <target>Pašalinti elementai</target> @@ -1369,11 +1369,17 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>Overview</source> <target>Apžvalga</target> +<source>Show "%x"</source> +<target>Rodyti "%x"</target> + <source>&Show details</source> <target>&Rodyti išsamiai</target> -<source>A new version of FreeFileSync is available:</source> -<target>Yra nauja FreeFileSync versija:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x yra pasiekiamas!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Įdiegimo failai yra pažeisti. Prašome įdiegti iš naujo FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Nerastas %x vietinis kelias.</target> @@ -1469,9 +1475,6 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>Select time span...</source> <target>Pasirinkti laiko tarpą...</target> -<source>Show "%x"</source> -<target>Rodyti "%x"</target> - <source>Last session</source> <target>Paskutinė sesija</target> @@ -1571,18 +1574,6 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>Searching for program updates...</source> <target>Ieškoma programos atnaujinimų...</target> -<source>Close progress dialog</source> -<target>Uždaryti dialogo langą</target> - -<source>Log off</source> -<target>Atsijungti</target> - -<source>Standby</source> -<target>Budėjimo režimas</target> - -<source>Shut down</source> -<target>Išjungti kompiuterį</target> - <source>Paused</source> <target>Pristabdyta</target> @@ -1613,18 +1604,21 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>Log</source> <target>Žurnalas</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Įdiegimo failai yra pažeisti. Prašome įdiegti iš naujo FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Ačiū, %x, už jūsų auką, bei parėmimą!</target> +<source>Recommended range:</source> +<target>Rekomenduojamas intervalas:</target> + <source>Password:</source> <target>Slaptažodis:</target> <source>Key password:</source> <target>Rakto slaptažodis:</target> +<source>Please enter a file path.</source> +<target>Prašome įvesti failo kelią.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1742,6 +1736,15 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Išlaikyti ištruntus ir perrašytus failus šiukšlinėje</target> + +<source>Delete and overwrite files permanently</source> +<target>Ištrinti ir perrašyti failus negrįžtamai</target> + +<source>Move files to a user-defined folder</source> +<target>Perkelti failus į vartotojo nustatytą katalogą</target> + <source>Replace</source> <target>Pakeisti</target> @@ -1754,6 +1757,15 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>Append a time stamp to each file name</source> <target>Pridėti laiko žymę prie kiekvieno failo pavadinimo</target> +<source>On completion:</source> +<target>Pasibaigus:</target> + +<source>On errors:</source> +<target>Klaidos atvelu:</target> + +<source>On success:</source> +<target>Teisingai atlikus:</target> + <source>Main config</source> <target>Pagrindiniia parametrai</target> @@ -1775,9 +1787,6 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>Name</source> <target>Pavadinimas</target> -<source>Items</source> -<target>Pozicijos</target> - <source>Percentage</source> <target>Procentai</target> @@ -1910,6 +1919,9 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>Cannot change process I/O priorities.</source> <target>Nepavyksta pakeisti proceso I/O prioritetų.</target> +<source>Unable to shut down the system.</source> +<target>Nepavyko išjungti sistemos.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Tikrinama šiukšliadėžė. Failas %x nerastas.</target> @@ -1934,9 +1946,6 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>Portable</source> <target>Nešiojamas</target> -<source>recommended</source> -<target>rekomenduojama</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Išsaugoti nustatymus į "%APPDATA%\FreeFileSync"</target> @@ -1988,8 +1997,8 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>Edit with FreeFileSync</source> <target>Koreguoti su FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>Nešiojama versija negali būti įdiegta į pasirinktą aplanką.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>FreeFileSync kilnojama versija negali būti įdiegta į poaplankį %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Prašome pasirinkti vietinio įdiegimo metodą arba pakeiskite aplaką.</target> diff --git a/FreeFileSync/Build/Languages/norwegian.lng b/FreeFileSync/Build/Languages/norwegian.lng index 942d98c7..8fd5f8e0 100755 --- a/FreeFileSync/Build/Languages/norwegian.lng +++ b/FreeFileSync/Build/Languages/norwegian.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Sjekker papirkurvens tilgjengelighet for mappen %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Papirkurven kan ikke brukes til følgende mapper. Filene vil istedet bli slettet permanent:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>Papirkurven støttes ikke av følgende mapper. Slettede eller overskrevne filer kan ikke gjenopprettes:</target> <source>An exception occurred</source> <target>Et unntak oppstod</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Syntaks:</target> -<source>global config file:</source> -<target>global innstillingsfil:</target> - <source>config files:</source> <target>konfigurer filer:</target> <source>directory</source> <target>katalog</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Sti til en alternativ GlobalSettings.xml fil.</target> +<source>global config file:</source> +<target>global innstillingsfil:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Vilkårlig antall FreeFileSync .ffs_gui og/eller .ffs_batch innstillingsfiler.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Et ubegrenset antall alternative kataloger for maksimalt én konfigurasjonsfil.</target> -<source>Open configuration for editing without executing it.</source> -<target>Åpne konfigurasjon for redigering uten å utføre det.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Åpne den valgte konfigurasjonen bare for redigering uten å utføre den.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Sti til en alternativ GlobalSettings.xml fil.</target> <source>Cannot find the following folders:</source> <target>Kan ikke finne følgende mapper:</target> @@ -152,16 +152,16 @@ <target>Deaktivert</target> <source>Copy locked files</source> -<target>Kopier låste filer</target> +<target>Kopiér låste filer</target> <source>Copy file access permissions</source> -<target>Kopier adgangs-tillatelser</target> +<target>Kopiér adgangs-tillatelser</target> <source>File time tolerance</source> <target>Filtid toleranse</target> <source>Folder access timeout</source> -<target>Mappetilgange timeout</target> +<target>Tidsavbrudd for mappetilgang</target> <source>Run with background priority</source> <target>Kjør med bakgrunns-prioritet</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Oppdater attributter til høyre</target> -<source>Cannot write file %x.</source> -<target>Kan ikke opprette filen %x.</target> +<source>Cannot read file %x.</source> +<target>Kan ikke lese filen %x.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Faktisk: %y bytes <source>Operation not supported for different base folder types.</source> <target>Operasjonen støttes ikke for ulike typer basismapper.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Kan ikke kopiere symbolsk forbindelse %x til %y.</target> +<source>Cannot write file %x.</source> +<target>Kan ikke opprette filen %x.</target> <source>Cannot move file %x to %y.</source> <target>Kan ikke flytte filen %x til %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Kan ikke kopiere symbolsk forbindelse %x til %y.</target> + <source>Unable to connect to %x.</source> <target>Kan ikke koble til %x.</target> @@ -294,9 +297,6 @@ Faktisk: %y bytes <source>Cannot read file attributes of %x.</source> <target>Kan ikke lese filattributterne på %x.</target> -<source>Cannot read file %x.</source> -<target>Kan ikke lese filen %x.</target> - <source>Cannot create directory %x.</source> <target>Kan ikke lage katalog %x.</target> @@ -596,8 +596,8 @@ Kommandoen utføres hvis: <source>Automated Synchronization</source> <target>Automatisk synkronisering</target> -<source>The following path does not support directory monitoring:</source> -<target>Følgende sti støtter ikke katalogovervåking:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>%x-protokollen støtter ikke katalogovervåking:</target> <source>Directory monitoring active</source> <target>Katalog-overvåkning er aktiv</target> @@ -713,8 +713,8 @@ Kommandoen utføres hvis: <source>Base folder:</source> <target>Basemappe:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>Versjonsmappen synkroniseres fordi den finnes i en basemappe.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>Versjonsmappen er plassert i en basismappe.</target> <source>Synchronizing folder pair:</source> <target>Synkroniserer mappepar:</target> @@ -728,6 +728,15 @@ Kommandoen utføres hvis: <source>job name</source> <target>jobbnavn</target> +<source>Show summary</source> +<target>Vis sammendrag</target> + +<source>Sleep</source> +<target>Hvilemodus</target> + +<source>Shut down</source> +<target>Avslutt</target> + <source>Synchronization stopped</source> <target>Synkroniseringen stoppet</target> @@ -749,6 +758,9 @@ Kommandoen utføres hvis: <source>Synchronization completed successfully</source> <target>Synkronisering gjennomført uten feil</target> +<source>Executing command %x</source> +<target>Utfør kommandoen %x</target> + <source>Cleaning up old log files...</source> <target>Fjerner gamle loggfiler...</target> @@ -776,8 +788,8 @@ Kommandoen utføres hvis: <pluralform>Prøver igjen om %x sekunder...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Ignorer etterfølgende feil</target> +<source>Ignore &all</source> +<target>Ignorer &alt</target> <source>Retrying operation...</source> <target>Prøver igjen...</target> @@ -884,12 +896,12 @@ Kommandoen utføres hvis: <source>&Find...</source> <target>&Finn...</target> -<source>&Reset layout</source> -<target>&Tilbakestill oppsettet</target> - <source>&Export file list...</source> <target>&Eksporter filliste...</target> +<source>&Reset layout</source> +<target>&Tilbakestill oppsettet</target> + <source>&Tools</source> <target>&Verktøy</target> @@ -1025,9 +1037,6 @@ Kommandoen utføres hvis: <source>C&lear</source> <target>F&jern</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Gjennkjenn synkroniserings-retninger ved hjelp av databasefiler</target> - <source>Detect moved files</source> <target>Gjenkjenn flyttede filer</target> @@ -1048,38 +1057,23 @@ Kommandoen utføres hvis: <source>&Recycle bin</source> <target>&Papirkurv</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Backup slettede og overskrevne filer i papirkurven</target> - <source>&Permanent</source> <target>&Permanent</target> -<source>Delete or overwrite files permanently</source> -<target>Slett eller overskriv filer permanent</target> - <source>&Versioning</source> <target>&Versjons</target> -<source>Move files to a user-defined folder</source> -<target>Flytt filer til en brukerdefinert mappe</target> - <source>Naming convention:</source> <target>Navne-regler:</target> -<source>Handle errors:</source> -<target>Feilhåndtering:</target> - -<source>&Pop-up</source> -<target>&Sprett-opp</target> +<source>&Ignore errors</source> +<target>&Ignorer feil</target> <source>Show pop-up on errors or warnings</source> <target>Vis feilmeldinger og advarsler</target> -<source>Hide all error and warning messages</source> -<target>Skjul alle feilmeldinger og advarsler</target> - -<source>On completion:</source> -<target>Når gjennomført:</target> +<source>Run a command after synchronization:</source> +<target>Kjør en kommando etter synkronisering:</target> <source>OK</source> <target>OK</target> @@ -1117,6 +1111,9 @@ Kommandoen utføres hvis: <source>&Key file</source> <target>&Nøkkelfil</target> +<source>&SSH agent</source> +<target>&SSH agent</target> + <source>User name:</source> <target>Brukernavn:</target> @@ -1135,11 +1132,8 @@ Kommandoen utføres hvis: <source>How to get best performance?</source> <target>Hvordan få best mulig ytelse?</target> -<source>SSH connections for directory reading:</source> -<target>SSH-tilkoblinger for kataloglesing:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Foreslått område: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>Tilkoblinger for kataloglesing:</target> <source>SFTP channels per connection:</source> <target>SFTP kanaler per tilkobling:</target> @@ -1147,9 +1141,6 @@ Kommandoen utføres hvis: <source>Detect server limit</source> <target>Oppdag server grensa</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 tilkoblinger x 10 kanaler = 20 ganger raskere katalog-lesing</target> - <source>Select a directory on the server:</source> <target>Velg en katalog på serveren:</target> @@ -1189,6 +1180,9 @@ Kommandoen utføres hvis: <source>Bytes copied:</source> <target>Byte kopiert:</target> +<source>When finished:</source> +<target>Når ferdig:</target> + <source>Close</source> <target>Lukk</target> @@ -1201,15 +1195,18 @@ Kommandoen utføres hvis: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Lag en batchfil til automatisk synkronisering. Start ved å dobbeltklikke på filen eller planlegg via oppgaveplanlegger: %x</target> -<source>&Stop</source> -<target>&Stopp</target> +<source>Run minimized</source> +<target>Kjør minimert</target> + +<source>&Show error dialog</source> +<target>& Vis feildialogboksen</target> + +<source>&Cancel</source> +<target>&Avbryt</target> <source>Stop synchronization at first error</source> <target>Stopp synkronisering ved første feil</target> -<source>Run minimized</source> -<target>Kjør minimert</target> - <source>Save log:</source> <target>Lagre logg:</target> @@ -1240,14 +1237,14 @@ Kopiér til en midlertidig fil (*.ffs_tmp) før overskriving. Sikrer prosessen ved alvorlige feil. </target> -<source>(recommended)</source> -<target>(anbefalt)</target> +<source>recommended</source> +<target>anbefalt</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Kopiér delte eller låste filer ved å bruke Volume Shadow kopiering.</target> -<source>(requires administrator rights)</source> -<target>(krever administrator-rettigheter)</target> +<source>requires administrator rights</source> +<target>krever administratorrettigheter</target> <source>Transfer file and folder permissions.</source> <target>Overfør fil- og mappe-tillatelser.</target> @@ -1279,14 +1276,17 @@ Sikrer prosessen ved alvorlige feil. <source>Source code written in C++ using:</source> <target>Kildekoden er skrevet i C++ med hjelp fra:</target> -<source>Donation details</source> -<target>Donasjon detaljer</target> - <source>If you like FreeFileSync:</source> <target>Hvis du liker FreeFileSync:</target> -<source>Donate with PayPal</source> -<target>Donér med PayPal</target> +<source>Support with a donation</source> +<target>Støtte med en donasjon</target> + +<source>Donation details</source> +<target>Donasjon detaljer</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>Den automatiske oppdateringen ble deaktivert av administratoren.</target> <source>Feedback and suggestions are welcome</source> <target>Tilbakemeldinger og forslag er ønsket</target> @@ -1324,8 +1324,8 @@ Sikrer prosessen ved alvorlige feil. <source>Activate offline</source> <target>Aktivér frakoplet</target> -<source>Save as Batch Job</source> -<target>Lagre som batchfil</target> +<source>Save as a Batch Job</source> +<target>Lagre som en batchjobb</target> <source>Delete Items</source> <target>Slett elementene</target> @@ -1358,16 +1358,22 @@ Sikrer prosessen ved alvorlige feil. <target>Vis innstillinger</target> <source>Configuration</source> -<target>konfigurasjon</target> +<target>Konfigurasjon</target> <source>Overview</source> <target>Oversikt</target> +<source>Show "%x"</source> +<target>Vis "%x"</target> + <source>&Show details</source> <target>&Vis detaljer</target> -<source>A new version of FreeFileSync is available:</source> -<target>En ny versjon av FreeFileSync er tilgjengelig:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x er tilgjengelig!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Installasjonsfilene er ødelagte. Installer FreeFileSync på nytt.</target> <source>Local path not available for %x.</source> <target>Lokal sti er ikke tilgjengelig for %x.</target> @@ -1448,20 +1454,17 @@ Sikrer prosessen ved alvorlige feil. <target>Vis ikoner:</target> <source>Small</source> -<target>Små</target> +<target>Liten</target> <source>Medium</source> <target>Medium</target> <source>Large</source> -<target>Store</target> +<target>Stor</target> <source>Select time span...</source> <target>Velg tidsinterval...</target> -<source>Show "%x"</source> -<target>Vis "%x"</target> - <source>Last session</source> <target>Siste oppgave</target> @@ -1561,18 +1564,6 @@ Sikrer prosessen ved alvorlige feil. <source>Searching for program updates...</source> <target>Søker etter program-oppdateringer...</target> -<source>Close progress dialog</source> -<target>Lukk dialogen</target> - -<source>Log off</source> -<target>Logg av</target> - -<source>Standby</source> -<target>Standby</target> - -<source>Shut down</source> -<target>Avslutt</target> - <source>Paused</source> <target>Pauset</target> @@ -1603,18 +1594,21 @@ Sikrer prosessen ved alvorlige feil. <source>Log</source> <target>Logg</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Installasjonsfilene er ødelagte. Installer FreeFileSync på nytt.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Takk, %x, for ditt bidrag og støtte!</target> +<source>Recommended range:</source> +<target>Anbefalt område:</target> + <source>Password:</source> <target>Passord:</target> <source>Key password:</source> <target>Nøkkelpassord:</target> +<source>Please enter a file path.</source> +<target>Vennligst skriv inn en filbane.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1729,6 +1723,15 @@ Sikrer prosessen ved alvorlige feil. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Behold slettede og overskrevne filer i papirkurven</target> + +<source>Delete and overwrite files permanently</source> +<target>Slett og overskriv filer permanent</target> + +<source>Move files to a user-defined folder</source> +<target>Flytt filer til en brukerdefinert mappe</target> + <source>Replace</source> <target>Erstatt</target> @@ -1741,6 +1744,15 @@ Sikrer prosessen ved alvorlige feil. <source>Append a time stamp to each file name</source> <target>Legg til tidsstempel til hvert filnavn</target> +<source>On completion:</source> +<target>Når gjennomført:</target> + +<source>On errors:</source> +<target>Ved feil:</target> + +<source>On success:</source> +<target>Ved suksess:</target> + <source>Main config</source> <target>Hovedinnstilling</target> @@ -1762,9 +1774,6 @@ Sikrer prosessen ved alvorlige feil. <source>Name</source> <target>Navn</target> -<source>Items</source> -<target>Elementer</target> - <source>Percentage</source> <target>Prosent</target> @@ -1894,6 +1903,9 @@ Sikrer prosessen ved alvorlige feil. <source>Cannot change process I/O priorities.</source> <target>Kan ikke endre I/O prioriteter.</target> +<source>Unable to shut down the system.</source> +<target>Kan ikke slå av systemet.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Det å sjekke papirkurven gikk galt for mappen %x.</target> @@ -1918,9 +1930,6 @@ Sikrer prosessen ved alvorlige feil. <source>Portable</source> <target>Portabel</target> -<source>recommended</source> -<target>anbefalt</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Lagre innstillinger til "%APPDATA%\FreeFileSync"</target> @@ -1972,8 +1981,8 @@ Sikrer prosessen ved alvorlige feil. <source>Edit with FreeFileSync</source> <target>Rediger med FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>Den bærbare versjonen kan ikke installere i den valgte mappen.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>Den bærbare versjonen av FreeFileSync kan ikke installeres i en undermappe av %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Velg den lokale installasjonstype eller velge en annen mappe for installasjon.</target> diff --git a/FreeFileSync/Build/Languages/polish.lng b/FreeFileSync/Build/Languages/polish.lng index 16609a65..6ba18981 100755 --- a/FreeFileSync/Build/Languages/polish.lng +++ b/FreeFileSync/Build/Languages/polish.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Sprawdzanie dostępności kosza dla katalogu %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Dla następujących katalogów kosz nie jest dostępny. Pliki zostaną usunięte bez możliwości ich przywrócenia:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>Kosz systemowy nie jest wspierany przez poniższe foldery. Usunięte i nadpisane pliki nie będą mogły być przywrócone:</target> <source>An exception occurred</source> <target>Wystąpił wyjątek</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Składnia:</target> -<source>global config file:</source> -<target>globalny plik konfiguracyjny:</target> - <source>config files:</source> <target>pliki konfiguracyjne:</target> <source>directory</source> <target>katalog</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Alternatywna ścieżka do pliku GlobalSettings.xml.</target> +<source>global config file:</source> +<target>globalny plik konfiguracyjny:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Dowolna ilość plików konfiguracyjnych FreeFileSync .ffs_gui/.ffs_batch.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Dowolna liczba alternatywnych par katalogów dla najwyżej jednego pliku konfiguracyjnego.</target> -<source>Open configuration for editing without executing it.</source> -<target>Otwórz konfigurację do edycji.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Otwórz wybraną konfigurację tylko do edycji (bez uruchomienia).</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Alternatywna ścieżka do pliku GlobalSettings.xml.</target> <source>Cannot find the following folders:</source> <target>Nie można znaleźć następujących katalogów:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Aktualizuj atrybuty po prawej stronie</target> -<source>Cannot write file %x.</source> -<target>Nie można zapisać pliku %x.</target> +<source>Cannot read file %x.</source> +<target>Nie można odczytać pliku %x.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Przesłany: %y bajtów <source>Operation not supported for different base folder types.</source> <target>Operacja nie jest wspierana dla różnych typów katalogów.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Nie można skopiować linku symbolicznego %x do %y.</target> +<source>Cannot write file %x.</source> +<target>Nie można zapisać pliku %x.</target> <source>Cannot move file %x to %y.</source> <target>Nie można przenieść pliku %x do %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Nie można skopiować linku symbolicznego %x do %y.</target> + <source>Unable to connect to %x.</source> <target>Błąd połączenia do %x.</target> @@ -291,9 +294,6 @@ Przesłany: %y bajtów <source>Cannot read directory %x.</source> <target>Nie można odczytać katalogu %x.</target> -<source>Cannot read file %x.</source> -<target>Nie można odczytać pliku %x.</target> - <source>Cannot read file attributes of %x.</source> <target>Nie można odczytać atrybutów pliku %x.</target> @@ -601,8 +601,8 @@ Komenda jest wykonywana gdy: <source>Automated Synchronization</source> <target>Automatyczna synchronizacja</target> -<source>The following path does not support directory monitoring:</source> -<target>Następująca ścieżka nie wspiera monitorowania katalogów:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>Protokuł %x nie wspiera monitorowania katalogów:</target> <source>Directory monitoring active</source> <target>Monitorowanie katalogów aktywne</target> @@ -718,8 +718,8 @@ Komenda jest wykonywana gdy: <source>Base folder:</source> <target>Katalog źródłowy:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>Katalog potrzebny do wersjonowania będzie zsynchronizowany ponieważ zawiera się w katalogu bazowym.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>Katalog wersjonowania znajduje się w katalogu bazowym.</target> <source>Synchronizing folder pair:</source> <target>Synchronizacja katalgów:</target> @@ -733,6 +733,15 @@ Komenda jest wykonywana gdy: <source>job name</source> <target>nazwa zadania</target> +<source>Show summary</source> +<target>Pokaż podsumowanie</target> + +<source>Sleep</source> +<target>Stan uśpienia</target> + +<source>Shut down</source> +<target>Wyłącz komputer</target> + <source>Synchronization stopped</source> <target>Synchronizacja przerwana</target> @@ -754,6 +763,9 @@ Komenda jest wykonywana gdy: <source>Synchronization completed successfully</source> <target>Synchronizacja zakończona pomyślnie</target> +<source>Executing command %x</source> +<target>Wykonywanie polecenia %x</target> + <source>Cleaning up old log files...</source> <target>Usuwanie starych plików logów...</target> @@ -782,8 +794,8 @@ Komenda jest wykonywana gdy: <pluralform>Automatyczne ponowienie za %x sekund...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Ignoruj kolejne błędy</target> +<source>Ignore &all</source> +<target>Ignoruj &wszystkie</target> <source>Retrying operation...</source> <target>Ponawianie operacji...</target> @@ -890,12 +902,12 @@ Komenda jest wykonywana gdy: <source>&Find...</source> <target>&Szukaj...</target> -<source>&Reset layout</source> -<target>&Resetuj układ okien</target> - <source>&Export file list...</source> <target>&Eksportuj listę plików...</target> +<source>&Reset layout</source> +<target>&Resetuj układ okien</target> + <source>&Tools</source> <target>&Narzędzia</target> @@ -1031,9 +1043,6 @@ Komenda jest wykonywana gdy: <source>C&lear</source> <target>&Wyczyść</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Kierunki synchronizacji określane są przy pomocy bazy danych</target> - <source>Detect moved files</source> <target>Wykryj przeniesione pliki</target> @@ -1054,38 +1063,23 @@ Komenda jest wykonywana gdy: <source>&Recycle bin</source> <target>&Kosz systemowy</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Przechowuj pliki, które zostały usunięte lub nadpisane w koszu</target> - <source>&Permanent</source> <target>&Permanentne</target> -<source>Delete or overwrite files permanently</source> -<target>Usuń lub nadpisz pliki na stałe</target> - <source>&Versioning</source> <target>&Wersjonowanie</target> -<source>Move files to a user-defined folder</source> -<target>Przenieś pliki do katalogu zdefiniowanego przez użytkownika</target> - <source>Naming convention:</source> <target>Konwencja nazewnictwa:</target> -<source>Handle errors:</source> -<target>Obsługa błędów:</target> - -<source>&Pop-up</source> -<target>&Pop-up</target> +<source>&Ignore errors</source> +<target>&Ignoruj błędy</target> <source>Show pop-up on errors or warnings</source> <target>Pokazuj okna pop-up dla błędów i ostrzeżeń</target> -<source>Hide all error and warning messages</source> -<target>Ukryj wszystkie informacje błędach i ostrzeżeniach</target> - -<source>On completion:</source> -<target>Po zakończeniu:</target> +<source>Run a command after synchronization:</source> +<target>Uruchom komendę po zakończonej synchronizacji:</target> <source>OK</source> <target>OK</target> @@ -1123,6 +1117,9 @@ Komenda jest wykonywana gdy: <source>&Key file</source> <target>Plik &klucza</target> +<source>&SSH agent</source> +<target>Agent &SSH</target> + <source>User name:</source> <target>Nazwa użytkownika:</target> @@ -1141,11 +1138,8 @@ Komenda jest wykonywana gdy: <source>How to get best performance?</source> <target>Jak uzyskać lepszą wydajność?</target> -<source>SSH connections for directory reading:</source> -<target>Połączenie SSH dla katalogów:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Sugerowany zakres: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>Połączenie do odczytu katalogów:</target> <source>SFTP channels per connection:</source> <target>Liczba kanałów dla połączenia SFTP:</target> @@ -1153,9 +1147,6 @@ Komenda jest wykonywana gdy: <source>Detect server limit</source> <target>Wykryj limity serwera</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 połączenia x 10 kanałów = 20 razy szybsze odczytywanie katalogów</target> - <source>Select a directory on the server:</source> <target>Określ katalog na serwerze:</target> @@ -1195,6 +1186,9 @@ Komenda jest wykonywana gdy: <source>Bytes copied:</source> <target>Skopiowano bajtów:</target> +<source>When finished:</source> +<target>Gdy zakończono:</target> + <source>Close</source> <target>Zamknij</target> @@ -1207,15 +1201,18 @@ Komenda jest wykonywana gdy: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Utwórz plik wsadowy do zautomatyzowania procesu synchronizacji. Aby rozpocząć, klknij dwa razy plik lub zaplanuj zadanie w harmonogramie zadań: %x</target> -<source>&Stop</source> -<target>&Stop</target> +<source>Run minimized</source> +<target>Uruchom zminimalizowane</target> + +<source>&Show error dialog</source> +<target>&Pokaż powiadomienie z błędem</target> + +<source>&Cancel</source> +<target>&Anuluj</target> <source>Stop synchronization at first error</source> <target>Przerwij synchronizację przy pierwszym błędzie</target> -<source>Run minimized</source> -<target>Uruchom zminimalizowane</target> - <source>Save log:</source> <target>Zapisz logi:</target> @@ -1246,14 +1243,14 @@ Aby zagwarantować spójność synchronizacji nawet podczas błędu, program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadpisuje plik docelowy. </target> -<source>(recommended)</source> -<target>(rekomendowane)</target> +<source>recommended</source> +<target>rekomendowana</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Kopiuj pliki współdzielone lub zablokowane używając usługi Volume Shadow Copy.</target> -<source>(requires administrator rights)</source> -<target>(wymagane uprawnienia administratora)</target> +<source>requires administrator rights</source> +<target>wymaga uprawnień administratora</target> <source>Transfer file and folder permissions.</source> <target>kopiuj uprawnienia plików i katalogów.</target> @@ -1285,14 +1282,17 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Source code written in C++ using:</source> <target>Kod stworzony w C++ z wykorzystaniem:</target> -<source>Donation details</source> -<target>Szczegóły dotacji</target> - <source>If you like FreeFileSync:</source> <target>Jeżeli lubisz FreeFileSync:</target> -<source>Donate with PayPal</source> -<target>Wesprzyj z PayPal</target> +<source>Support with a donation</source> +<target>Wesprzyj dotacją</target> + +<source>Donation details</source> +<target>Szczegóły dotacji</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>Auto aktualizacja została wyłączona przez administratora.</target> <source>Feedback and suggestions are welcome</source> <target>Wszelkie opinie i sugestie mile widziane</target> @@ -1330,8 +1330,8 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Activate offline</source> <target>Aktywuj offline</target> -<source>Save as Batch Job</source> -<target>Zapisz w trybie wsadowym</target> +<source>Save as a Batch Job</source> +<target>Zapisz jako plik wsadowy.</target> <source>Delete Items</source> <target>Usuń elementy</target> @@ -1369,11 +1369,17 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Overview</source> <target>Przegląd</target> +<source>Show "%x"</source> +<target>Pokaż "%x"</target> + <source>&Show details</source> <target>&Pokaż szczegóły</target> -<source>A new version of FreeFileSync is available:</source> -<target>Dostępna jest nowa wersja FreeFileSync:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x jest już dostępny!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Pliki instalacyjne są uszkodzone. Przeinstaluj program FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Lokalna ścieżka nie jest dostępna dla %x.</target> @@ -1469,9 +1475,6 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Select time span...</source> <target>Określ przedział czasowy...</target> -<source>Show "%x"</source> -<target>Pokaż "%x"</target> - <source>Last session</source> <target>Ostatnia sesja</target> @@ -1571,18 +1574,6 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Searching for program updates...</source> <target>Wyszukiwanie aktualizacji...</target> -<source>Close progress dialog</source> -<target>Zamknij okno postępu</target> - -<source>Log off</source> -<target>Wyloguj użytkownika</target> - -<source>Standby</source> -<target>Przejdź w stan uśpienia</target> - -<source>Shut down</source> -<target>Wyłącz komputer</target> - <source>Paused</source> <target>Pauza</target> @@ -1613,18 +1604,21 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Log</source> <target>Log</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Pliki instalacyjne są uszkodzone. Przeinstaluj program FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Dziękujemy %x za Twoje wsparcie!</target> +<source>Recommended range:</source> +<target>Rekomendowany zakres:</target> + <source>Password:</source> <target>Hasło:</target> <source>Key password:</source> <target>Hasło klucza:</target> +<source>Please enter a file path.</source> +<target>Wprowadź ścieżkę do pliku.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1742,6 +1736,15 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Zachowaj pliku usunięte i nadpisane w koszy systemowym</target> + +<source>Delete and overwrite files permanently</source> +<target>Usuwaj i nadpisuj pliki permanentnie</target> + +<source>Move files to a user-defined folder</source> +<target>Przenieś pliki do katalogu zdefiniowanego przez użytkownika</target> + <source>Replace</source> <target>Zamień</target> @@ -1754,6 +1757,15 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Append a time stamp to each file name</source> <target>Dołącz datę do nazwy każdego pliku</target> +<source>On completion:</source> +<target>Po zakończeniu:</target> + +<source>On errors:</source> +<target>Przy błędach:</target> + +<source>On success:</source> +<target>Przy sukcesie:</target> + <source>Main config</source> <target>Główna konfiguracja</target> @@ -1775,9 +1787,6 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Name</source> <target>Nazwa</target> -<source>Items</source> -<target>Elementy</target> - <source>Percentage</source> <target>Procentowo</target> @@ -1910,6 +1919,9 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Cannot change process I/O priorities.</source> <target>Nie można zmienić priorytetu I/O procesu.</target> +<source>Unable to shut down the system.</source> +<target>Nie można wyłączyć systemu.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Sprawdzanie kosza systemowego dla katalogu %x zakończone niepowodzeniem.</target> @@ -1934,9 +1946,6 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Portable</source> <target>Przenośna</target> -<source>recommended</source> -<target>rekomendowana</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Zapisuje ustawienia do "%APPDATA%\FreeFileSync"</target> @@ -1988,8 +1997,8 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Edit with FreeFileSync</source> <target>Edytuj przy użyciu FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>Przenośna wersja programu nie możne zostać zainstalowana w wybranym katalogu.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>Przenośna wersja FreeFileSync nie może być zainstalowana w podkatalogu w %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Wybierz lokalny typ instalacji lub określ inny katalog.</target> diff --git a/FreeFileSync/Build/Languages/portuguese.lng b/FreeFileSync/Build/Languages/portuguese.lng index 8c388cfe..fc969793 100755 --- a/FreeFileSync/Build/Languages/portuguese.lng +++ b/FreeFileSync/Build/Languages/portuguese.lng @@ -1,6 +1,6 @@ -<header> +<header> <language>Português</language> - <translator>Igor Rückert</translator> + <translator>igorruckert</translator> <locale>pt_PT</locale> <image>flag_portugal.png</image> <plural_count>2</plural_count> @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>A verificar a disponibilidade da reciclagem para a pasta %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>A reciclagem não está disponível para as seguintes pastas. Os ficheiros serão, em alternativa, eliminados permanentemente:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>A reciclagem não é suportada pelas seguintes pastas. Ficheiros eliminados ou sobrescritos não podem ser restaurados:</target> <source>An exception occurred</source> <target>Ocorreu uma excepção</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Sintaxe:</target> -<source>global config file:</source> -<target>ficheiro de configuração global:</target> - <source>config files:</source> <target>ficheiros de configuração:</target> <source>directory</source> <target>directório</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Caminho para o ficheiro GlobalSettings.xml alternativo.</target> +<source>global config file:</source> +<target>ficheiro de configuração global:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Qualquer número de ficheiros de configuração .ffs_gui e/ou .ffs_batch do FreeFileSync.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Qualquer número de pares de directórios alternativos para apenas um ficheiro de configuração.</target> -<source>Open configuration for editing without executing it.</source> -<target>Abre a configuração para editar sem executar.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Abre a configuração seleccionada para somente editar sem executá-la.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Caminho para o ficheiro GlobalSettings.xml alternativo.</target> <source>Cannot find the following folders:</source> <target>Não é possível encontrar as seguintes pastas:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Actualizar atributos à direita</target> -<source>Cannot write file %x.</source> -<target>Não é possível escrever o ficheiro %x.</target> +<source>Cannot read file %x.</source> +<target>Não é possível ler o ficheiro %x.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Actual: %y bytes <source>Operation not supported for different base folder types.</source> <target>Operação sem suporte para tipos de pastas base distintas.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Não é possível criar o link simbólico de %x para %y.</target> +<source>Cannot write file %x.</source> +<target>Não é possível escrever o ficheiro %x.</target> <source>Cannot move file %x to %y.</source> <target>Não é possível mover o ficheiro %x para %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Não é possível criar o link simbólico de %x para %y.</target> + <source>Unable to connect to %x.</source> <target>Não é possível conectar-se em %x.</target> @@ -291,8 +294,8 @@ Actual: %y bytes <source>Cannot read directory %x.</source> <target>Não é possível ler o directório %x.</target> -<source>Cannot read file %x.</source> -<target>Não é possível ler o ficheiro %x.</target> +<source>Cannot read file attributes of %x.</source> +<target>Não é possível ler os atributos do ficheiro %x.</target> <source>Cannot create directory %x.</source> <target>Não é possível criar o directório %x.</target> @@ -303,9 +306,6 @@ Actual: %y bytes <source>Cannot delete directory %x.</source> <target>Não é possível eliminar o directório %x.</target> -<source>Cannot read file attributes of %x.</source> -<target>Não é possível ler os atributos do ficheiro %x.</target> - <source>Cannot write modification time of %x.</source> <target>Não é possível alterar a data de modificação a %x.</target> @@ -596,8 +596,8 @@ O comando é executado se: <source>Automated Synchronization</source> <target>Sincronização Automática</target> -<source>The following path does not support directory monitoring:</source> -<target>O seguinte caminho não suporta a monitorização de direcctório:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>O protocolo %x não suporta a monitorização de directórios:</target> <source>Directory monitoring active</source> <target>Monitorização de directório activa</target> @@ -713,8 +713,8 @@ O comando é executado se: <source>Base folder:</source> <target>Pasta base:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>A pasta de versão será sincronizada pois ela está contida em uma pasta base.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>A pasta de versão está contida em uma pasta base.</target> <source>Synchronizing folder pair:</source> <target>A cincronizar o par de pastas:</target> @@ -728,6 +728,15 @@ O comando é executado se: <source>job name</source> <target>nome da tarefa</target> +<source>Show summary</source> +<target>Mostrar resumo</target> + +<source>Sleep</source> +<target>Suspender</target> + +<source>Shut down</source> +<target>Desligar</target> + <source>Synchronization stopped</source> <target>Sincronização parada</target> @@ -749,6 +758,9 @@ O comando é executado se: <source>Synchronization completed successfully</source> <target>Sincronização completa com sucesso</target> +<source>Executing command %x</source> +<target>A executar comando %x</target> + <source>Cleaning up old log files...</source> <target>A limpar ficheiros de log antigos...</target> @@ -776,8 +788,8 @@ O comando é executado se: <pluralform>Repetir automaticamente dentro de %x segundos...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Ignorar erros subsequentes</target> +<source>Ignore &all</source> +<target>Ignorar &todos</target> <source>Retrying operation...</source> <target>A repetir a operação...</target> @@ -884,12 +896,12 @@ O comando é executado se: <source>&Find...</source> <target>&Procurar...</target> -<source>&Reset layout</source> -<target>&Restaurar esquema</target> - <source>&Export file list...</source> <target>&Exportar lista de ficheiros...</target> +<source>&Reset layout</source> +<target>&Restaurar esquema</target> + <source>&Tools</source> <target>&Ferramentas</target> @@ -1025,9 +1037,6 @@ O comando é executado se: <source>C&lear</source> <target>&Limpar</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Detectar a direcção de sincronização com a ajuda de base de dados</target> - <source>Detect moved files</source> <target>Detectar ficheiros movidos</target> @@ -1048,38 +1057,23 @@ O comando é executado se: <source>&Recycle bin</source> <target>&Reciclagem</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Fazer backup dos ficheiros apagados e substituídos na reciclagem</target> - <source>&Permanent</source> <target>&Permanente</target> -<source>Delete or overwrite files permanently</source> -<target>Apagar ou substituir ficheiros permanentemente</target> - <source>&Versioning</source> <target>Controlo &Versões</target> -<source>Move files to a user-defined folder</source> -<target>Mover ficheiros para uma pasta definida pelo utilizador</target> - <source>Naming convention:</source> <target>Convenção de nomes:</target> -<source>Handle errors:</source> -<target>Tratar erros:</target> - -<source>&Pop-up</source> -<target>&Popup</target> +<source>&Ignore errors</source> +<target>&Ignorar erros</target> <source>Show pop-up on errors or warnings</source> <target>Mostrar popup em caso de erros ou avisos</target> -<source>Hide all error and warning messages</source> -<target>Ocultar todas as mensagens de erro/aviso</target> - -<source>On completion:</source> -<target>Ao completar:</target> +<source>Run a command after synchronization:</source> +<target>Executar um comando após a sincronização:</target> <source>OK</source> <target>OK</target> @@ -1117,6 +1111,9 @@ O comando é executado se: <source>&Key file</source> <target>Ficheiro de &chave</target> +<source>&SSH agent</source> +<target>Agente &SSH</target> + <source>User name:</source> <target>Utilizador:</target> @@ -1135,11 +1132,8 @@ O comando é executado se: <source>How to get best performance?</source> <target>Como obter um melhor desempenho?</target> -<source>SSH connections for directory reading:</source> -<target>Conexões SSH para leitura de directório:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Intervalo sugerido: [1 -10]</target> +<source>Connections for directory reading:</source> +<target>Conexões para ler directório:</target> <source>SFTP channels per connection:</source> <target>Canais SFTP por conexão:</target> @@ -1147,9 +1141,6 @@ O comando é executado se: <source>Detect server limit</source> <target>Detectar limite do servidor</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 conexões X 10 canais = leitura de directórios 20 vezes mais rápida</target> - <source>Select a directory on the server:</source> <target>Seleccione um directório no servidor:</target> @@ -1189,6 +1180,9 @@ O comando é executado se: <source>Bytes copied:</source> <target>Bytes copiados:</target> +<source>When finished:</source> +<target>Quando concluído:</target> + <source>Close</source> <target>Fechar</target> @@ -1201,15 +1195,18 @@ O comando é executado se: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Criar ficheiro batch para sincronização automática. Para iniciar, fazer duplo clique no ficheiro ou acrescentar ao planeador de tarefas: %x</target> -<source>&Stop</source> -<target>&Parar</target> +<source>Run minimized</source> +<target>Correr minimizado</target> + +<source>&Show error dialog</source> +<target>Mo&strar diálogo de erro</target> + +<source>&Cancel</source> +<target>&Cancelar</target> <source>Stop synchronization at first error</source> <target>Para sincronização ao primeiro erro</target> -<source>Run minimized</source> -<target>Correr minimizado</target> - <source>Save log:</source> <target>Guardar registo:</target> @@ -1240,14 +1237,14 @@ Copiar para um ficheiro temporário (*.ffs_tmp) antes de substituir. Isto garante um estado consistente mesmo em caso de falha grave. </target> -<source>(recommended)</source> -<target>(recomendado)</target> +<source>recommended</source> +<target>recomendada</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Copiar ficheiros partilhados ou bloqueados usando o serviço Volume Shadow Copy.</target> -<source>(requires administrator rights)</source> -<target>(requer permissões de administrador)</target> +<source>requires administrator rights</source> +<target>requer direitos de administrador</target> <source>Transfer file and folder permissions.</source> <target>Transferir permissões de pasta e ficheiro.</target> @@ -1279,14 +1276,17 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Source code written in C++ using:</source> <target>Código fonte escrito em C++ utilizando:</target> -<source>Donation details</source> -<target>Detalhes da doação</target> - <source>If you like FreeFileSync:</source> <target>Se gosta do FreeFileSync:</target> -<source>Donate with PayPal</source> -<target>Doar usando PayPal</target> +<source>Support with a donation</source> +<target>Apoiar com uma doação</target> + +<source>Donation details</source> +<target>Detalhes da doação</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>A actualização automática foi desactivada pelo administrador.</target> <source>Feedback and suggestions are welcome</source> <target>Comentários e sugestões são apreciados</target> @@ -1324,8 +1324,8 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Activate offline</source> <target>Activar offline</target> -<source>Save as Batch Job</source> -<target>Guardar como Ficheiro Batch</target> +<source>Save as a Batch Job</source> +<target>Salvar como Tarefa em Lote</target> <source>Delete Items</source> <target>Eliminar Itens</target> @@ -1363,11 +1363,17 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Overview</source> <target>Vista</target> +<source>Show "%x"</source> +<target>Mostrar "%x"</target> + <source>&Show details</source> <target>&Mostras detalhes</target> -<source>A new version of FreeFileSync is available:</source> -<target>Uma nova versão do FreeFileSync está disponível:</target> +<source>FreeFileSync %x is available!</source> +<target>O FreeFileSync %x está disponível!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Os ficheiros de instalação estão corrompidos. Por favor, reinstale o FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Caminho local não disponível para %x.</target> @@ -1459,9 +1465,6 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Select time span...</source> <target>Seleccione o intervalo de tempo...</target> -<source>Show "%x"</source> -<target>Mostrar "%x"</target> - <source>Last session</source> <target>Última Sessão</target> @@ -1561,18 +1564,6 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Searching for program updates...</source> <target>A procurar actualizações do programa...</target> -<source>Close progress dialog</source> -<target>Fechar diálogo de progresso</target> - -<source>Log off</source> -<target>Terminar sessão</target> - -<source>Standby</source> -<target>Standby</target> - -<source>Shut down</source> -<target>Desligar</target> - <source>Paused</source> <target>Em pausa</target> @@ -1603,18 +1594,21 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Log</source> <target>Log</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Os ficheiros de instalação estão corrompidos. Por favor, reinstale o FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Obrigado, %x, pela sua doação e suporte!</target> +<source>Recommended range:</source> +<target>Gama recomendada:</target> + <source>Password:</source> <target>Palavra passe:</target> <source>Key password:</source> <target>Palavra passe da chave:</target> +<source>Please enter a file path.</source> +<target>Por favor, entre o caminho do ficheiro.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1729,6 +1723,15 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Reter ficheiros eliminados e substituídos na reciclagem</target> + +<source>Delete and overwrite files permanently</source> +<target>Apagar e substituir ficheiros permanentemente</target> + +<source>Move files to a user-defined folder</source> +<target>Mover ficheiros para uma pasta definida pelo utilizador</target> + <source>Replace</source> <target>Substituir</target> @@ -1741,6 +1744,15 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Append a time stamp to each file name</source> <target>Adicione data/hora ao nome de cada ficheiro</target> +<source>On completion:</source> +<target>Ao completar:</target> + +<source>On errors:</source> +<target>Em erros:</target> + +<source>On success:</source> +<target>No sucesso:</target> + <source>Main config</source> <target>Configuração principal</target> @@ -1762,9 +1774,6 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Name</source> <target>Nome</target> -<source>Items</source> -<target>Itens</target> - <source>Percentage</source> <target>Percentagem</target> @@ -1894,6 +1903,9 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Cannot change process I/O priorities.</source> <target>Não é possível alterar as prioridades de E / S do processo.</target> +<source>Unable to shut down the system.</source> +<target>Incapaz de desligar o sistema.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Verificar a reciclagem falhou no directório %x.</target> @@ -1918,9 +1930,6 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Portable</source> <target>Portátil</target> -<source>recommended</source> -<target>recomendada</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Guardar as definições em "%APPDATA%\FreeFileSync"</target> @@ -1972,8 +1981,8 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Edit with FreeFileSync</source> <target>Editar com FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>Não é possível instalar a versão portátil na pasta seleccionada.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>A versão portátil do FreeFileSync não pode ser instalada em uma sub-pasta de %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Por favor, escolha o tipo do local de instalação ou seleccione uma pasta diferente para instalar.</target> diff --git a/FreeFileSync/Build/Languages/portuguese_br.lng b/FreeFileSync/Build/Languages/portuguese_br.lng index cc1c602f..1b80e8d1 100755 --- a/FreeFileSync/Build/Languages/portuguese_br.lng +++ b/FreeFileSync/Build/Languages/portuguese_br.lng @@ -41,25 +41,25 @@ <target>Movendo link simbólico %x para a Lixeira</target> <source>Deleting file %x</source> -<target>Apagando arquivo %x</target> +<target>Excluindo arquivo %x</target> <source>Deleting folder %x</source> -<target>Apagando pasta %x</target> +<target>Excluindo pasta %x</target> <source>Deleting symbolic link %x</source> -<target>Apagando link simbólico %x</target> +<target>Excluindo link simbólico %x</target> <source>Checking recycle bin availability for folder %x...</source> <target>Verificando a disponibilidade da Lixeira para a pasta %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Lixeira não disponível para as seguintes pastas. Os arquivos serão apagados permanentemente:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>A Lixeira não é suportada pelas seguintes pastas. Arquivos excluídos ou substituídos não poderão ser restaurados:</target> <source>An exception occurred</source> <target>Ocorreu uma exceção</target> <source>A directory path is expected after %x.</source> -<target>Caminho de diretório esperado após %x.</target> +<target>Um caminho de diretório é esperado após %x.</target> <source>Syntax error</source> <target>Erro de sintaxe</target> @@ -74,7 +74,7 @@ <target>O arquivo %x não contém uma configuração válida.</target> <source>Unequal number of left and right directories specified.</source> -<target>Número de diretórios especificados na esquerda e na direita diferentes.</target> +<target>Número diferente de diretórios especificados na esquerda e na direita.</target> <source>The config file must not contain settings at directory pair level when directories are set via command line.</source> <target>O arquivo de configuração não deve conter configurações de diretórios quando os diretórios são definidos via linha de comando.</target> @@ -88,26 +88,26 @@ <source>Syntax:</source> <target>Sintaxe:</target> -<source>global config file:</source> -<target>arquivo de configuração global:</target> - <source>config files:</source> <target>arquivos de configuração:</target> <source>directory</source> <target>diretório</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Caminho para um arquivo GlobalSettings.xml alternativo.</target> +<source>global config file:</source> +<target>arquivo de configuração global:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> -<target>Qualquer número de arquivos FreeFileSync .ffs e/ou de tarefa em lote .ffs_batch.</target> +<target>Qualquer número de arquivos FreeFileSync .ffs e/ou de tarefa em lotes .ffs_batch.</target> <source>Any number of alternative directory pairs for at most one config file.</source> <target>Qualquer número de pares alternativos de diretórios para no máximo um arquivo de configuração.</target> -<source>Open configuration for editing without executing it.</source> -<target>Abrir configuração para editar sem executar.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Abrir a configuração selecionada para edição apenas, sem executá-la.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Caminho para um arquivo GlobalSettings.xml alternativo.</target> <source>Cannot find the following folders:</source> <target>Não é possível localizar as seguintes pastas:</target> @@ -167,7 +167,7 @@ <target>Executar com prioridade de segundo plano</target> <source>Lock directories during sync</source> -<target>Travar diretórios durante sincronização</target> +<target>Bloquear diretórios durante sincronização</target> <source>Verify copied files</source> <target>Verificar arquivos copiados</target> @@ -179,7 +179,7 @@ <target>Iniciando comparação</target> <source>A folder input field is empty.</source> -<target>Campo de entrada de pasta vazio.</target> +<target>Um campo de entrada de pasta está vazio.</target> <source>The corresponding folder will be considered as empty.</source> <target>A pasta correspondente será considerada como vazia.</target> @@ -227,10 +227,10 @@ <target>Copiar novo item para a direita</target> <source>Delete left item</source> -<target>Apagar item à esquerda</target> +<target>Excluir item à esquerda</target> <source>Delete right item</source> -<target>Apagar item à direita</target> +<target>Excluir item à direita</target> <source>Move file on left</source> <target>Mover arquivo à esquerda</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Atualizar atributos à direita</target> -<source>Cannot write file %x.</source> -<target>Não é possível escrever o arquivo %x.</target> +<source>Cannot read file %x.</source> +<target>Não é possível ler o arquivo %x.</target> <source> Unexpected size of data stream. @@ -271,16 +271,19 @@ Atual: %y bytes <target>Não é possível escrever as permissões de %x.</target> <source>Operation not supported for different base folder types.</source> -<target>Operação não suportada para tipos de pastas de base diferentes.</target> +<target>Operação não suportada para tipos de pastas base diferentes.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Não é possível copiar o link simbólico %x para %y.</target> +<source>Cannot write file %x.</source> +<target>Não é possível escrever o arquivo %x.</target> <source>Cannot move file %x to %y.</source> <target>Não é possível mover o arquivo %x para %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Não é possível copiar o link simbólico %x para %y.</target> + <source>Unable to connect to %x.</source> -<target>Não é possível conectar a %x.</target> +<target>Não foi possível conectar a %x.</target> <source>Failed to get information about server %x.</source> <target>Falha na obteção da informação sobre o servidor %x.</target> @@ -294,17 +297,14 @@ Atual: %y bytes <source>Cannot read file attributes of %x.</source> <target>Não é possível ler os atributos do arquivo %x.</target> -<source>Cannot read file %x.</source> -<target>Não é possível ler o arquivo %x.</target> - <source>Cannot create directory %x.</source> <target>Não é possível criar o diretório %x.</target> <source>Cannot delete file %x.</source> -<target>Não é possível apagar o arquivo %x.</target> +<target>Não é possível excluir o arquivo %x.</target> <source>Cannot delete directory %x.</source> -<target>Não é possível apagar o diretório %x.</target> +<target>Não é possível excluir o diretório %x.</target> <source>Cannot write modification time of %x.</source> <target>Não é possível escrever a data de modificação de %x.</target> @@ -331,7 +331,7 @@ Atual: %y bytes <target>Tipo de item %x não é suportado:</target> <source>Cannot delete symbolic link %x.</source> -<target>Não é possível apagar o link simbólico %x.</target> +<target>Não é possível excluir o link simbólico %x.</target> <source>Cannot determine free disk space for %x.</source> <target>Não é possível determinar o espaço livre em disco para %x.</target> @@ -418,19 +418,19 @@ Atual: %y bytes <target>Salvando arquivo %x...</target> <source>Searching for folder %x...</source> -<target>Buscando pela pasta %x...</target> +<target>Localizando pasta %x...</target> <source>Timeout while searching for folder %x.</source> -<target>Tempo esgotado na procura pela pasta %x.</target> +<target>Tempo esgotado na localização da pasta %x.</target> <source>Cannot get process information.</source> <target>Não é possível obter as informações do processo.</target> <source>Waiting while directory is locked:</source> -<target>Aguardando enquanto o diretório é travado:</target> +<target>Aguardando enquanto o diretório é bloqueado:</target> <source>Lock owner:</source> -<target>Proprietário:</target> +<target>Proprietário de bloqueio:</target> <source> <pluralform>1 sec</pluralform> @@ -442,7 +442,7 @@ Atual: %y bytes </target> <source>Detecting abandoned lock...</source> -<target>Detectando travamento abandonado...</target> +<target>Detectando bloqueamento abandonado...</target> <source>Items processed:</source> <target>Elementos processados:</target> @@ -457,7 +457,7 @@ Atual: %y bytes <target>Erro analisando o arquivo %x, linha %y, coluna %z.</target> <source>Cannot set directory lock for %x.</source> -<target>Não é possível travar o diretório %x.</target> +<target>Não é possível bloquear o diretório %x.</target> <source> <pluralform>1 thread</pluralform> @@ -487,10 +487,10 @@ Atual: %y bytes <target>Procurar diretório</target> <source>Cannot access the Volume Shadow Copy Service.</source> -<target>Não é possível acessar o Serviço de Cópia de Sombra de Volume.</target> +<target>Não é possível acessar o Serviço de Cópias de Sombra de Volume.</target> <source>Please run the 64-bit version of FreeFileSync to create shadow copies on this system.</source> -<target>Execute versão 64-bits do FreeFileSync para criar cópia de sombra neste sistema.</target> +<target>Execute a versão 64-bits do FreeFileSync para criar cópias de sombra neste sistema.</target> <source>Cannot determine volume name for %x.</source> <target>Não é possível determinar o nome do volume para %x.</target> @@ -596,8 +596,8 @@ O comando é disparado se: <source>Automated Synchronization</source> <target>Sincronização Automatizada</target> -<source>The following path does not support directory monitoring:</source> -<target>O seguinte caminho não suporta monitoramento de diretório:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>O protocolo %x não suporta monitoramento de diretório:</target> <source>Directory monitoring active</source> <target>Monitoramento de diretórios ativado</target> @@ -713,8 +713,8 @@ O comando é disparado se: <source>Base folder:</source> <target>Pasta base:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>A pasta de controle de versões será sincronizada pois está contida na pasta base.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>A pasta de controle de versões está dentro de uma pasta base.</target> <source>Synchronizing folder pair:</source> <target>Sincronizando par de pastas:</target> @@ -728,6 +728,15 @@ O comando é disparado se: <source>job name</source> <target>nome da tarefa</target> +<source>Show summary</source> +<target>Mostrar resumo</target> + +<source>Sleep</source> +<target>Suspender</target> + +<source>Shut down</source> +<target>Desligar</target> + <source>Synchronization stopped</source> <target>Sincronização interrompida</target> @@ -749,6 +758,9 @@ O comando é disparado se: <source>Synchronization completed successfully</source> <target>Sincronização finalizada com êxito</target> +<source>Executing command %x</source> +<target>Executando comando %x</target> + <source>Cleaning up old log files...</source> <target>Limpando arquivo de log antigo...</target> @@ -776,8 +788,8 @@ O comando é disparado se: <pluralform>Nova tentativa em %x segundos...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Ignorar erros subsequentes</target> +<source>Ignore &all</source> +<target>Ignorar &todos</target> <source>Retrying operation...</source> <target>Tentando novamente a operação...</target> @@ -855,13 +867,13 @@ O comando é disparado se: <target>&Salvar</target> <source>Save as &batch job...</source> -<target>Salvar como &tarefa em lote...</target> +<target>Salvar como &tarefa em lotes...</target> <source>Start &comparison</source> <target>Iniciar &Comparação</target> <source>C&omparison settings</source> -<target>Configurações de C&omparação</target> +<target>C&onfigurações de Comparação</target> <source>&Filter settings</source> <target>Configurações de &Filtro</target> @@ -884,12 +896,12 @@ O comando é disparado se: <source>&Find...</source> <target>&Localizar...</target> -<source>&Reset layout</source> -<target>&Redefinir layout</target> - <source>&Export file list...</source> <target>&Exportar lista de arquivos...</target> +<source>&Reset layout</source> +<target>&Redefinir layout</target> + <source>&Tools</source> <target>&Ferramentas</target> @@ -897,7 +909,7 @@ O comando é disparado se: <target>&Verificar atualizações agora</target> <source>Check &automatically once a week</source> -<target>Verificar &automaticamente uma vez por semana</target> +<target>V&erificar automaticamente uma vez por semana</target> <source>Cancel</source> <target>Cancelar</target> @@ -918,7 +930,7 @@ O comando é disparado se: <target>Acessar armazenamento on-line</target> <source>Swap sides</source> -<target>Inverter lados</target> +<target>Trocar lados</target> <source>Close search bar</source> <target>Fechar barra de localização</target> @@ -951,7 +963,7 @@ O comando é disparado se: <target>Estatísticas:</target> <source>Number of files and folders that will be deleted</source> -<target>Número de arquivos e pastas que serão apagados</target> +<target>Número de arquivos e pastas que serão excluídos</target> <source>Number of files that will be updated</source> <target>Número de arquivos que serão atualizados</target> @@ -1025,9 +1037,6 @@ O comando é disparado se: <source>C&lear</source> <target>&Limpar</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Detecta a direção de sincronização com a ajuda do arquivo de banco de dados</target> - <source>Detect moved files</source> <target>Detectar arquivos movidos</target> @@ -1043,43 +1052,28 @@ O comando é disparado se: </target> <source>Delete files:</source> -<target>Apagar arquivos:</target> +<target>Excluir arquivos:</target> <source>&Recycle bin</source> <target>&Lixeira</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Faz uma cópia dos arquivos apagados ou substituídos na Lixeira</target> - <source>&Permanent</source> <target>&Permanente</target> -<source>Delete or overwrite files permanently</source> -<target>Apaga ou substitui os arquivos permanentemente</target> - <source>&Versioning</source> -<target>Controle de &versão</target> - -<source>Move files to a user-defined folder</source> -<target>Move os arquivos para uma pasta definida pelo usuário</target> +<target>Controle de &versões</target> <source>Naming convention:</source> <target>Convenção de nomenclatura:</target> -<source>Handle errors:</source> -<target>Tratamento de erros:</target> - -<source>&Pop-up</source> -<target>&Alertar</target> +<source>&Ignore errors</source> +<target>&Ignorar erros</target> <source>Show pop-up on errors or warnings</source> <target>Mostrar pop-up em caso de erros ou avisos</target> -<source>Hide all error and warning messages</source> -<target>Ocultar todas as mensagens de erros e avisos</target> - -<source>On completion:</source> -<target>Ao finalizar:</target> +<source>Run a command after synchronization:</source> +<target>Executar um comando após a sincronização:</target> <source>OK</source> <target>OK</target> @@ -1117,6 +1111,9 @@ O comando é disparado se: <source>&Key file</source> <target>&Arquivo de chave</target> +<source>&SSH agent</source> +<target>&SSH-agent</target> + <source>User name:</source> <target>Nome do usuário:</target> @@ -1135,11 +1132,8 @@ O comando é disparado se: <source>How to get best performance?</source> <target>Como obter o melhor desempenho?</target> -<source>SSH connections for directory reading:</source> -<target>Conexões SSH para leitura de diretório:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Intervalo sugerido: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>Conexões para leitura de diretório:</target> <source>SFTP channels per connection:</source> <target>Canais SFTP por conexão:</target> @@ -1147,9 +1141,6 @@ O comando é disparado se: <source>Detect server limit</source> <target>Detectar limite do servidor</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 conexões x 10 canais = leitura de diretório 20 vezes mais rápida</target> - <source>Select a directory on the server:</source> <target>Selecionar um diretório no servidor:</target> @@ -1189,6 +1180,9 @@ O comando é disparado se: <source>Bytes copied:</source> <target>Bytes copiados:</target> +<source>When finished:</source> +<target>Quando concluído:</target> + <source>Close</source> <target>Fechar</target> @@ -1199,17 +1193,20 @@ O comando é disparado se: <target>Interromper</target> <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> -<target>Cria um arquivo de tarefa em lote para sincronização desatendida. Para iniciar, dê um clique duplo neste arquivo ou agende no agendador de tarefas: %x</target> +<target>Criar um arquivo de tarefa em lotes para sincronização desatendida. Para iniciar, dê um clique duplo neste arquivo ou insira no agendador de tarefas: %x</target> -<source>&Stop</source> -<target>&Parar</target> +<source>Run minimized</source> +<target>Executar minimizado</target> + +<source>&Show error dialog</source> +<target>&Mostrar caixa de diálogo de erro</target> + +<source>&Cancel</source> +<target>&Cancelar</target> <source>Stop synchronization at first error</source> <target>Interromper a sincronização ao primeiro erro</target> -<source>Run minimized</source> -<target>Executar minimizado</target> - <source>Save log:</source> <target>Salvar arquivo de log:</target> @@ -1220,13 +1217,13 @@ O comando é disparado se: <target>Limitar número máximo de arquivos de log</target> <source>How can I schedule a batch job?</source> -<target>Como posso agendar uma tarefa em lote?</target> +<target>Como posso agendar uma tarefa em lotes?</target> <source>&Keep relative paths</source> <target>&Manter caminhos relativos</target> <source>&Overwrite existing files</source> -<target>&Sobrescrever arquivos existentes</target> +<target>&Substituir arquivos existentes</target> <source>The following settings are used for all synchronization jobs.</source> <target>As seguintes configurações são utilizadas para todas as tarefas de sincronização.</target> @@ -1240,14 +1237,14 @@ Copiar para um arquivo temporário (*.ffs_tmp) antes de substituir o destino. Isto garante um estado consistente mesmo em caso de erro grave. </target> -<source>(recommended)</source> -<target>(recomendado)</target> +<source>recommended</source> +<target>recomendado</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> -<target>Copiar arquivos compartilhados ou bloqueados usando o Serviço de Cópia de Sombra de Volume.</target> +<target>Copiar arquivos compartilhados ou bloqueados usando o Serviço de Cópias de Sombra de Volume.</target> -<source>(requires administrator rights)</source> -<target>(requer direitos de administrador)</target> +<source>requires administrator rights</source> +<target>requer direitos de administrador</target> <source>Transfer file and folder permissions.</source> <target>Transferir permissões de arquivos e pastas.</target> @@ -1271,7 +1268,7 @@ Isto garante um estado consistente mesmo em caso de erro grave. <target>Mostrar caixas de diálogo ocultadas</target> <source>Show all permanently hidden dialogs and warning messages again</source> -<target>Mostra todos as caixas de diálogo e mensagens de aviso permanentemente ocultadas</target> +<target>Mostrar todos as caixas de diálogo e mensagens de aviso permanentemente ocultadas</target> <source>&Default</source> <target>&Config. Padrão</target> @@ -1279,14 +1276,17 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Source code written in C++ using:</source> <target>Código-fonte escrito em C++ utilizando:</target> -<source>Donation details</source> -<target>Detalhes da doação</target> - <source>If you like FreeFileSync:</source> <target>Se você gosta do FreeFileSync:</target> -<source>Donate with PayPal</source> -<target>Doar usando PayPal</target> +<source>Support with a donation</source> +<target>Apoie com uma doação.</target> + +<source>Donation details</source> +<target>Detalhes da doação</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>A atualização automática foi desabilitada pelo administrador.</target> <source>Feedback and suggestions are welcome</source> <target>Críticas e sugestões são bem-vindas</target> @@ -1324,11 +1324,11 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Activate offline</source> <target>Ativar off-line</target> -<source>Save as Batch Job</source> -<target>Salvar como Tarefa em Lote</target> +<source>Save as a Batch Job</source> +<target>Salvar como um Trabalho em Lotes</target> <source>Delete Items</source> -<target>Apagar Itens</target> +<target>Excluir Itens</target> <source>Copy items</source> <target>Copiar itens</target> @@ -1363,11 +1363,17 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Overview</source> <target>Parâmetros</target> +<source>Show "%x"</source> +<target>Mostrar "%x"</target> + <source>&Show details</source> <target>&Mostrar detalhes</target> -<source>A new version of FreeFileSync is available:</source> -<target>Uma nova versão do FreeFileSync está disponível:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x está disponível!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Os arquivos de instalação estão corrompidos. Por favor reinstale o FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Caminho local não disponível para %x.</target> @@ -1436,7 +1442,7 @@ Isto garante um estado consistente mesmo em caso de erro grave. <target>&Copiar para...</target> <source>&Delete</source> -<target>&Apagar</target> +<target>&Exluir</target> <source>Include all</source> <target>Incluir todos</target> @@ -1459,9 +1465,6 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Select time span...</source> <target>Selecionar intervalo de tempo...</target> -<source>Show "%x"</source> -<target>Mostrar "%x"</target> - <source>Last session</source> <target>Última sessão</target> @@ -1472,7 +1475,7 @@ Isto garante um estado consistente mesmo em caso de erro grave. <target>Configuração salva</target> <source>FreeFileSync batch</source> -<target>Tarefa em lote do FreeFileSync</target> +<target>Tarefa em lotes do FreeFileSync</target> <source>Do you want to save changes to %x?</source> <target>Deseja salvar as alterações para %x?</target> @@ -1517,10 +1520,10 @@ Isto garante um estado consistente mesmo em caso de erro grave. <target>Mostrar arquivos que serão criados no lado direito</target> <source>Show files that will be deleted on the left side</source> -<target>Mostrar arquivos que serão apagados no lado esquerdo</target> +<target>Mostrar arquivos que serão excluidos no lado esquerdo</target> <source>Show files that will be deleted on the right side</source> -<target>Mostrar arquivos que serão apagados no lado direito</target> +<target>Mostrar arquivos que serão excluidos no lado direito</target> <source>Show files that will be updated on the left side</source> <target>Mostrar arquivos que serão atualizados no lado esquerdo</target> @@ -1532,7 +1535,7 @@ Isto garante um estado consistente mesmo em caso de erro grave. <target>Mostrar arquivos que não serão copiados</target> <source>Show filtered or temporarily excluded files</source> -<target>Mostra arquivos que foram filtrados ou excluídos temporariamente</target> +<target>Mostrar arquivos que foram filtrados ou excluídos temporariamente</target> <source>Save as default</source> <target>Salvar como padrão</target> @@ -1561,18 +1564,6 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Searching for program updates...</source> <target>Procurando atualizações do programa...</target> -<source>Close progress dialog</source> -<target>Fechar indicador de progresso</target> - -<source>Log off</source> -<target>Fazer logoff</target> - -<source>Standby</source> -<target>Em espera</target> - -<source>Shut down</source> -<target>Desligar</target> - <source>Paused</source> <target>Pausado</target> @@ -1580,7 +1571,7 @@ Isto garante um estado consistente mesmo em caso de erro grave. <target>Inicializando...</target> <source>Scanning...</source> -<target>Pesquisando...</target> +<target>Examinando...</target> <source>Comparing content...</source> <target>Comparando conteúdo...</target> @@ -1603,18 +1594,21 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Log</source> <target>Log</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Os arquivos de instalação estão corrompidos. Por favor reinstale o FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Obrigado, %x, pela sua doação e suporte!</target> +<source>Recommended range:</source> +<target>Intervalo recomendado:</target> + <source>Password:</source> <target>Senha:</target> <source>Key password:</source> <target>Senha da chave:</target> +<source>Please enter a file path.</source> +<target>Insira um caminho de arquivo.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1644,8 +1638,8 @@ Isto garante um estado consistente mesmo em caso de erro grave. <pluralform>Do you really want to delete the following %x items?</pluralform> </source> <target> -<pluralform>Você realmente deseja apagar o seguinte item?</pluralform> -<pluralform>Você realmente deseja apagar os seguintes %x itens?</pluralform> +<pluralform>Você realmente deseja excluir o seguinte item?</pluralform> +<pluralform>Você realmente deseja excluir os seguintes %x itens?</pluralform> </target> <source>Copy DACL, SACL, Owner, Group</source> @@ -1685,7 +1679,7 @@ Isto garante um estado consistente mesmo em caso de erro grave. <target>Identifica arquivos iguais comparando os seus tamanhos.</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> -<target>Identifica e propaga as alterações em ambos os lados. Arquivos e pastas apagados e/ou movidos e conflitos são detectados automaticamente usando um banco de dados.</target> +<target>Identifica e propaga as alterações em ambos os lados. Arquivos e pastas excluídos e/ou movidos e conflitos são detectados automaticamente usando um banco de dados.</target> <source>Create a mirror backup of the left folder by adapting the right folder to match.</source> <target>Cria uma cópia espelho da pasta da esquerda adaptando a pasta da direita para igualar.</target> @@ -1729,6 +1723,15 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Manter arquivos excluídos e substituídos na Lixeira</target> + +<source>Delete and overwrite files permanently</source> +<target>Excluir e substituir arquivos permanentemente</target> + +<source>Move files to a user-defined folder</source> +<target>Mover os arquivos para uma pasta definida pelo usuário</target> + <source>Replace</source> <target>Substituir</target> @@ -1741,6 +1744,15 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Append a time stamp to each file name</source> <target>Colocar uma estampa de tempo para cada nome de arquivo</target> +<source>On completion:</source> +<target>Ao finalizar:</target> + +<source>On errors:</source> +<target>Em caso de erro:</target> + +<source>On success:</source> +<target>Em caso de êxito:</target> + <source>Main config</source> <target>Config. principal</target> @@ -1762,9 +1774,6 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Name</source> <target>Nome</target> -<source>Items</source> -<target>Itens</target> - <source>Percentage</source> <target>Percentual</target> @@ -1823,7 +1832,7 @@ Isto garante um estado consistente mesmo em caso de erro grave. <target>Não é possível localizar a função de sistema %x.</target> <source>Unable to register device notifications for %x.</source> -<target>Não é possível registrar notificações para %x.</target> +<target>Não foi possível registrar notificações para %x.</target> <source>Cannot monitor directory %x.</source> <target>Não é possível monitorar o diretório %x.</target> @@ -1889,11 +1898,14 @@ Isto garante um estado consistente mesmo em caso de erro grave. <target>Não é possível estabelecer o privilégio %x.</target> <source>Unable to suspend system sleep mode.</source> -<target>Não é possível suspender o modo de espera do sistema.</target> +<target>Não foi possível suspender o modo de espera do sistema.</target> <source>Cannot change process I/O priorities.</source> <target>Não é possível alterar a prioridade de E/S do processo.</target> +<source>Unable to shut down the system.</source> +<target>Não foi possível desligar o sistema.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Verificando falha na Lixeira para pasta %x.</target> @@ -1918,9 +1930,6 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Portable</source> <target>Portátil</target> -<source>recommended</source> -<target>recomendado</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Salvar as configurações em "%APPDATA%\FreeFileSync"</target> @@ -1961,7 +1970,7 @@ Isto garante um estado consistente mesmo em caso de erro grave. <target>Configuração do FreeFileSync</target> <source>FreeFileSync Batch File</source> -<target>Arquivo de lote do FreeFileSync</target> +<target>Arquivo de tarefa em lotes do FreeFileSync</target> <source>FreeFileSync Synchronization Database</source> <target>Banco de dados de sincronização do FreeFileSync</target> @@ -1972,8 +1981,8 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Edit with FreeFileSync</source> <target>Editar com FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>A versão portátil não pode ser instalada na pasta selecionada.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>A versão portátil do FreeFileSync não pode ser instalada em uma subpasta de %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Escolha o tipo de instalação local ou selecione uma pasta diferente para instalação.</target> diff --git a/FreeFileSync/Build/Languages/romanian.lng b/FreeFileSync/Build/Languages/romanian.lng index c6caab97..210ca459 100755 --- a/FreeFileSync/Build/Languages/romanian.lng +++ b/FreeFileSync/Build/Languages/romanian.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Verific dacă Reciclatorul e disponibil pentru dosarul %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Reciclatorul nu este disponibil pentru dosarele următoare. Filele șterse de acolo vor dispărea în mod definitiv:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>Reciclatorul nu este suportat de dosarele următoare. Filele de acolo șterse sau suprascrise nu vor putea fi restaurate:</target> <source>An exception occurred</source> <target>A apărut o excepție</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Sintaxă:</target> -<source>global config file:</source> -<target>filă de configurare globală:</target> - <source>config files:</source> <target>file de configurare:</target> <source>directory</source> <target>dosar</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Calea către o filă GlobalSettings.xml alternativă.</target> +<source>global config file:</source> +<target>filă de configurare globală:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Orice număr de file de configurare pentru FreeFileSync, de tipul .ffs_gui sau/și .ffs_batch.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Orice număr de perechi alternative de dosare pentru cel mult o filă de configurare.</target> -<source>Open configuration for editing without executing it.</source> -<target>Deschide configurația pentru editare fără a o executa.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Deschide configurația selectată doar pentru editare, fără a o executa.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Calea către o filă GlobalSettings.xml alternativă.</target> <source>Cannot find the following folders:</source> <target>Nu pot găsi dosarele următoare:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Actualizează atributele în partea dreaptă</target> -<source>Cannot write file %x.</source> -<target>Nu pot scrie fila %x.</target> +<source>Cannot read file %x.</source> +<target>Nu pot citi fila %x.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Actuală: %y baiți <source>Operation not supported for different base folder types.</source> <target>Operație nesuportată pentru tipuri diferite de dosare bază (rădăcină).</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Nu pot copia legătura simbolică %x în %y.</target> +<source>Cannot write file %x.</source> +<target>Nu pot scrie fila %x.</target> <source>Cannot move file %x to %y.</source> <target>Nu pot muta fila %x în %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Nu pot copia legătura simbolică %x în %y.</target> + <source>Unable to connect to %x.</source> <target>Nu mă pot conecta la %x.</target> @@ -294,9 +297,6 @@ Actuală: %y baiți <source>Cannot read file attributes of %x.</source> <target>Nu pot citi atributele filei %x.</target> -<source>Cannot read file %x.</source> -<target>Nu pot citi fila %x.</target> - <source>Cannot create directory %x.</source> <target>Nu pot crea dosarul %x.</target> @@ -601,8 +601,8 @@ Comanda este declanșată dacă: <source>Automated Synchronization</source> <target>Sincronizare Automată</target> -<source>The following path does not support directory monitoring:</source> -<target>Calea următoare nu suportă monitorizarea dosarelor:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>Protocolul %x nu suportă monitorizarea dosarelor:</target> <source>Directory monitoring active</source> <target>Monitorizarea dosarelor este activă</target> @@ -629,7 +629,7 @@ Comanda este declanșată dacă: <target>Conținutul Filelor</target> <source>File size</source> -<target>Mărimea Filei</target> +<target>Mărimea Filelor</target> <source>Two way</source> <target>Ambele Direcții</target> @@ -718,8 +718,8 @@ Comanda este declanșată dacă: <source>Base folder:</source> <target>Dosar de Bază:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>Dosarul de versionare va fi actualizat pentru că e conținut într-un dosar de bază.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>Dosarul de versionare este conținut într-un dosar de bază.</target> <source>Synchronizing folder pair:</source> <target>Sincronizez perechea de dosare:</target> @@ -733,6 +733,15 @@ Comanda este declanșată dacă: <source>job name</source> <target>numele sarcinii</target> +<source>Show summary</source> +<target>Arată sumarul (rezumatul)</target> + +<source>Sleep</source> +<target>Pune în repaus [sleep]</target> + +<source>Shut down</source> +<target>Închide PC-ul [Shut down]</target> + <source>Synchronization stopped</source> <target>Sincronizare oprită</target> @@ -754,6 +763,9 @@ Comanda este declanșată dacă: <source>Synchronization completed successfully</source> <target>Sincronizare realizată cu succes</target> +<source>Executing command %x</source> +<target>Execut comanda %x</target> + <source>Cleaning up old log files...</source> <target>Curăț filele de jurnalizare vechi...</target> @@ -782,8 +794,8 @@ Comanda este declanșată dacă: <pluralform>Reîncercare automată în %x de secunde...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Ignoră erorile ulterioare</target> +<source>Ignore &all</source> +<target>Ignoră &Tot</target> <source>Retrying operation...</source> <target>Reîncerc operația...</target> @@ -890,12 +902,12 @@ Comanda este declanșată dacă: <source>&Find...</source> <target>&Găsește...</target> -<source>&Reset layout</source> -<target>&Resetează Aspectul Grafic</target> - <source>&Export file list...</source> <target>&Exportă Lista de File...</target> +<source>&Reset layout</source> +<target>&Resetează Aspectul Grafic</target> + <source>&Tools</source> <target>&Unelte</target> @@ -903,7 +915,7 @@ Comanda este declanșată dacă: <target>&Caută Actualizări Acum</target> <source>Check &automatically once a week</source> -<target>Caută &Automat Săptămînal</target> +<target>Caută Actualizări &Automat Săptămînal</target> <source>Cancel</source> <target>Anulează</target> @@ -984,7 +996,7 @@ Comanda este declanșată dacă: <target>Include legăturile &simbolice:</target> <source>&Follow</source> -<target>&Prin Urmărirea Lor</target> +<target>&Prin urmărirea lor</target> <source>&Direct</source> <target>&Direct</target> @@ -1031,9 +1043,6 @@ Comanda este declanșată dacă: <source>C&lear</source> <target>C&urăță</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Detectează direcțiile de sincronizare cu ajutorul filelor bază de date</target> - <source>Detect moved files</source> <target>Detectează filele mutate</target> @@ -1054,38 +1063,23 @@ Comanda este declanșată dacă: <source>&Recycle bin</source> <target>&Reciclator</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Conservă [back up] în Reciclator filele șterse sau suprascrise</target> - <source>&Permanent</source> <target>&Definitivă</target> -<source>Delete or overwrite files permanently</source> -<target>Filele sînt șterse sau suprascrise în mod definitiv, fără a mai putea fi recuperate</target> - <source>&Versioning</source> <target>&Versionare</target> -<source>Move files to a user-defined folder</source> -<target>Mută filele într-un dosar stabilit de utilizator</target> - <source>Naming convention:</source> <target>Convenție de numire:</target> -<source>Handle errors:</source> -<target>Gestionarea Erorilor:</target> - -<source>&Pop-up</source> -<target>&Popîc</target> +<source>&Ignore errors</source> +<target>&Ignoră Erorile</target> <source>Show pop-up on errors or warnings</source> <target>În caz de erori sau avertizări este arătată o fereastră popîc [popup]</target> -<source>Hide all error and warning messages</source> -<target>Mesajele de eroare și de avertizare nu sînt arătate</target> - -<source>On completion:</source> -<target>La terminare:</target> +<source>Run a command after synchronization:</source> +<target>Rulează o comandă după sincronizare:</target> <source>OK</source> <target>OK</target> @@ -1123,6 +1117,9 @@ Comanda este declanșată dacă: <source>&Key file</source> <target>Filă C&heie</target> +<source>&SSH agent</source> +<target>Agent &SSH</target> + <source>User name:</source> <target>Utilizator:</target> @@ -1141,11 +1138,8 @@ Comanda este declanșată dacă: <source>How to get best performance?</source> <target>Cum obții cea mai bună performanță?</target> -<source>SSH connections for directory reading:</source> -<target>Conexiuni SSH pentru citirea dosarelor:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Interval sugerat: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>Conexiuni pentru citirea dosarelor:</target> <source>SFTP channels per connection:</source> <target>Canale SFTP per conexiune:</target> @@ -1153,9 +1147,6 @@ Comanda este declanșată dacă: <source>Detect server limit</source> <target>Detectează limita serverului</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 conexiuni x 10 canale = citire a dosarelor de 20 de ori mai rapidă</target> - <source>Select a directory on the server:</source> <target>Selectează un dosar de pe server:</target> @@ -1195,6 +1186,9 @@ Comanda este declanșată dacă: <source>Bytes copied:</source> <target>Baiți copiați:</target> +<source>When finished:</source> +<target>La terminare:</target> + <source>Close</source> <target>Închide</target> @@ -1207,15 +1201,18 @@ Comanda este declanșată dacă: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Creează o filă set [batch file] pentru sincronizarea neasistată. Pentru efectuarea sincronizării, dublu-clichează această filă sau programează rularea ei folosind un Planificator de Sarcini [Task Scheduler]: %x</target> -<source>&Stop</source> -<target>&Oprește</target> +<source>Run minimized</source> +<target>Rulează minimizat</target> + +<source>&Show error dialog</source> +<target>Arată dialo&gul erorilor</target> + +<source>&Cancel</source> +<target>&Anulează</target> <source>Stop synchronization at first error</source> <target>Oprește sincronizarea la prima eroare întîlnită</target> -<source>Run minimized</source> -<target>Rulează minimizat</target> - <source>Save log:</source> <target>Salvează jurnalul:</target> @@ -1246,14 +1243,14 @@ Copiază într-o filă temporară (*.ffs_tmp) înainte de suprascrierea filei ț Aceasta garantează consecvența stării filelor chiar și în cazul apariției de erori serioase. </target> -<source>(recommended)</source> -<target>(recomandat)</target> +<source>recommended</source> +<target>recomandată</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Filele partajate sau zăvorîte sînt copiate folosind Serviciul de Conservare a Volumelor din Windows [Volume Shadow Copy].</target> -<source>(requires administrator rights)</source> -<target>(necesită drepturi de Administrator)</target> +<source>requires administrator rights</source> +<target>necesită drepturi de administrator</target> <source>Transfer file and folder permissions.</source> <target>Sînt transferate și permisiunile de accesare NTFS ale filelor și dosarelor (Atenție: doar pentru utilizatorii avansați!).</target> @@ -1285,14 +1282,17 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Source code written in C++ using:</source> <target>Cod sursă scris în C++ folosind:</target> -<source>Donation details</source> -<target>Detaliile Donăriii</target> - <source>If you like FreeFileSync:</source> <target>Donează pentru FreeFileSync:</target> -<source>Donate with PayPal</source> -<target>Donează prin PayPal</target> +<source>Support with a donation</source> +<target>Sprijină cu o donație</target> + +<source>Donation details</source> +<target>Detaliile Donăriii</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>Actualizatorul automat a fost dezactivat de administrator.</target> <source>Feedback and suggestions are welcome</source> <target>Opiniile și sugestiile despre program sînt binevenite.</target> @@ -1330,7 +1330,7 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Activate offline</source> <target>Activează neconectat [offline]</target> -<source>Save as Batch Job</source> +<source>Save as a Batch Job</source> <target>Salvează ca Sarcină Set</target> <source>Delete Items</source> @@ -1369,11 +1369,17 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Overview</source> <target>Panoramă</target> +<source>Show "%x"</source> +<target>Arată "%x"</target> + <source>&Show details</source> <target>&Arată Detalii</target> -<source>A new version of FreeFileSync is available:</source> -<target>Este disponibilă o versiune nouă de FreeFileSync:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x este disponibil!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Filele de instalare sînt stricate (corupte). Reinstalează FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Calea locală nu este disponibilă pentru %x.</target> @@ -1469,9 +1475,6 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Select time span...</source> <target>Selectează intervalul de timp...</target> -<source>Show "%x"</source> -<target>Arată "%x"</target> - <source>Last session</source> <target>Ultima Sesiune</target> @@ -1571,18 +1574,6 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Searching for program updates...</source> <target>Caut actualizări ale programului...</target> -<source>Close progress dialog</source> -<target>Închide Fereastra cu Progresul Sincr.</target> - -<source>Log off</source> -<target>Deloghează Utilizatorul [Log off]</target> - -<source>Standby</source> -<target>Pune PC-ul în Stare de Veghe [Stand-by]</target> - -<source>Shut down</source> -<target>Închide PC-ul [Shut down]</target> - <source>Paused</source> <target>Sincronizare Pauzată</target> @@ -1613,18 +1604,21 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Log</source> <target>Jurnal</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Filele de instalare sînt stricate (corupte). Reinstalează FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Mulțumesc %x, pentru donație și sprijin!</target> +<source>Recommended range:</source> +<target>Interval recomandat:</target> + <source>Password:</source> <target>Parolă:</target> <source>Key password:</source> <target>Parola Cheie:</target> +<source>Please enter a file path.</source> +<target>Introdu calea filei.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1742,6 +1736,15 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Păstrează în Reciclator filele șterse sau suprascrise</target> + +<source>Delete and overwrite files permanently</source> +<target>Șterge și suprascrie filele în mod definitiv</target> + +<source>Move files to a user-defined folder</source> +<target>Mută filele într-un dosar stabilit de utilizator</target> + <source>Replace</source> <target>Înlocuiește</target> @@ -1754,6 +1757,15 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Append a time stamp to each file name</source> <target>Adaugă un marcaj temporal la numele fiecărei file</target> +<source>On completion:</source> +<target>La terminare:</target> + +<source>On errors:</source> +<target>La erori:</target> + +<source>On success:</source> +<target>La succes:</target> + <source>Main config</source> <target>Configurația Principală</target> @@ -1775,9 +1787,6 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Name</source> <target>Nume</target> -<source>Items</source> -<target>Elemente</target> - <source>Percentage</source> <target>Procent</target> @@ -1910,6 +1919,9 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Cannot change process I/O priorities.</source> <target>Nu pot schimba prioritățile I/O ale procesului.</target> +<source>Unable to shut down the system.</source> +<target>Nu pot închide sistemul.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Verificarea disponibilității Reciclatorului a eșuat pentru dosarul %x.</target> @@ -1934,9 +1946,6 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Portable</source> <target>Portabilă</target> -<source>recommended</source> -<target>recomandată</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Salvează setările în "%APPDATA%\FreeFileSync"</target> @@ -1988,8 +1997,8 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Edit with FreeFileSync</source> <target>Editează cu FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>Versiunea portabilă nu poate fi instalată în dosarul selectat.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>Versiunea portabilă de FreeFileSync nu poate fi instalată într-un subdosar al %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Alege instalarea locală sau selectează un dosar diferit pentru instalare.</target> diff --git a/FreeFileSync/Build/Languages/russian.lng b/FreeFileSync/Build/Languages/russian.lng index f5bf30b9..5208d558 100755 --- a/FreeFileSync/Build/Languages/russian.lng +++ b/FreeFileSync/Build/Languages/russian.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Проверка доступности "Корзины" для папки %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Для этого пути "Корзина" недоступна! Файлы будут удалены безвозвратно:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>"Корзина" не поддерживает следующие папки. Удаленные или перезаписанные файлы будет невозможно восстановить:</target> <source>An exception occurred</source> <target>Исключение произошло</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Синтаксис:</target> -<source>global config file:</source> -<target>глобальный конфигурационный файл:</target> - <source>config files:</source> <target>конфигурационный файл:</target> <source>directory</source> <target>папка</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Путь к альтернативному файлу GlobalSettings.xml.</target> +<source>global config file:</source> +<target>глобальный конфигурационный файл:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Любое количество FreeFileSync .ffs_gui и/или .ffs_batch конфигурационных файлов.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Любое количество альтернативных пар папок для не более одного конфигурационного файла.</target> -<source>Open configuration for editing without executing it.</source> -<target>Открыть конфигурацию для редактирования программы без ее выполнения.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Открыть выбранную конфигурацию только для редактирования, не выполняя ее.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Путь к альтернативному файлу GlobalSettings.xml.</target> <source>Cannot find the following folders:</source> <target>Невозможно найти следующие папки:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Обновление атрибутов справа</target> -<source>Cannot write file %x.</source> -<target>Невозможно записать файл %x.</target> +<source>Cannot read file %x.</source> +<target>Невозможно прочитать файл %x.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Actual: %y bytes <source>Operation not supported for different base folder types.</source> <target>Операция не поддерживается для разных базовых типов папок.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Невозможно скопировать символьную ссылку %x в %y.</target> +<source>Cannot write file %x.</source> +<target>Невозможно записать файл %x.</target> <source>Cannot move file %x to %y.</source> <target>Невозможно перенести файл %x в %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Невозможно скопировать символьную ссылку %x в %y.</target> + <source>Unable to connect to %x.</source> <target>Невозможно соединиться с %x.</target> @@ -294,9 +297,6 @@ Actual: %y bytes <source>Cannot read file attributes of %x.</source> <target>Невозможно прочитать атрибуты файла %x.</target> -<source>Cannot read file %x.</source> -<target>Невозможно прочитать файл %x.</target> - <source>Cannot create directory %x.</source> <target>Невозможно создать папку %x.</target> @@ -601,8 +601,8 @@ The command is triggered if: <source>Automated Synchronization</source> <target>Автоматическая синхронизация</target> -<source>The following path does not support directory monitoring:</source> -<target>Следующий путь не поддерживает мониторинг папок:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>Протокол %x не поддерживает мониторинг папки:</target> <source>Directory monitoring active</source> <target>Слежение за папками активировано</target> @@ -718,8 +718,8 @@ The command is triggered if: <source>Base folder:</source> <target>Базовая папка:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>Папка для архивирования файлов будет синхронизирована, поскольку она содержится в базовой папке.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>Папка для архивирования файлов находится в базовой папке.</target> <source>Synchronizing folder pair:</source> <target>Синхронизация пары папок:</target> @@ -733,6 +733,15 @@ The command is triggered if: <source>job name</source> <target>название</target> +<source>Show summary</source> +<target>Показать статистику</target> + +<source>Sleep</source> +<target>Спящий режим</target> + +<source>Shut down</source> +<target>Завершение работы</target> + <source>Synchronization stopped</source> <target>Синхронизация остановлена</target> @@ -754,6 +763,9 @@ The command is triggered if: <source>Synchronization completed successfully</source> <target>Синхронизация завершена успешно</target> +<source>Executing command %x</source> +<target>Выполнение команды %x</target> + <source>Cleaning up old log files...</source> <target>Очистка старых лог-файлов (журналов)...</target> @@ -782,8 +794,8 @@ The command is triggered if: <pluralform>Автоматически повторить через %x секунд...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>И&гнорировать последующие ошибки</target> +<source>Ignore &all</source> +<target>Игнорировать &все</target> <source>Retrying operation...</source> <target>Повторение операции...</target> @@ -890,12 +902,12 @@ The command is triggered if: <source>&Find...</source> <target>Н&айти...</target> -<source>&Reset layout</source> -<target>&Сбросить расположение</target> - <source>&Export file list...</source> <target>&Экспортировать список файлов...</target> +<source>&Reset layout</source> +<target>&Сбросить расположение</target> + <source>&Tools</source> <target>&Инструменты</target> @@ -1031,9 +1043,6 @@ The command is triggered if: <source>C&lear</source> <target>&Очистить</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Обнаружение направления синхронизации с помощью базы данных</target> - <source>Detect moved files</source> <target>Обнаруживать перемещенные файлы</target> @@ -1054,38 +1063,23 @@ The command is triggered if: <source>&Recycle bin</source> <target>В "&Корзину"</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Делать резервную копию удаленных и перезаписанных файлов в "Корзине"</target> - <source>&Permanent</source> <target>&Удалять безвозвратно</target> -<source>Delete or overwrite files permanently</source> -<target>Удалять или перезаписывать файлы, не помещая в "Корзину"</target> - <source>&Versioning</source> <target>&Архивировать</target> -<source>Move files to a user-defined folder</source> -<target>Перемещать файлы в пользовательскую папку</target> - <source>Naming convention:</source> <target>Условие переименования:</target> -<source>Handle errors:</source> -<target>Обработка ошибкок:</target> - -<source>&Pop-up</source> -<target>&Всплывающие окна</target> +<source>&Ignore errors</source> +<target>&Игнорировать ошибки</target> <source>Show pop-up on errors or warnings</source> <target>Показывать всплывающие окна при ошибках и предупреждениях</target> -<source>Hide all error and warning messages</source> -<target>Скрывать все ошибки и сообщения с предупреждениями</target> - -<source>On completion:</source> -<target>По завершению:</target> +<source>Run a command after synchronization:</source> +<target>Запустить команду после синхронизации:</target> <source>OK</source> <target>OK</target> @@ -1123,6 +1117,9 @@ The command is triggered if: <source>&Key file</source> <target>&Файл ключа</target> +<source>&SSH agent</source> +<target>SSH &агент</target> + <source>User name:</source> <target>Имя пользователя:</target> @@ -1141,11 +1138,8 @@ The command is triggered if: <source>How to get best performance?</source> <target>Как получить лучшую производительность?</target> -<source>SSH connections for directory reading:</source> -<target>Количество SSH соединений:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Рекомендуемый диапазон: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>Количество соединений для чтения папок:</target> <source>SFTP channels per connection:</source> <target>Количество SFTP каналов на одно соединение:</target> @@ -1153,9 +1147,6 @@ The command is triggered if: <source>Detect server limit</source> <target>Выявить лимит сервера</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 соединения x 10 каналов = в 20 раз быстрее чтение папок</target> - <source>Select a directory on the server:</source> <target>Выберите папку на сервере:</target> @@ -1180,11 +1171,11 @@ The command is triggered if: <source>Time elapsed:</source> <target>Времени прошло:</target> -<source>Bytes:</source> -<target>Байт(ы):</target> +<source>Bytes</source> +<target>Байт</target> -<source>Items:</source> -<target>Элементы:</target> +<source>Items</source> +<target>Элементов</target> <source>Synchronizing...</source> <target>Синхронизация...</target> @@ -1195,6 +1186,9 @@ The command is triggered if: <source>Bytes copied:</source> <target>Данных скопировано:</target> +<source>When finished:</source> +<target>По завершении:</target> + <source>Close</source> <target>Закрыть</target> @@ -1207,15 +1201,18 @@ The command is triggered if: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Создать файл пакетного задания для автоматической синхронизации. Для запуска дважды кликните этот файл или запланируйте в планировщике задач: %x</target> -<source>&Stop</source> +<source>Run minimized</source> +<target>Запустить свернутым</target> + +<source>&Show error dialog</source> +<target>&Показать окно ошибки</target> + +<source>&Cancel</source> <target>&Остановить</target> <source>Stop synchronization at first error</source> <target>Остановить синхронизацию при первой ошибке</target> -<source>Run minimized</source> -<target>Запустить свернутым</target> - <source>Save log:</source> <target>Сохранять лог-файлы (журналы):</target> @@ -1246,14 +1243,14 @@ This guarantees a consistent state even in case of a serious error. Это гарантирует целостность заменяемых файлов даже в случае возникновения серьезной ошибки. </target> -<source>(recommended)</source> -<target>(рекомендовано)</target> +<source>recommended</source> +<target>рекомендуется</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Копирование общих или заблокированных файлов с использованием службы Теневого Копирования Тома.</target> -<source>(requires administrator rights)</source> -<target>(требуются права Администратора)</target> +<source>requires administrator rights</source> +<target>требуются права администратора</target> <source>Transfer file and folder permissions.</source> <target>Передача прав доступа к файлам/папкам.</target> @@ -1285,14 +1282,17 @@ This guarantees a consistent state even in case of a serious error. <source>Source code written in C++ using:</source> <target>Исходный код написан на C++ с использованием:</target> -<source>Donation details</source> -<target>Детали оплаты</target> - <source>If you like FreeFileSync:</source> <target>Если Вам понравился FreeFileSync:</target> -<source>Donate with PayPal</source> -<target>Отправить деньги через PayPal</target> +<source>Support with a donation</source> +<target>Помочь пожертвованием</target> + +<source>Donation details</source> +<target>Детали оплаты</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>Автоматическое обновление было отключено администратором.</target> <source>Feedback and suggestions are welcome</source> <target>Замечания и предложения приветствуются</target> @@ -1330,8 +1330,8 @@ This guarantees a consistent state even in case of a serious error. <source>Activate offline</source> <target>Активировать в офлайн режиме</target> -<source>Save as Batch Job</source> -<target>Сохранение пакетного задания</target> +<source>Save as a Batch Job</source> +<target>Сохранить как пакетное задание</target> <source>Delete Items</source> <target>Удаление элементов</target> @@ -1369,11 +1369,17 @@ This guarantees a consistent state even in case of a serious error. <source>Overview</source> <target>Главная</target> +<source>Show "%x"</source> +<target>Показать "%x"</target> + <source>&Show details</source> <target>&Показать детали</target> -<source>A new version of FreeFileSync is available:</source> -<target>Доступна новая версия FreeFileSync:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x доступен!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Установочные файлы повреждены. Переустановите FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Локальный путь не доступен для %x.</target> @@ -1469,9 +1475,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>Выберите промежуток времени...</target> -<source>Show "%x"</source> -<target>Показать "%x"</target> - <source>Last session</source> <target>Последняя сессия</target> @@ -1571,18 +1574,6 @@ This guarantees a consistent state even in case of a serious error. <source>Searching for program updates...</source> <target>Проверка обновлений программы...</target> -<source>Close progress dialog</source> -<target>Закрыть окно процесса</target> - -<source>Log off</source> -<target>Выйти из системы (разлогиниться)</target> - -<source>Standby</source> -<target>Перейти в ожидании</target> - -<source>Shut down</source> -<target>Выключить компьютер</target> - <source>Paused</source> <target>Пауза</target> @@ -1613,18 +1604,21 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>Лог (журнал)</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Установочные файлы повреждены. Переустановите FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Благодарим вас, %x, за пожертвование и поддержку!</target> +<source>Recommended range:</source> +<target>Рекомендуемый диапазон:</target> + <source>Password:</source> <target>Пароль:</target> <source>Key password:</source> <target>Пароль:</target> +<source>Please enter a file path.</source> +<target>Пожалуйста, укажите путь к файлу.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1742,6 +1736,15 @@ This guarantees a consistent state even in case of a serious error. <source>MB</source> <target>МБ</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Сохранять удаленные и перезаписанные файлы в "Корзине"</target> + +<source>Delete and overwrite files permanently</source> +<target>Удалять или перезаписывать файлы безвозвратно</target> + +<source>Move files to a user-defined folder</source> +<target>Перемещать файлы в пользовательскую папку</target> + <source>Replace</source> <target>Без переименования</target> @@ -1754,6 +1757,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>Добавить отметку времени для каждого имени файла</target> +<source>On completion:</source> +<target>По завершению:</target> + +<source>On errors:</source> +<target>При ошибке:</target> + +<source>On success:</source> +<target>При успехе:</target> + <source>Main config</source> <target>Главная конфигурация</target> @@ -1775,9 +1787,6 @@ This guarantees a consistent state even in case of a serious error. <source>Name</source> <target>Имя</target> -<source>Items</source> -<target>Элементы</target> - <source>Percentage</source> <target>Проценты</target> @@ -1910,6 +1919,9 @@ This guarantees a consistent state even in case of a serious error. <source>Cannot change process I/O priorities.</source> <target>Невозможно изменить приоритет процесса.</target> +<source>Unable to shut down the system.</source> +<target>Невозможно завершить работу системы.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Проверка "Корзины" не удалась для папки %x.</target> @@ -1932,10 +1944,7 @@ This guarantees a consistent state even in case of a serious error. <target>Локальная</target> <source>Portable</source> -<target>Переносная</target> - -<source>recommended</source> -<target>рекомендуется</target> +<target>Портативная</target> <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Сохраняет настройки в "%APPDATA%\FreeFileSync"</target> @@ -1988,8 +1997,8 @@ This guarantees a consistent state even in case of a serious error. <source>Edit with FreeFileSync</source> <target>Редактировать с помощью FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>Портативная версия не может быть установлена в выбранную папку.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>Портативная версия FreeFileSync не может быть установлена в подпапку %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Пожалуйста, выберите локальный тип установки или выберите другую папку для установки.</target> diff --git a/FreeFileSync/Build/Languages/slovak.lng b/FreeFileSync/Build/Languages/slovak.lng index 51d1108d..9a5489ab 100755 --- a/FreeFileSync/Build/Languages/slovak.lng +++ b/FreeFileSync/Build/Languages/slovak.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Kontrola Koša pre priečinok %x ...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Nie je možné použiť Koš pre následujúce priečinky. Súbory budú odstránené permanentne:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>Premiestnenie do Koša nie je možné pri nasledujúcich priečinkoch. Zmazané alebo prepísané súbory nebude možné obnoviť:</target> <source>An exception occurred</source> <target>Vyskytla sa chyba</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Syntax:</target> -<source>global config file:</source> -<target>globálny konfiguračný súbor:</target> - <source>config files:</source> <target>konfiguračné súbory:</target> <source>directory</source> <target>adresár</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Cesta k alternatívnemu súboru GlobalSettings.xml.</target> +<source>global config file:</source> +<target>globálny konfiguračný súbor:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Ľubovolný počet konfiguračných súborov FreeFileSync typu .ffs_gui a/alebo .ffs_batch.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Ľubovolný počet alternatívnych dvojíc adresárov na aspoň jednu konfiguráciu.</target> -<source>Open configuration for editing without executing it.</source> -<target>Otvriť konfiguráciu pre editáciu bez jej spustenia.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Otvoriť vybranú konfiguráciu na úpravu bez jej spustenia.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Cesta k alternatívnemu súboru GlobalSettings.xml.</target> <source>Cannot find the following folders:</source> <target>Nie je možné nájsť následujúce priečinky:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Aktualizovať atribúty napravo</target> -<source>Cannot write file %x.</source> -<target>Nie je možné zapísať súbor %x.</target> +<source>Cannot read file %x.</source> +<target>Nie je možné načítať súbor %x.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Aktuálne: %y b <source>Operation not supported for different base folder types.</source> <target>Operácia nie je podporovaná pre rozdielne typy základných priečinkov.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Nie je možné kopírovať symbolický odkaz %x do %y.</target> +<source>Cannot write file %x.</source> +<target>Nie je možné zapísať súbor %x.</target> <source>Cannot move file %x to %y.</source> <target>Nie je možné presunúť súbor %x do %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Nie je možné kopírovať symbolický odkaz %x do %y.</target> + <source>Unable to connect to %x.</source> <target>Nie je možné vytvoriť pripojenie k %x.</target> @@ -291,9 +294,6 @@ Aktuálne: %y b <source>Cannot read directory %x.</source> <target>Nie je možné načítať adresár %x.</target> -<source>Cannot read file %x.</source> -<target>Nie je možné načítať súbor %x.</target> - <source>Cannot read file attributes of %x.</source> <target>Nie je možné načítať atribúty súboru %x.</target> @@ -601,8 +601,8 @@ Príkaz bude spustení ak: <source>Automated Synchronization</source> <target>Automatická synchronizácia</target> -<source>The following path does not support directory monitoring:</source> -<target>Následujúca cesta nepodporuje sledovanie adresárov:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>Protokol %x nepodporuje monitorovanie adresárov:</target> <source>Directory monitoring active</source> <target>Sledovanie adresárov je aktivne</target> @@ -632,7 +632,7 @@ Príkaz bude spustení ak: <target>Podľa veľkosti súboru</target> <source>Two way</source> -<target>Dve cesty</target> +<target>Obidve strany</target> <source>Mirror</source> <target>Zrkadlenie</target> @@ -718,8 +718,8 @@ Príkaz bude spustení ak: <source>Base folder:</source> <target>Základný priečinok:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>Priečinok verzovania bude synchronizovaný, pretože jr obsiahnutý v základnom priečinku.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>Priečinok pre archívovanie je obsiahnutý v základnom priečinku.</target> <source>Synchronizing folder pair:</source> <target>Synchronizácia dvojice priečinkov:</target> @@ -733,6 +733,15 @@ Príkaz bude spustení ak: <source>job name</source> <target>názov úlohy</target> +<source>Show summary</source> +<target>Zobraziť súhrn</target> + +<source>Sleep</source> +<target>Uspať</target> + +<source>Shut down</source> +<target>Vypnúť počítač</target> + <source>Synchronization stopped</source> <target>Synchronizácia je zastavená</target> @@ -754,6 +763,9 @@ Príkaz bude spustení ak: <source>Synchronization completed successfully</source> <target>Synchronizácia je úspešne dokončená</target> +<source>Executing command %x</source> +<target>Spúšťací príkaz %x</target> + <source>Cleaning up old log files...</source> <target>Odstráňovanie starých log súborov...</target> @@ -782,8 +794,8 @@ Príkaz bude spustení ak: <pluralform>Autoamticky opakovať za %x sekúnd...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>Pre&skočiť ďalšie chyby</target> +<source>Ignore &all</source> +<target>Ignorovať &všetky</target> <source>Retrying operation...</source> <target>Opakovanie operácie...</target> @@ -890,12 +902,12 @@ Príkaz bude spustení ak: <source>&Find...</source> <target>&Hľadať...</target> -<source>&Reset layout</source> -<target>&Obnoviť rozloženie</target> - <source>&Export file list...</source> <target>&Exportovať zoznam súborov...</target> +<source>&Reset layout</source> +<target>&Obnoviť rozloženie</target> + <source>&Tools</source> <target>&Nastavenie</target> @@ -1031,9 +1043,6 @@ Príkaz bude spustení ak: <source>C&lear</source> <target>Vy&mazať</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Určiť smer synchronizácie pomocou databázy</target> - <source>Detect moved files</source> <target>Detekcia presunutých súborov</target> @@ -1054,38 +1063,23 @@ Príkaz bude spustení ak: <source>&Recycle bin</source> <target>&Kôš</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Použiť Kôš pri zmazaní alebo prepisu súborov</target> - <source>&Permanent</source> <target>&Trvale</target> -<source>Delete or overwrite files permanently</source> -<target>Zmazať alebo prepísať súbory natrvalo</target> - <source>&Versioning</source> <target>&Archívovanie</target> -<source>Move files to a user-defined folder</source> -<target>Presunúť súbory do uživateľom zadaného priečinka</target> - <source>Naming convention:</source> <target>Pomenovanie:</target> -<source>Handle errors:</source> -<target>Spracovanie chýb:</target> - -<source>&Pop-up</source> -<target>&Hlásenie</target> +<source>&Ignore errors</source> +<target>&Ignorovať chyby</target> <source>Show pop-up on errors or warnings</source> <target>Zobraziť hlásenie pri chybe alebo varovaní</target> -<source>Hide all error and warning messages</source> -<target>Skryť všetky chyby a varovania</target> - -<source>On completion:</source> -<target>Po dokončení:</target> +<source>Run a command after synchronization:</source> +<target>Spustiť príkaz po synchronizácií:</target> <source>OK</source> <target>OK</target> @@ -1123,6 +1117,9 @@ Príkaz bude spustení ak: <source>&Key file</source> <target>&Súbor kľúča</target> +<source>&SSH agent</source> +<target>&SSH agent</target> + <source>User name:</source> <target>Uživateľské meno:</target> @@ -1141,11 +1138,8 @@ Príkaz bude spustení ak: <source>How to get best performance?</source> <target>Ako získať najlepší výkon:</target> -<source>SSH connections for directory reading:</source> -<target>SSH pripojenie pre načítanie adresárov:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Navrhovaný rozsah: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>Pripojenia pri načítaní adresárov:</target> <source>SFTP channels per connection:</source> <target>SFTP kanály na pripojenie:</target> @@ -1153,9 +1147,6 @@ Príkaz bude spustení ak: <source>Detect server limit</source> <target>Zistiť limit serveru</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 pripojenia x 10 kanály = 20-krát rýchlejšie načítanie adresárov</target> - <source>Select a directory on the server:</source> <target>Výber adresára na servery:</target> @@ -1180,11 +1171,11 @@ Príkaz bude spustení ak: <source>Time elapsed:</source> <target>Uplynulý čas:</target> -<source>Bytes:</source> -<target>Byty(ov):</target> +<source>Bytes</source> +<target>Bytov</target> -<source>Items:</source> -<target>Položky(iek):</target> +<source>Items</source> +<target>Položky</target> <source>Synchronizing...</source> <target>Synchronizujem...</target> @@ -1195,6 +1186,9 @@ Príkaz bude spustení ak: <source>Bytes copied:</source> <target>Skopírovaných údajov:</target> +<source>When finished:</source> +<target>Po dokončení:</target> + <source>Close</source> <target>Zavrieť</target> @@ -1207,15 +1201,18 @@ Príkaz bude spustení ak: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Vytvorí dávkový súbor pre automatickú synchronizáciu. Ku spusteniu dávky jednoducho pokliknite na vytvorený súbor alebo využite plánovač úloh vašeho systému: %x</target> -<source>&Stop</source> -<target>&Zastaviť</target> +<source>Run minimized</source> +<target>Spustiť minimalizované</target> + +<source>&Show error dialog</source> +<target>&Zobraziť chybový dialóg</target> + +<source>&Cancel</source> +<target>&Zrušiť</target> <source>Stop synchronization at first error</source> <target>Ukončiť synchronizáciu pri prvej chybe</target> -<source>Run minimized</source> -<target>Spustiť minimalizované</target> - <source>Save log:</source> <target>Uložiť log:</target> @@ -1243,14 +1240,14 @@ This guarantees a consistent state even in case of a serious error. </source> <target>Kopírovať najprv do dočasného súboru (*.ffs_tmp), pred prepisom cieľa. Tento postup zaisťuje bezpečný chod aj v prípade závažnej chyby.</target> -<source>(recommended)</source> -<target>(doporučené)</target> +<source>recommended</source> +<target>doporučené</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Kopírovať zdielané alebo zamknuté súbory pomocou služby Tieňové kópie zväzkov.</target> -<source>(requires administrator rights)</source> -<target>(vyžaduje práva správcu)</target> +<source>requires administrator rights</source> +<target>vyžadujú sa práva správcu</target> <source>Transfer file and folder permissions.</source> <target>Preniesť prístupové oprávnenie súborov a priečinkov.</target> @@ -1282,14 +1279,17 @@ This guarantees a consistent state even in case of a serious error. <source>Source code written in C++ using:</source> <target>Zdrojový kód bol napísaný kompletne v C++ pomocou:</target> -<source>Donation details</source> -<target>Detajly darovania</target> - <source>If you like FreeFileSync:</source> <target>Pokiaľ sa Vám FreeFileSync páči:</target> -<source>Donate with PayPal</source> -<target>Prispieť pomocou PayPal</target> +<source>Support with a donation</source> +<target>Podporiť darom</target> + +<source>Donation details</source> +<target>Detajly darovania</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>Automatická aktualizácia bola zakázaná správcom.</target> <source>Feedback and suggestions are welcome</source> <target>Komentáre a námety sú vždy vítané</target> @@ -1327,8 +1327,8 @@ This guarantees a consistent state even in case of a serious error. <source>Activate offline</source> <target>Aktivovať offline</target> -<source>Save as Batch Job</source> -<target>Uložiť ako dávku</target> +<source>Save as a Batch Job</source> +<target>Uložiť ako Batch Job</target> <source>Delete Items</source> <target>Zmazať položky</target> @@ -1366,11 +1366,17 @@ This guarantees a consistent state even in case of a serious error. <source>Overview</source> <target>Prehľad</target> +<source>Show "%x"</source> +<target>Zobraziť "%x"</target> + <source>&Show details</source> <target>&Zobraziť podrobnosti</target> -<source>A new version of FreeFileSync is available:</source> -<target>Je dostupná nová verzia FreeFileSync:</target> +<source>FreeFileSync %x is available!</source> +<target>Je dostupná FreeFileSync verzia %x!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Inštalačný súbor je poškodený. Prosím preinštalujte FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Lokálna cesta pre %x nie je k dispozícií.</target> @@ -1466,9 +1472,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>Zadajte časové rozmedzie...</target> -<source>Show "%x"</source> -<target>Zobraziť "%x"</target> - <source>Last session</source> <target>Posledné sedenie</target> @@ -1568,18 +1571,6 @@ This guarantees a consistent state even in case of a serious error. <source>Searching for program updates...</source> <target>Hľadanie aktualizácií programu ...</target> -<source>Close progress dialog</source> -<target>Zavrieť dialóg priebehu</target> - -<source>Log off</source> -<target>Odhlásiť uživateľa</target> - -<source>Standby</source> -<target>Prepnúť do úsporného režímu</target> - -<source>Shut down</source> -<target>Vypnúť počítač</target> - <source>Paused</source> <target>Pauza</target> @@ -1610,18 +1601,21 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>Záznam spracovania</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Inštalačný súbor je poškodený. Prosím preinštalujte FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Ďakujem, %x, za dar a podporu!</target> +<source>Recommended range:</source> +<target>Odporúčaný rozsah:</target> + <source>Password:</source> <target>Heslo:</target> <source>Key password:</source> <target>Heslo kľúča:</target> +<source>Please enter a file path.</source> +<target>Prosím zadajte cestu k súboru.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1739,6 +1733,15 @@ This guarantees a consistent state even in case of a serious error. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Ponechať zmazané a prepísané sobory v Koši</target> + +<source>Delete and overwrite files permanently</source> +<target>Zmazať a prepísať súbory natrvalo</target> + +<source>Move files to a user-defined folder</source> +<target>Presunúť súbory do uživateľom zadaného priečinka</target> + <source>Replace</source> <target>Nahradiť</target> @@ -1751,6 +1754,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>Pridať časovú značku ku každému názvu súboru</target> +<source>On completion:</source> +<target>Po dokončení:</target> + +<source>On errors:</source> +<target>Pri chybách:</target> + +<source>On success:</source> +<target>Po dokončení:</target> + <source>Main config</source> <target>Hlavná konfigurácia</target> @@ -1772,9 +1784,6 @@ This guarantees a consistent state even in case of a serious error. <source>Name</source> <target>Názov</target> -<source>Items</source> -<target>Položky</target> - <source>Percentage</source> <target>Percentný podiel</target> @@ -1907,6 +1916,9 @@ This guarantees a consistent state even in case of a serious error. <source>Cannot change process I/O priorities.</source> <target>Nie je možné nastaviť I/O priority procesu.</target> +<source>Unable to shut down the system.</source> +<target>Systém sa nedá vypnúť.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Zlyhala kontrola Koša pre priečinok %x.</target> @@ -1931,9 +1943,6 @@ This guarantees a consistent state even in case of a serious error. <source>Portable</source> <target>Prenosná</target> -<source>recommended</source> -<target>doporučené</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Uložiť nastavenia do zložky "%APPDATA%\FreeFileSync"</target> @@ -1985,8 +1994,8 @@ This guarantees a consistent state even in case of a serious error. <source>Edit with FreeFileSync</source> <target>Upraviť vo FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>Prenosná verzia nemôže byť nainštalovaná do vybraného priečinka.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>Prenosnú verziu FreeFileSync nie je možné inštalovať do podpriečinka %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Prosím zvoľte lokálny typ inštalácie alebo vyberte iný priečinok pre inštaláciu.</target> diff --git a/FreeFileSync/Build/Languages/slovenian.lng b/FreeFileSync/Build/Languages/slovenian.lng index 88604387..28f43e2a 100755 --- a/FreeFileSync/Build/Languages/slovenian.lng +++ b/FreeFileSync/Build/Languages/slovenian.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Preverjam razpoložljivost koša za mapo %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Koš ni na voljo za sledeče mape. Datoteke bodo zaradi tega dokončno izbrisane:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target></target> <source>An exception occurred</source> <target>Prišlo je do izjeme</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Sintaksa:</target> -<source>global config file:</source> -<target>datoteka z globalnimi konfiguracijami:</target> - <source>config files:</source> <target>konfiguracijske datoteke:</target> <source>directory</source> <target>imenik</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Pot do alternativne datoteke GlobalSettings.xml.</target> +<source>global config file:</source> +<target>datoteka z globalnimi konfiguracijami:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Poljubno število FreeFileSync .ffs_gui in/ali .ffs_batch konfigracijskih datotek.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Poljubno število alternativnih parov imenikov za največ eno nastavitveno datoteko.</target> -<source>Open configuration for editing without executing it.</source> -<target>Odpri konfiguracijo za urejanje brez njene izvršitve.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target></target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Pot do alternativne datoteke GlobalSettings.xml.</target> <source>Cannot find the following folders:</source> <target>Ne najdem naslednjih map:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Posodobi atribute na desni strani</target> -<source>Cannot write file %x.</source> -<target>Ne morem zapisati datoteke %x.</target> +<source>Cannot read file %x.</source> +<target>Ne morem prebrati datoteke %x.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Dejansko: %y bajtov <source>Operation not supported for different base folder types.</source> <target>Operacija ni podprta za različne osnovne tipe map.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Ne morem kopirati simbolične povezave %x v %y.</target> +<source>Cannot write file %x.</source> +<target>Ne morem zapisati datoteke %x.</target> <source>Cannot move file %x to %y.</source> <target>Ne morem premakniti datoteko %x v %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Ne morem kopirati simbolične povezave %x v %y.</target> + <source>Unable to connect to %x.</source> <target>Ne morem povezati na %x.</target> @@ -291,9 +294,6 @@ Dejansko: %y bajtov <source>Cannot read directory %x.</source> <target>Ne morem prebrati direktorija %x.</target> -<source>Cannot read file %x.</source> -<target>Ne morem prebrati datoteke %x.</target> - <source>Cannot read file attributes of %x.</source> <target>Ne morem brati datotečnih atributov od %x.</target> @@ -606,8 +606,8 @@ Ukaz se sproži če: <source>Automated Synchronization</source> <target>Avtomatska sinhnorizacija</target> -<source>The following path does not support directory monitoring:</source> -<target>Naslednja pot ne podpira nadzorovanja imenika:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target></target> <source>Directory monitoring active</source> <target>Nadzor imenikov je aktiven</target> @@ -723,8 +723,8 @@ Ukaz se sproži če: <source>Base folder:</source> <target>Osnovna mapa:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>Verzionirana mapa bo sinhronizirana ker je vključena v osnovni mapi.</target> +<source>The versioning folder is contained in a base folder.</source> +<target></target> <source>Synchronizing folder pair:</source> <target>Sinhroniziram par map:</target> @@ -738,6 +738,15 @@ Ukaz se sproži če: <source>job name</source> <target>naziv opravila</target> +<source>Show summary</source> +<target></target> + +<source>Sleep</source> +<target></target> + +<source>Shut down</source> +<target>Ugasni</target> + <source>Synchronization stopped</source> <target>Sinhnorizacija zaustavljena</target> @@ -759,6 +768,9 @@ Ukaz se sproži če: <source>Synchronization completed successfully</source> <target>Sinhronizacija se je uspešno končala</target> +<source>Executing command %x</source> +<target></target> + <source>Cleaning up old log files...</source> <target>Čistim stare datoteke beleženja...</target> @@ -788,8 +800,8 @@ Ukaz se sproži če: <pluralform>Ponovni poskus čez %x sekund...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Ignoriraj nadaljnje napake</target> +<source>Ignore &all</source> +<target></target> <source>Retrying operation...</source> <target>Ponovni poizkus operacije...</target> @@ -896,12 +908,12 @@ Ukaz se sproži če: <source>&Find...</source> <target>&Išči...</target> -<source>&Reset layout</source> -<target>&Ponastavi razporeditev</target> - <source>&Export file list...</source> <target>&Izvozi seznam datotek...</target> +<source>&Reset layout</source> +<target>&Ponastavi razporeditev</target> + <source>&Tools</source> <target>&Orodja</target> @@ -1037,9 +1049,6 @@ Ukaz se sproži če: <source>C&lear</source> <target>&Počisti</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Zaznaj smer sinhnorizacije s pomočjo datotek podatkovne baze</target> - <source>Detect moved files</source> <target>Zaznaj premaknjene datoteke</target> @@ -1060,38 +1069,23 @@ Ukaz se sproži če: <source>&Recycle bin</source> <target>&Koš</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Naredi varnostno kopijo izbrisanih in prepisanih datotek v koš</target> - <source>&Permanent</source> <target>&Dokončno</target> -<source>Delete or overwrite files permanently</source> -<target>Trajno izbriši ali prepiši datoteke</target> - <source>&Versioning</source> <target>&Verzioniranje</target> -<source>Move files to a user-defined folder</source> -<target>Premakni datoteke v izbran imenik</target> - <source>Naming convention:</source> <target>Konvencija poimenovanja:</target> -<source>Handle errors:</source> -<target>Upravljanje napak:</target> - -<source>&Pop-up</source> -<target>&Pop-up</target> +<source>&Ignore errors</source> +<target></target> <source>Show pop-up on errors or warnings</source> <target>Prikaži pojavne napaka ali opozorila</target> -<source>Hide all error and warning messages</source> -<target>Skrij vsa obvestila o napakah in opozorilih</target> - -<source>On completion:</source> -<target>Ob zaključku:</target> +<source>Run a command after synchronization:</source> +<target></target> <source>OK</source> <target>V redu</target> @@ -1129,6 +1123,9 @@ Ukaz se sproži če: <source>&Key file</source> <target>&Ključna datoteka</target> +<source>&SSH agent</source> +<target></target> + <source>User name:</source> <target>Uporabniško ime:</target> @@ -1147,11 +1144,8 @@ Ukaz se sproži če: <source>How to get best performance?</source> <target>Kako dobiti najboljšo izvedbo?</target> -<source>SSH connections for directory reading:</source> -<target>SSH povezava za branje direktorija:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Priporočljiv razpon: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target></target> <source>SFTP channels per connection:</source> <target>SFTP kanali za povezavo:</target> @@ -1159,9 +1153,6 @@ Ukaz se sproži če: <source>Detect server limit</source> <target>Zaznaj omejitve serverja</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 povezavi x 10 kanalov = 20-kratno hitrejše branje direktorijev</target> - <source>Select a directory on the server:</source> <target>Izberite imenik na strežniku:</target> @@ -1201,6 +1192,9 @@ Ukaz se sproži če: <source>Bytes copied:</source> <target>Prepisanih bajtov:</target> +<source>When finished:</source> +<target></target> + <source>Close</source> <target>Zapri</target> @@ -1213,15 +1207,18 @@ Ukaz se sproži če: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Ustvari skriptno datoteko za nenadzorovano sinhnorizacijo. Za zagon dvojno kliknite to datoteko ali pa jo umestite v razporejevalnik opravil: %x</target> -<source>&Stop</source> -<target>&Ustavi</target> +<source>Run minimized</source> +<target>Začeni minimizirano</target> + +<source>&Show error dialog</source> +<target></target> + +<source>&Cancel</source> +<target></target> <source>Stop synchronization at first error</source> <target>Ustavi sinhronizacijo ob prvi napaki</target> -<source>Run minimized</source> -<target>Začeni minimizirano</target> - <source>Save log:</source> <target>Shrani dnevnik:</target> @@ -1252,14 +1249,14 @@ Kopiraj v začasno datoteko (*.ffs_tmp) preden prepišeš cilj. To zagotavlja konsistenčnost podatkov v primeru napake. </target> -<source>(recommended)</source> -<target>(priporočeno)</target> +<source>recommended</source> +<target>priporočeno</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Kopiraj zaklenjene in datoteke v skupni rabi s pomočjo Shadow Copy Service.</target> -<source>(requires administrator rights)</source> -<target>(zahteva pravice administratorja)</target> +<source>requires administrator rights</source> +<target></target> <source>Transfer file and folder permissions.</source> <target>Prenesi pravice datotek in map.</target> @@ -1291,14 +1288,17 @@ To zagotavlja konsistenčnost podatkov v primeru napake. <source>Source code written in C++ using:</source> <target>Izvorna koda napisana v C++ z uporabo:</target> -<source>Donation details</source> -<target>Podrobnosti o donaciji</target> - <source>If you like FreeFileSync:</source> <target>Če vam je FreeFileSync všeč:</target> -<source>Donate with PayPal</source> -<target>Doniraj s PayPal</target> +<source>Support with a donation</source> +<target></target> + +<source>Donation details</source> +<target>Podrobnosti o donaciji</target> + +<source>The auto updater was disabled by the administrator.</source> +<target></target> <source>Feedback and suggestions are welcome</source> <target>Povratne informacije in predlogi so dobrodošli</target> @@ -1336,8 +1336,8 @@ To zagotavlja konsistenčnost podatkov v primeru napake. <source>Activate offline</source> <target>Aktivirajte brez povezave</target> -<source>Save as Batch Job</source> -<target>Shrani kot serijsko opravilo</target> +<source>Save as a Batch Job</source> +<target></target> <source>Delete Items</source> <target>Izbriši elemente</target> @@ -1375,11 +1375,17 @@ To zagotavlja konsistenčnost podatkov v primeru napake. <source>Overview</source> <target>Pregled</target> +<source>Show "%x"</source> +<target>Prikaži "%x"</target> + <source>&Show details</source> <target>&Pokaži podrobnosti</target> -<source>A new version of FreeFileSync is available:</source> -<target>Nova različica FreeFileSync je na voljo:</target> +<source>FreeFileSync %x is available!</source> +<target></target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Namestitvena datoteka je poškodovana. Prosim ponovno naložite FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Lokalna pot ni na voljo za %x.</target> @@ -1479,9 +1485,6 @@ To zagotavlja konsistenčnost podatkov v primeru napake. <source>Select time span...</source> <target>Izberite časovni okvir...</target> -<source>Show "%x"</source> -<target>Prikaži "%x"</target> - <source>Last session</source> <target>Zadnja seja</target> @@ -1581,18 +1584,6 @@ To zagotavlja konsistenčnost podatkov v primeru napake. <source>Searching for program updates...</source> <target>Iščem posodobitve programa...</target> -<source>Close progress dialog</source> -<target>Zapri pogovorno okno z napredkom</target> - -<source>Log off</source> -<target>Odjava</target> - -<source>Standby</source> -<target>V pripravljenosti</target> - -<source>Shut down</source> -<target>Ugasni</target> - <source>Paused</source> <target>Začasna ustavitev</target> @@ -1623,18 +1614,21 @@ To zagotavlja konsistenčnost podatkov v primeru napake. <source>Log</source> <target>Dnevnik</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Namestitvena datoteka je poškodovana. Prosim ponovno naložite FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Najlepša hvala, %x, za vašo donacijo in podporo!</target> +<source>Recommended range:</source> +<target></target> + <source>Password:</source> <target>Geslo:</target> <source>Key password:</source> <target>Ključno geslo:</target> +<source>Please enter a file path.</source> +<target></target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1755,6 +1749,15 @@ To zagotavlja konsistenčnost podatkov v primeru napake. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target></target> + +<source>Delete and overwrite files permanently</source> +<target></target> + +<source>Move files to a user-defined folder</source> +<target>Premakni datoteke v izbran imenik</target> + <source>Replace</source> <target>Zamenjaj</target> @@ -1767,6 +1770,15 @@ To zagotavlja konsistenčnost podatkov v primeru napake. <source>Append a time stamp to each file name</source> <target>Imenu vsake datoteke pripni časovno oznako</target> +<source>On completion:</source> +<target>Ob zaključku:</target> + +<source>On errors:</source> +<target></target> + +<source>On success:</source> +<target></target> + <source>Main config</source> <target>Glavna konfiguracija</target> @@ -1788,9 +1800,6 @@ To zagotavlja konsistenčnost podatkov v primeru napake. <source>Name</source> <target>Ime</target> -<source>Items</source> -<target>Elementi</target> - <source>Percentage</source> <target>Odstotek</target> @@ -1926,6 +1935,9 @@ To zagotavlja konsistenčnost podatkov v primeru napake. <source>Cannot change process I/O priorities.</source> <target>Ne morem spremeniti V/I prioritet procesa.</target> +<source>Unable to shut down the system.</source> +<target></target> + <source>Checking recycle bin failed for folder %x.</source> <target>Preverjanje koša za mapo %x ni uspelo.</target> @@ -1950,9 +1962,6 @@ To zagotavlja konsistenčnost podatkov v primeru napake. <source>Portable</source> <target>Prenosna</target> -<source>recommended</source> -<target>priporočeno</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Shrani nastavitve v "%APPDATA%\FreeFileSync"</target> @@ -2004,8 +2013,8 @@ To zagotavlja konsistenčnost podatkov v primeru napake. <source>Edit with FreeFileSync</source> <target>Uredi z FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>namestitev prenosne verzije v izbrano mapo ni mogoč.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target></target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Prosimo izberite tip lokalne namestitve ali pa izberite drugo mapo za namestitev.</target> diff --git a/FreeFileSync/Build/Languages/spanish.lng b/FreeFileSync/Build/Languages/spanish.lng index c94c975b..a6c0ff4c 100755 --- a/FreeFileSync/Build/Languages/spanish.lng +++ b/FreeFileSync/Build/Languages/spanish.lng @@ -20,7 +20,7 @@ <target>La entrada de la base de datos no está sincronizada, de acuerdo con la configuración actual.</target> <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source> -<target>Fijando direcciones de sincronización predeterminadas: los archivos nuevos sobrescribirán los archivos antiguos.</target> +<target>Fijando direcciones de sincronización predeterminadas: los archivos nuevos reemplazarán los archivos antiguos.</target> <source>Creating file %x</source> <target>Creando archivo %x</target> @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Comprobando disponibilidad de la papelera de reciclaje para la carpeta %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>La papelera de reciclaje no está disponible para las carpetas siguientes. Los archivos se borrarán de forma permanente:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>La papelera de reciclaje no está disponible para las carpetas siguientes. Los archivos borrados o reemplazados no se podrán restaurar:</target> <source>An exception occurred</source> <target>Ha ocurrido una excepción</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Sintaxis:</target> -<source>global config file:</source> -<target>archivo de config. global:</target> - <source>config files:</source> <target>archivos de configuración:</target> <source>directory</source> <target>directorio</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Ruta a un archivo alternativo GlobalSettings.xml.</target> +<source>global config file:</source> +<target>archivo de config. global:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Cualquier número de archivos de configuración de FreeFileSync (.ffs_gui ó .ffs_batch).</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Cualquier número de pares de directorios alternativos para un archivo de configuración como máximo.</target> -<source>Open configuration for editing without executing it.</source> -<target>Abrir la configuración para su modicación sin ejecutarla.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Abrir la configuración seleccionada para modificación sin ejecutarla.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Ruta a un archivo alternativo GlobalSettings.xml.</target> <source>Cannot find the following folders:</source> <target>No se pudieron encontrar las siguiente carpetas:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Actualizar atributos en la derecha</target> -<source>Cannot write file %x.</source> -<target>No se puede escribir el archivo %x.</target> +<source>Cannot read file %x.</source> +<target>No se puede leer el archivo %x.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Reales: %y bytes <source>Operation not supported for different base folder types.</source> <target>No se admite esta operación para tipos de carpetas base diferentes.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>No se puede copiar el vínculo simbólico %x a %y.</target> +<source>Cannot write file %x.</source> +<target>No se puede escribir el archivo %x.</target> <source>Cannot move file %x to %y.</source> <target>No se puede mover el archivo %x a %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>No se puede copiar el vínculo simbólico %x a %y.</target> + <source>Unable to connect to %x.</source> <target>No se puede conectar a %x.</target> @@ -294,9 +297,6 @@ Reales: %y bytes <source>Cannot read file attributes of %x.</source> <target>No se puede leer archivo de atributos de %x.</target> -<source>Cannot read file %x.</source> -<target>No se puede leer el archivo %x.</target> - <source>Cannot create directory %x.</source> <target>No se puede crear el directorio %x.</target> @@ -316,7 +316,7 @@ Reales: %y bytes <target>No se puede resolver el vínculo simbólico %x.</target> <source>Unable to move %x to the recycle bin.</source> -<target>Incapaz de mover %x a la papelera de reciclaje.</target> +<target>No es posible mover %x a la papelera de reciclaje.</target> <source>Cannot open file %x.</source> <target>No se puede abrir el archivo %x.</target> @@ -464,8 +464,8 @@ Reales: %y bytes <pluralform>%x threads</pluralform> </source> <target> -<pluralform>1 hilo</pluralform> -<pluralform>%x hilos</pluralform> +<pluralform>1 subproceso</pluralform> +<pluralform>%x subprocesos</pluralform> </target> <source>Scanning:</source> @@ -596,8 +596,8 @@ El comando es disparado si: <source>Automated Synchronization</source> <target>Sincronización Automática</target> -<source>The following path does not support directory monitoring:</source> -<target>La siguiente ruta no permite la supervisión de directorios:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>El protocolo %x no es compatible con la supervisión de directorios:</target> <source>Directory monitoring active</source> <target>Supervisión de directorios activada</target> @@ -713,8 +713,8 @@ El comando es disparado si: <source>Base folder:</source> <target>Carpeta base:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>La carpeta de versionado se sincronizará por estar incluida en una carpeta base.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>La carpeta de versionado está incluida en una carpeta base.</target> <source>Synchronizing folder pair:</source> <target>Sincronizando par de carpetas:</target> @@ -728,6 +728,15 @@ El comando es disparado si: <source>job name</source> <target>nombre de tarea</target> +<source>Show summary</source> +<target>Mostrar recapitulativo</target> + +<source>Sleep</source> +<target>Suspender</target> + +<source>Shut down</source> +<target>Apagar</target> + <source>Synchronization stopped</source> <target>Sincronización detenida</target> @@ -749,6 +758,9 @@ El comando es disparado si: <source>Synchronization completed successfully</source> <target>Sincronización completada satisfactoriamente</target> +<source>Executing command %x</source> +<target>Ejecución del comando %x</target> + <source>Cleaning up old log files...</source> <target>Limpiando antiguos archivos de registro...</target> @@ -776,8 +788,8 @@ El comando es disparado si: <pluralform>Reintento automático en %x segundos...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Ignorar errores posteriores</target> +<source>Ignore &all</source> +<target>Ignorar &todo</target> <source>Retrying operation...</source> <target>Reintentando la operación...</target> @@ -884,12 +896,12 @@ El comando es disparado si: <source>&Find...</source> <target>&Buscar...</target> -<source>&Reset layout</source> -<target>&Restablecer diseño</target> - <source>&Export file list...</source> <target>&Exportar lista de archivos...</target> +<source>&Reset layout</source> +<target>&Restablecer diseño</target> + <source>&Tools</source> <target>Herramien&tas</target> @@ -1025,9 +1037,6 @@ El comando es disparado si: <source>C&lear</source> <target>B&orrar</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Detectar direcciones de sincronización a partir de archivos de bases de datos</target> - <source>Detect moved files</source> <target>Detectar archivos movidos</target> @@ -1048,38 +1057,23 @@ El comando es disparado si: <source>&Recycle bin</source> <target>Papelera de &reciclaje</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Copiar a la papelera de reciclaje los archivos eliminados y reemplazados</target> - <source>&Permanent</source> <target>&Permanente</target> -<source>Delete or overwrite files permanently</source> -<target>Borrar o sobrescribir los archivos permanentemente</target> - <source>&Versioning</source> <target>&Versionado</target> -<source>Move files to a user-defined folder</source> -<target>Mover los archivos a una carpeta del usuario</target> - <source>Naming convention:</source> <target>Convención de nombre:</target> -<source>Handle errors:</source> -<target>Tratar errores:</target> - -<source>&Pop-up</source> -<target>En &ventana</target> +<source>&Ignore errors</source> +<target>&Ignorar errores</target> <source>Show pop-up on errors or warnings</source> <target>Mostrar ventana emergente de errores o avisos</target> -<source>Hide all error and warning messages</source> -<target>Ocultar todos los mensajes de error y aviso</target> - -<source>On completion:</source> -<target>Al completar:</target> +<source>Run a command after synchronization:</source> +<target>Ejecutar un comando tras la sincronización:</target> <source>OK</source> <target>OK</target> @@ -1117,6 +1111,9 @@ El comando es disparado si: <source>&Key file</source> <target>Archivo de &clave</target> +<source>&SSH agent</source> +<target>Agente &SSH</target> + <source>User name:</source> <target>Usuario:</target> @@ -1135,11 +1132,8 @@ El comando es disparado si: <source>How to get best performance?</source> <target>¿Cómo obtener el mejor rendimiento?</target> -<source>SSH connections for directory reading:</source> -<target>Conexiones SSH para lectura de directorios:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Rango sugerido: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>Conexiones para lectura de directorios:</target> <source>SFTP channels per connection:</source> <target>Canales SFTP por conexión:</target> @@ -1147,9 +1141,6 @@ El comando es disparado si: <source>Detect server limit</source> <target>Detectar el límite del servidor</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 conexiones x 10 canales = lectura de directorios 20 veces más rápida</target> - <source>Select a directory on the server:</source> <target>Seleccione un directorio en el servidor:</target> @@ -1189,6 +1180,9 @@ El comando es disparado si: <source>Bytes copied:</source> <target>Bytes copiados:</target> +<source>When finished:</source> +<target>Tras finalizar:</target> + <source>Close</source> <target>Cerrar</target> @@ -1201,15 +1195,18 @@ El comando es disparado si: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Crear tarea por lotes para sincronización desatendida. Para iniciar, haga doble clic en este archivo o prográmelo en el planificador de tareas : %x</target> -<source>&Stop</source> -<target>&Detener</target> +<source>Run minimized</source> +<target>Ejecutar minimizado</target> + +<source>&Show error dialog</source> +<target>Mo&strar diálogo de error</target> + +<source>&Cancel</source> +<target>&Cancelar</target> <source>Stop synchronization at first error</source> <target>Detener la sincronización con el primer error</target> -<source>Run minimized</source> -<target>Ejecutar minimizado</target> - <source>Save log:</source> <target>Guardar registro:</target> @@ -1237,17 +1234,17 @@ This guarantees a consistent state even in case of a serious error. </source> <target> Copiar a archivo temporal (*.ffs_tmp) antes de sobrescribir en destino. -Se garantiza un estado coherente incluso en caso de error grave. +Esto garantiza un estado coherente incluso en caso de error grave. </target> -<source>(recommended)</source> -<target>(recomendado)</target> +<source>recommended</source> +<target>recomendado</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Copiar archivos compartidos o bloqueados usando el servicio de Instantánea de volumen.</target> -<source>(requires administrator rights)</source> -<target>(requiere derechos de administrador)</target> +<source>requires administrator rights</source> +<target>requiere derechos de administrador</target> <source>Transfer file and folder permissions.</source> <target>Transferir permisos de archivos y carpetas.</target> @@ -1279,14 +1276,17 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Source code written in C++ using:</source> <target>Código fuente C++ con soporte de :</target> -<source>Donation details</source> -<target>Detalles para donación</target> - <source>If you like FreeFileSync:</source> <target>Si te resulta útil FreeFileSync:</target> -<source>Donate with PayPal</source> -<target>Contribuye con PayPal</target> +<source>Support with a donation</source> +<target>¿Contribuye con tu donación!</target> + +<source>Donation details</source> +<target>Detalles para donación</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>La actualización automática ha sido desactivada por el administrador.</target> <source>Feedback and suggestions are welcome</source> <target>Tus comentarios y sugerencias son bienvenidos :</target> @@ -1324,8 +1324,8 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Activate offline</source> <target>Activar sin conexión</target> -<source>Save as Batch Job</source> -<target>Guardar como tarea por lotes</target> +<source>Save as a Batch Job</source> +<target>Guardar como una tarea por lotes</target> <source>Delete Items</source> <target>Eliminar elementos</target> @@ -1363,11 +1363,17 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Overview</source> <target>Vista general</target> +<source>Show "%x"</source> +<target>Mostrar "%x"</target> + <source>&Show details</source> <target>Mo&strar detalles</target> -<source>A new version of FreeFileSync is available:</source> -<target>Una nueva versión de FreeFileSync está disponible:</target> +<source>FreeFileSync %x is available!</source> +<target>¡Ya está disponible FreeFileSync %x!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Los archivos de instalación están dañados. Reinstale FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Ruta local no disponible para %x.</target> @@ -1459,9 +1465,6 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Select time span...</source> <target>Seleccionar duración...</target> -<source>Show "%x"</source> -<target>Mostrar "%x"</target> - <source>Last session</source> <target>Última sesión</target> @@ -1561,18 +1564,6 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Searching for program updates...</source> <target>Buscando actualizaciones del programa...</target> -<source>Close progress dialog</source> -<target>Cerrar diálogo de progreso</target> - -<source>Log off</source> -<target>Finalizar sesión</target> - -<source>Standby</source> -<target>Suspender</target> - -<source>Shut down</source> -<target>Apagar</target> - <source>Paused</source> <target>Pausado</target> @@ -1603,18 +1594,21 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Log</source> <target>Registro</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Los archivos de instalación están dañados. Reinstale FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>¡Muchas gracias, %x, por su contribución y ayuda!</target> +<source>Recommended range:</source> +<target>Rango recomendado:</target> + <source>Password:</source> <target>Contraseña:</target> <source>Key password:</source> <target>Contraseña de clave:</target> +<source>Please enter a file path.</source> +<target>Indique la ruta de un archivo.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1729,6 +1723,15 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Conservar en la papelera de reciclaje los archivos eliminados y reemplazados</target> + +<source>Delete and overwrite files permanently</source> +<target>Borrar y reemplazar los archivos permanentemente</target> + +<source>Move files to a user-defined folder</source> +<target>Mover los archivos a una carpeta del usuario</target> + <source>Replace</source> <target>Reemplazar</target> @@ -1741,6 +1744,15 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Append a time stamp to each file name</source> <target>Incluir marca horaria en cada nombre de archivo</target> +<source>On completion:</source> +<target>Al completar:</target> + +<source>On errors:</source> +<target>Con errores:</target> + +<source>On success:</source> +<target>Con éxito:</target> + <source>Main config</source> <target>Configuración principal</target> @@ -1762,9 +1774,6 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Name</source> <target>Nombre</target> -<source>Items</source> -<target>Elementos</target> - <source>Percentage</source> <target>Porcentaje</target> @@ -1894,6 +1903,9 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Cannot change process I/O priorities.</source> <target>No se pudieron cambiar las prioridades de E/S del proceso.</target> +<source>Unable to shut down the system.</source> +<target>No es posible apagar el sistema.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Fallo al comprobar la papelera de reciclaje para la carpeta %x.</target> @@ -1918,9 +1930,6 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Portable</source> <target>Portable</target> -<source>recommended</source> -<target>recomendado</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Guardar cambios en "%APPDATA%\FreeFileSync"</target> @@ -1972,8 +1981,8 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Edit with FreeFileSync</source> <target>Modificar con FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>No se puede instalar la version portátil en la carpeta seleccionada.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>No se puede instalar la version portátil de FreeFileSync en una subcarpeta de %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Elija el tipo de instalación local o seleccione otra carpeta de instalación.</target> diff --git a/FreeFileSync/Build/Languages/swedish.lng b/FreeFileSync/Build/Languages/swedish.lng index 85aeef75..87f17c27 100755 --- a/FreeFileSync/Build/Languages/swedish.lng +++ b/FreeFileSync/Build/Languages/swedish.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>Kontrollerar papperskorgens tillgänglighet för %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Papperskorgen är inte tillgänglig för följande mappar. Filerna kommer istället att tas bort permanent:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>Papperskorgen stöds inte av följande mappar. Borttagna eller överskrivna filer kommer inte att kunna återställas:</target> <source>An exception occurred</source> <target>Ett undantag inträffade</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Syntax:</target> -<source>global config file:</source> -<target>övergripande konfigurationsfil:</target> - <source>config files:</source> <target>configurationsfiler:</target> <source>directory</source> <target>mapp</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Sökväg till en alternativ GlobalSettings.xml-fil.</target> +<source>global config file:</source> +<target>övergripande konfigurationsfil:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Valfritt antal FreeFileSync .ffs_gui och/eller .ffs_batch konfigurationsfiler.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Valfritt antal alternativa katalogpar för som mest, en konfigurationsfil.</target> -<source>Open configuration for editing without executing it.</source> -<target>Öppna konfigurationen för redigering utan att köra det.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Öppna den valda konfigurationen endast för redigering, utan att köra den.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Sökväg till en alternativ GlobalSettings.xml-fil.</target> <source>Cannot find the following folders:</source> <target>Kan inte hitta följande mappar:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Uppdatera attribut på höger sida</target> -<source>Cannot write file %x.</source> -<target>Filen %x kan inte skrivas.</target> +<source>Cannot read file %x.</source> +<target>Filen %x kan inte läsas in.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Aktuell: %y byte <source>Operation not supported for different base folder types.</source> <target>Åtgärden stöder inte olika basmapptyper.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Kan inte kopiera den symboliska länken %x till %y.</target> +<source>Cannot write file %x.</source> +<target>Filen %x kan inte skrivas.</target> <source>Cannot move file %x to %y.</source> <target>Kan inte flytta filen %x till %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Kan inte kopiera den symboliska länken %x till %y.</target> + <source>Unable to connect to %x.</source> <target>Kan inte ansluta till %x.</target> @@ -291,9 +294,6 @@ Aktuell: %y byte <source>Cannot read directory %x.</source> <target>Kan inte läsa mappen %x.</target> -<source>Cannot read file %x.</source> -<target>Filen %x kan inte läsas in.</target> - <source>Cannot read file attributes of %x.</source> <target>Kan inte läsa filattribut för %x.</target> @@ -596,8 +596,8 @@ Kommandot triggas om: <source>Automated Synchronization</source> <target>Automatiserad synkronisering</target> -<source>The following path does not support directory monitoring:</source> -<target>Följande sökväg stöder inte mappövervakning:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>%x-protokollet stödjer inte mappövervakning:</target> <source>Directory monitoring active</source> <target>Mappövervakning aktiv</target> @@ -713,8 +713,8 @@ Kommandot triggas om: <source>Base folder:</source> <target>Basmapp:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>Versionshanteringsmappen kommer att synkroniseras, eftersom den ligger i en basmapp.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>Versionshanteringsmappen lagras i en basmapp.</target> <source>Synchronizing folder pair:</source> <target>Synkroniserar katalogpar:</target> @@ -728,6 +728,15 @@ Kommandot triggas om: <source>job name</source> <target>åtgärdsnamn</target> +<source>Show summary</source> +<target>Visa sammandrag</target> + +<source>Sleep</source> +<target>Strömsparläge</target> + +<source>Shut down</source> +<target>Stäng av datorn</target> + <source>Synchronization stopped</source> <target>Synkroniseringen stoppad</target> @@ -749,6 +758,9 @@ Kommandot triggas om: <source>Synchronization completed successfully</source> <target>Synkronisering slutförd</target> +<source>Executing command %x</source> +<target>Kör kommandot %x</target> + <source>Cleaning up old log files...</source> <target>Rensar ut gamla loggfiler...</target> @@ -776,8 +788,8 @@ Kommandot triggas om: <pluralform>Automatiskt återförsök om %x sekunder...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Ignorera efterföljande fel</target> +<source>Ignore &all</source> +<target>Ignorera &fel</target> <source>Retrying operation...</source> <target>Upprepar åtgärden...</target> @@ -884,12 +896,12 @@ Kommandot triggas om: <source>&Find...</source> <target>&Sök...</target> -<source>&Reset layout</source> -<target>&Återställ layout</target> - <source>&Export file list...</source> <target>&Exportera fillista...</target> +<source>&Reset layout</source> +<target>&Återställ layout</target> + <source>&Tools</source> <target>&Verktyg</target> @@ -1025,9 +1037,6 @@ Kommandot triggas om: <source>C&lear</source> <target>&Rensa</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Hitta synkroniseringsmappar med hjälp av databasfiler</target> - <source>Detect moved files</source> <target>Hitta flyttade filer</target> @@ -1048,38 +1057,23 @@ Kommandot triggas om: <source>&Recycle bin</source> <target>&Papperskorgen</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Kopiera borttagna och överskrivna filer till papperskorgen</target> - <source>&Permanent</source> <target>&Permanent</target> -<source>Delete or overwrite files permanently</source> -<target>Ta bort eller skriv över permanent</target> - <source>&Versioning</source> <target>&Versionshantering</target> -<source>Move files to a user-defined folder</source> -<target>Flytta filer till en fördefinierad mapp</target> - <source>Naming convention:</source> <target>Regler för namngivning:</target> -<source>Handle errors:</source> -<target>Felhantering:</target> - -<source>&Pop-up</source> -<target>&Popup</target> +<source>&Ignore errors</source> +<target>&Ignorera fel</target> <source>Show pop-up on errors or warnings</source> <target>Visa popup vid fel och varningar</target> -<source>Hide all error and warning messages</source> -<target>Visa inte fel- och varningsmeddelanden</target> - -<source>On completion:</source> -<target>Vid slutförd åtgärd:</target> +<source>Run a command after synchronization:</source> +<target>Kör ett kommando efter synkronisering:</target> <source>OK</source> <target>OK</target> @@ -1117,6 +1111,9 @@ Kommandot triggas om: <source>&Key file</source> <target>&Nyckel</target> +<source>&SSH agent</source> +<target>&SSH-agent</target> + <source>User name:</source> <target>Användarnamn:</target> @@ -1135,11 +1132,8 @@ Kommandot triggas om: <source>How to get best performance?</source> <target>Hur får man ut bästa prestanda?</target> -<source>SSH connections for directory reading:</source> -<target>SSH-anslutningar för katalogläsning:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Föreslaget intervall: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>Anslutningar för mappläsning:</target> <source>SFTP channels per connection:</source> <target>SFTP-kanaler per anslutning:</target> @@ -1147,9 +1141,6 @@ Kommandot triggas om: <source>Detect server limit</source> <target>Identifiera serverbegränsning</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 anslutningar x 10 kanaler = 20 gånger snabbare katalogläsning</target> - <source>Select a directory on the server:</source> <target>Välj en mapp på servern:</target> @@ -1189,6 +1180,9 @@ Kommandot triggas om: <source>Bytes copied:</source> <target>Kopierade byte:</target> +<source>When finished:</source> +<target>Vid slutfört:</target> + <source>Close</source> <target>Stäng</target> @@ -1201,15 +1195,18 @@ Kommandot triggas om: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Skapa en batch-fil för obevakad synkronisering. Dubbelklicka på filen för att starta den, eller schemalägg i en åtgärdshanterare: %x</target> -<source>&Stop</source> -<target>&Stopp</target> +<source>Run minimized</source> +<target>Kör minimerad</target> + +<source>&Show error dialog</source> +<target>&Visa feldialog</target> + +<source>&Cancel</source> +<target>&Avbryt</target> <source>Stop synchronization at first error</source> <target>Stoppa synkroniseringen vid första fel som uppstår</target> -<source>Run minimized</source> -<target>Kör minimerad</target> - <source>Save log:</source> <target>Spara logg:</target> @@ -1240,14 +1237,14 @@ Kopierar till en temporär fil (*.ffs_tmp), före överskrivning av målet. Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. </target> -<source>(recommended)</source> -<target>(rekommenderas)</target> +<source>recommended</source> +<target>rekommenderas</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Kopierar delade eller låsta filer med hjälp av tjänsten 'Volume Shadow Copy'.</target> -<source>(requires administrator rights)</source> -<target>(kräver administratörsbehörighet)</target> +<source>requires administrator rights</source> +<target>kräver administratörsrättigheter</target> <source>Transfer file and folder permissions.</source> <target>Överför behörighetsinställningar.</target> @@ -1279,14 +1276,17 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Source code written in C++ using:</source> <target>Källkod skriven i C++ med hjälp av:</target> -<source>Donation details</source> -<target>Donationsuppgifter</target> - <source>If you like FreeFileSync:</source> <target>Om du gillar FreeFileSync:</target> -<source>Donate with PayPal</source> -<target>Donera via PayPal</target> +<source>Support with a donation</source> +<target>Stöd oss med en donation</target> + +<source>Donation details</source> +<target>Donationsuppgifter</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>Automatisk uppdatering inaktiverades av administratören.</target> <source>Feedback and suggestions are welcome</source> <target>Återkoppling och förslag är välkommna</target> @@ -1324,7 +1324,7 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Activate offline</source> <target>Aktivera offline</target> -<source>Save as Batch Job</source> +<source>Save as a Batch Job</source> <target>Spara som batch-fil</target> <source>Delete Items</source> @@ -1363,11 +1363,17 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Overview</source> <target>Översikt</target> +<source>Show "%x"</source> +<target>Visa "%x"</target> + <source>&Show details</source> <target>&Visa detaljerat</target> -<source>A new version of FreeFileSync is available:</source> -<target>Det finns en ny version av FreeFileSync:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x finns tillgänglig!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Installationsfilerna är skadade. Installera om FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Lokal sökväg ej tillgänglig för %x.</target> @@ -1459,9 +1465,6 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Select time span...</source> <target>Välj tidsintervall...</target> -<source>Show "%x"</source> -<target>Visa "%x"</target> - <source>Last session</source> <target>Senaste session</target> @@ -1561,18 +1564,6 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Searching for program updates...</source> <target>Söker efter programuppdateringar...</target> -<source>Close progress dialog</source> -<target>Stäng förloppsindikator</target> - -<source>Log off</source> -<target>Logga ut</target> - -<source>Standby</source> -<target>Strömsparläge</target> - -<source>Shut down</source> -<target>Stäng av datorn</target> - <source>Paused</source> <target>Pausad</target> @@ -1603,18 +1594,21 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Log</source> <target>Logg</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Installationsfilerna är skadade. Installera om FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Tack %x, för din donation och ditt stöd!</target> +<source>Recommended range:</source> +<target>Rekommenderat intervall:</target> + <source>Password:</source> <target>Lösenord:</target> <source>Key password:</source> <target>Nyckellösenord:</target> +<source>Please enter a file path.</source> +<target>Ange en filsökväg.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1729,6 +1723,15 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Behåll borttagna och överskrivna filer i papperskorgen</target> + +<source>Delete and overwrite files permanently</source> +<target>Ta bort och skriv över filer permanent</target> + +<source>Move files to a user-defined folder</source> +<target>Flytta filer till en fördefinierad mapp</target> + <source>Replace</source> <target>Byt ut</target> @@ -1741,6 +1744,15 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Append a time stamp to each file name</source> <target>Lägg till en tidsstämpel till varje filnamn</target> +<source>On completion:</source> +<target>Vid slutförd åtgärd:</target> + +<source>On errors:</source> +<target>Vid fel:</target> + +<source>On success:</source> +<target>Vid slutfört:</target> + <source>Main config</source> <target>Huvudkonfiguration</target> @@ -1762,9 +1774,6 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Name</source> <target>Namn</target> -<source>Items</source> -<target>Objekt</target> - <source>Percentage</source> <target>Procent</target> @@ -1894,6 +1903,9 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Cannot change process I/O priorities.</source> <target>Kan inte ändra I/O-prioritet.</target> +<source>Unable to shut down the system.</source> +<target>Kan inte stänga av systemet.</target> + <source>Checking recycle bin failed for folder %x.</source> <target>Kontroll av papperskorgen misslyckades för %x.</target> @@ -1918,9 +1930,6 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Portable</source> <target>Portabel</target> -<source>recommended</source> -<target>rekommenderas</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Sparar inställningar i "%APPDATA%\FreeFileSync"</target> @@ -1972,8 +1981,8 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Edit with FreeFileSync</source> <target>Redigera med FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>Portabel version kan inte installeras i den valda mappen.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>FreeFileSync portabel version kan inte installeras i en undermapp till %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Välj lokal installationstyp eller välj en annan mapp för installationen.</target> diff --git a/FreeFileSync/Build/Languages/turkish.lng b/FreeFileSync/Build/Languages/turkish.lng index d4425d99..1e4843c2 100755 --- a/FreeFileSync/Build/Languages/turkish.lng +++ b/FreeFileSync/Build/Languages/turkish.lng @@ -52,8 +52,8 @@ <source>Checking recycle bin availability for folder %x...</source> <target>%x klasörü için Geri Dönüşüm Kutusu kullanılabilir mi diye bakılıyor...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Şu klasörler için Geri Dönüşüm Kutusu kullanılamıyor. Dosyalar kalıcı olarak silinecek:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target></target> <source>An exception occurred</source> <target>Olağan dışı bir durumla karşılaşıldı</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Yazım:</target> -<source>global config file:</source> -<target>genel ayar dosyası:</target> - <source>config files:</source> <target>ayar dosyaları:</target> <source>directory</source> <target>klasör</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Alternatif GlobalSettings.xml dosyasının yolu.</target> +<source>global config file:</source> +<target>genel ayar dosyası:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>FreeFileSync .ffs_gui ya da .ffs_batch ayar dosyalarının sayısı.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>En fazla bir ayar dosyası için herhangi bir sayıda alternatif klasör çifti.</target> -<source>Open configuration for editing without executing it.</source> -<target>Ayarları yürütmeden düzenlemek için açın.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target></target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Alternatif GlobalSettings.xml dosyasının yolu.</target> <source>Cannot find the following folders:</source> <target>Aşağıdaki klasörler bulunamadı:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Sağdaki öznitelikler güncellensin</target> -<source>Cannot write file %x.</source> -<target>%x dosyası yazılamadı.</target> +<source>Cannot read file %x.</source> +<target>%x dosyası okunamadı.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Gerçekleşen: %y bayt <source>Operation not supported for different base folder types.</source> <target>Farklı temel klasör türleri üzerindeki işlemler desteklenmiyor.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>%x sembolik bağlantısı %y hedefine kopyalanamadı.</target> +<source>Cannot write file %x.</source> +<target>%x dosyası yazılamadı.</target> <source>Cannot move file %x to %y.</source> <target>%x dosyası %y hedefine taşınamadı.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>%x sembolik bağlantısı %y hedefine kopyalanamadı.</target> + <source>Unable to connect to %x.</source> <target>%x üzerine bağlanılamadı.</target> @@ -291,9 +294,6 @@ Gerçekleşen: %y bayt <source>Cannot read directory %x.</source> <target>%x klasörü okunamadı.</target> -<source>Cannot read file %x.</source> -<target>%x dosyası okunamadı.</target> - <source>Cannot read file attributes of %x.</source> <target>%x dosyasının öznitelikleri okunamadı.</target> @@ -596,8 +596,8 @@ Komut şu durumlarda yürütülür: <source>Automated Synchronization</source> <target>Otomatik Eşitleme</target> -<source>The following path does not support directory monitoring:</source> -<target>Şu yol için klasör izlemesi yapılamıyor:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target></target> <source>Directory monitoring active</source> <target>Klasör izlemesi yapılıyor</target> @@ -713,8 +713,8 @@ Komut şu durumlarda yürütülür: <source>Base folder:</source> <target>Temel klasör:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>Sürüm klasörü bir temel klasör içinde bulunduğundan eşitlenecek.</target> +<source>The versioning folder is contained in a base folder.</source> +<target></target> <source>Synchronizing folder pair:</source> <target>Eşitlenen klasör çifti:</target> @@ -728,6 +728,15 @@ Komut şu durumlarda yürütülür: <source>job name</source> <target>iş adı</target> +<source>Show summary</source> +<target></target> + +<source>Sleep</source> +<target></target> + +<source>Shut down</source> +<target>Bilgisayar Kapatılsın</target> + <source>Synchronization stopped</source> <target>Eşitleme durduruldu</target> @@ -749,6 +758,9 @@ Komut şu durumlarda yürütülür: <source>Synchronization completed successfully</source> <target>Eşitleme tamamlandı</target> +<source>Executing command %x</source> +<target></target> + <source>Cleaning up old log files...</source> <target>Eski günlük dosyaları temizleniyor...</target> @@ -776,8 +788,8 @@ Komut şu durumlarda yürütülür: <pluralform>%x saniye içinde yeniden denenecek...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>Sonraki &hatalar yoksayılsın</target> +<source>Ignore &all</source> +<target></target> <source>Retrying operation...</source> <target>İşlem yeniden deneniyor...</target> @@ -884,12 +896,12 @@ Komut şu durumlarda yürütülür: <source>&Find...</source> <target>A&rama...</target> -<source>&Reset layout</source> -<target>Görünümü &Sıfırla</target> - <source>&Export file list...</source> <target>&Dosya Listesini Ver...</target> +<source>&Reset layout</source> +<target>Görünümü &Sıfırla</target> + <source>&Tools</source> <target>&Araçlar</target> @@ -1025,9 +1037,6 @@ Komut şu durumlarda yürütülür: <source>C&lear</source> <target>&Temizle</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Eşitleme yönleri veritabanı dosyalarının yardımı ile algılanır</target> - <source>Detect moved files</source> <target>Taşınmış dosyalar algılansın</target> @@ -1048,38 +1057,23 @@ Komut şu durumlarda yürütülür: <source>&Recycle bin</source> <target>Ge&ri Dönüşüm Kutusuna Atılsın</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Silinen ya da üzerine yazılan dosyalar geri dönüşüm kutusuna gönderilir</target> - <source>&Permanent</source> <target>&Kalıcı Olarak Silinsin</target> -<source>Delete or overwrite files permanently</source> -<target>Dosyalar kalıcı olarak silinir ya da üzerine yazılır</target> - <source>&Versioning</source> <target>Eski &Sürüm Olarak Saklansın</target> -<source>Move files to a user-defined folder</source> -<target>Dosyalar kullanıcı tarafından belirtilen bir klasöre taşınır</target> - <source>Naming convention:</source> <target>Adlandırma Kuralı:</target> -<source>Handle errors:</source> -<target>Hata Durumunda:</target> - -<source>&Pop-up</source> -<target>&Görüntüle</target> +<source>&Ignore errors</source> +<target></target> <source>Show pop-up on errors or warnings</source> <target>Hata ya da uyarılar açılır pencerede görüntülenir</target> -<source>Hide all error and warning messages</source> -<target>Hiçbir hata ve uyarı iletisi görüntülenmez</target> - -<source>On completion:</source> -<target>İşlem Tamamlandığında:</target> +<source>Run a command after synchronization:</source> +<target></target> <source>OK</source> <target>Tamam</target> @@ -1117,6 +1111,9 @@ Komut şu durumlarda yürütülür: <source>&Key file</source> <target>Anahtar &Dosyası</target> +<source>&SSH agent</source> +<target></target> + <source>User name:</source> <target>Kullanıcı Adı:</target> @@ -1135,11 +1132,8 @@ Komut şu durumlarda yürütülür: <source>How to get best performance?</source> <target>En iyi başarım nasıl elde edilir?</target> -<source>SSH connections for directory reading:</source> -<target>SSH Klasör Okuma Bağlantı Sayısı:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Önerilen Aralık: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target></target> <source>SFTP channels per connection:</source> <target>Bir Bağlantı için SFTP Kanalı Sayısı:</target> @@ -1147,9 +1141,6 @@ Komut şu durumlarda yürütülür: <source>Detect server limit</source> <target>Sunucu Sınırını Bul</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 bağlantı x 10 kanal = 20 kat hızlı klasör okuma</target> - <source>Select a directory on the server:</source> <target>Sunucu üzerinde bir klasör seçin:</target> @@ -1189,6 +1180,9 @@ Komut şu durumlarda yürütülür: <source>Bytes copied:</source> <target>Kopyalanan bayt:</target> +<source>When finished:</source> +<target></target> + <source>Close</source> <target>Kapat</target> @@ -1201,15 +1195,18 @@ Komut şu durumlarda yürütülür: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Eşitleme işleminin hiç bir soru sorulmadan yapılması için bir toplu iş dosyası oluşturun. İşlemi başlatmak için bu dosyaya çift tıklayın ya da bir görev zamanlayıcıya şu şekilde ekleyin: %x</target> -<source>&Stop</source> -<target>&Durdur</target> +<source>Run minimized</source> +<target>Küçülterek Çalıştır</target> + +<source>&Show error dialog</source> +<target></target> + +<source>&Cancel</source> +<target></target> <source>Stop synchronization at first error</source> <target>Oluşacak ilk hatada eşitleme durdurulsun</target> -<source>Run minimized</source> -<target>Küçülterek Çalıştır</target> - <source>Save log:</source> <target>İşlem Günlüğünü Kaydet:</target> @@ -1240,14 +1237,14 @@ Dosyalar önce geçici dosyaya kopyalanıp (*.ffs_tmp) sonra yeniden adlandırı Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak yapılmasını sağlar. </target> -<source>(recommended)</source> -<target>(önerilir)</target> +<source>recommended</source> +<target>önerilen</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Paylaşılan ya da kilitlenmiş dosyalar Birim Gölge Hizmetini kullanılarak kopyalanır.</target> -<source>(requires administrator rights)</source> -<target>(yönetici hakları gereklidir)</target> +<source>requires administrator rights</source> +<target></target> <source>Transfer file and folder permissions.</source> <target>Dosya ve klasör izinleri de aktarılır.</target> @@ -1279,14 +1276,17 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Source code written in C++ using:</source> <target>Kaynak kodu C++ kullanılarak yazılmıştır:</target> -<source>Donation details</source> -<target>Bağış Bilgileri</target> - <source>If you like FreeFileSync:</source> <target>FreeFileSync hoşunuza gittiyse:</target> -<source>Donate with PayPal</source> -<target>PayPal Üzerinden Bağış Yapın</target> +<source>Support with a donation</source> +<target></target> + +<source>Donation details</source> +<target>Bağış Bilgileri</target> + +<source>The auto updater was disabled by the administrator.</source> +<target></target> <source>Feedback and suggestions are welcome</source> <target>Öneri ve geri bildirimlerinizi bekleriz</target> @@ -1324,8 +1324,8 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Activate offline</source> <target>Çevrimdışı Etkinleştir</target> -<source>Save as Batch Job</source> -<target>Toplu İş Olarak Kaydet</target> +<source>Save as a Batch Job</source> +<target></target> <source>Delete Items</source> <target>Ögeleri Sil</target> @@ -1363,11 +1363,17 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Overview</source> <target>Genel</target> +<source>Show "%x"</source> +<target>"%x" paneli görüntülensin</target> + <source>&Show details</source> <target>&Ayrıntılara Bakın</target> -<source>A new version of FreeFileSync is available:</source> -<target>Yeni bir FreeFileSync sürümü yayınlanmış:</target> +<source>FreeFileSync %x is available!</source> +<target></target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Kurulum dosyaları bozulmuş. Lütfen FreeFileSync uygulamasını yeniden kurun.</target> <source>Local path not available for %x.</source> <target>%x için yerel yol bulunamadı.</target> @@ -1459,9 +1465,6 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Select time span...</source> <target>Zaman aralığını seçin...</target> -<source>Show "%x"</source> -<target>"%x" paneli görüntülensin</target> - <source>Last session</source> <target>Önceki oturum</target> @@ -1561,18 +1564,6 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Searching for program updates...</source> <target>Yazılım güncellemesine bakılıyor...</target> -<source>Close progress dialog</source> -<target>İşlem Penceresi Kapatılsın</target> - -<source>Log off</source> -<target>Oturum Kapatılsın</target> - -<source>Standby</source> -<target>Uykuya Dalınsın</target> - -<source>Shut down</source> -<target>Bilgisayar Kapatılsın</target> - <source>Paused</source> <target>Duraklatıldı</target> @@ -1603,18 +1594,21 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Log</source> <target>Günlük</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Kurulum dosyaları bozulmuş. Lütfen FreeFileSync uygulamasını yeniden kurun.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Sevgili %x, bağışın ve desteğin için teşekkürler!</target> +<source>Recommended range:</source> +<target></target> + <source>Password:</source> <target>Parola:</target> <source>Key password:</source> <target>Anahtar Parolası:</target> +<source>Please enter a file path.</source> +<target></target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1729,6 +1723,15 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>MB</source> <target>MB</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target></target> + +<source>Delete and overwrite files permanently</source> +<target></target> + +<source>Move files to a user-defined folder</source> +<target>Dosyalar kullanıcı tarafından belirtilen bir klasöre taşınır</target> + <source>Replace</source> <target>Ad Değiştirme</target> @@ -1741,6 +1744,15 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Append a time stamp to each file name</source> <target>Dosya adlarına zaman damgası eklensin</target> +<source>On completion:</source> +<target>İşlem Tamamlandığında:</target> + +<source>On errors:</source> +<target></target> + +<source>On success:</source> +<target></target> + <source>Main config</source> <target>Temel ayarlar</target> @@ -1762,9 +1774,6 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Name</source> <target>Ad</target> -<source>Items</source> -<target>Ögeler</target> - <source>Percentage</source> <target>Yüzde</target> @@ -1894,6 +1903,9 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Cannot change process I/O priorities.</source> <target>Giriş/Çıkış işlemi öncelikleri değiştirilemedi.</target> +<source>Unable to shut down the system.</source> +<target></target> + <source>Checking recycle bin failed for folder %x.</source> <target>%x klasörü için Geri Dönüşüm Kutusu denetlenemedi.</target> @@ -1918,9 +1930,6 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Portable</source> <target>Taşınabilir</target> -<source>recommended</source> -<target>önerilen</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Ayarlar "%APPDATA%\FreeFileSync" Klasörüne Kaydedilsin</target> @@ -1972,8 +1981,8 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Edit with FreeFileSync</source> <target>FreeFileSync ile Düzenlensin</target> -<source>The portable version cannot install into the selected folder.</source> -<target>Taşınabilir sürüm seçilmiş klasöre kurulamaz.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target></target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Kurulum için farklı bir klasör ya da yerel kurulum türünü seçin.</target> diff --git a/FreeFileSync/Build/Languages/ukrainian.lng b/FreeFileSync/Build/Languages/ukrainian.lng index 1eacd45f..7de37ffe 100755 --- a/FreeFileSync/Build/Languages/ukrainian.lng +++ b/FreeFileSync/Build/Languages/ukrainian.lng @@ -32,13 +32,13 @@ <target>Створення символьного посилання %x</target> <source>Moving file %x to the recycle bin</source> -<target>Переміщення файлу %x до Корзини</target> +<target>Переміщення файлу %x до корзини</target> <source>Moving folder %x to the recycle bin</source> -<target>Переміщення папки %x до Корзини</target> +<target>Переміщення папки %x до корзини</target> <source>Moving symbolic link %x to the recycle bin</source> -<target>Переміщення символьного посилання %x до Корзини</target> +<target>Переміщення символьного посилання %x до корзини</target> <source>Deleting file %x</source> <target>Вилучення файлу %x</target> @@ -50,10 +50,10 @@ <target>Вилучення символьного посилання %x</target> <source>Checking recycle bin availability for folder %x...</source> -<target>Перевірка доступності Корзини для папки %x...</target> +<target>Перевірка доступності корзини для папки %x...</target> -<source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Корзина не доступна для таких папок. Файли замість цього будуть видалені назавжди:</target> +<source>The recycle bin is not supported by the following folders. Deleted or overwritten files will not be able to be restored:</source> +<target>Корзина недоступна для поточних папок. Видалені чи перезаписані файли буде неможливо відновити:</target> <source>An exception occurred</source> <target>Відбулось виключення</target> @@ -88,17 +88,14 @@ <source>Syntax:</source> <target>Синтаксис:</target> -<source>global config file:</source> -<target>глобальний конфігураційний файл:</target> - <source>config files:</source> <target>файли конфігурації:</target> <source>directory</source> <target>папка</target> -<source>Path to an alternate GlobalSettings.xml file.</source> -<target>Шлях до альтернативного файлу GlobalSettings.xml.</target> +<source>global config file:</source> +<target>глобальний конфігураційний файл:</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Будь-яка кількість FreeFileSync .ffs_gui та/або .ffs_batch файлів конфігурації.</target> @@ -106,8 +103,11 @@ <source>Any number of alternative directory pairs for at most one config file.</source> <target>Будь-яка кількість альтернативних пар папок для не більше одного конфігураційного файлу.</target> -<source>Open configuration for editing without executing it.</source> -<target>Відкрити конфігурацію для редагування без її запуску.</target> +<source>Open the selected configuration for editing only without executing it.</source> +<target>Відкрити вибрану конфігурацію тільки для редагування без її виконання.</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Шлях до альтернативного файлу GlobalSettings.xml.</target> <source>Cannot find the following folders:</source> <target>Не вдається знайти такі папки:</target> @@ -253,8 +253,8 @@ <source>Update attributes on right</source> <target>Оновити атрибути праворуч</target> -<source>Cannot write file %x.</source> -<target>Не вдається записати файл %x.</target> +<source>Cannot read file %x.</source> +<target>Не вдається прочитати файл %x.</target> <source> Unexpected size of data stream. @@ -273,12 +273,15 @@ Actual: %y bytes <source>Operation not supported for different base folder types.</source> <target>Операція не підтримується для різних типів базових папок.</target> -<source>Cannot copy symbolic link %x to %y.</source> -<target>Не вдається скопіювати символьне посилання %x до %y.</target> +<source>Cannot write file %x.</source> +<target>Не вдається записати файл %x.</target> <source>Cannot move file %x to %y.</source> <target>Не вдається перемістити файл %x до %y.</target> +<source>Cannot copy symbolic link %x to %y.</source> +<target>Не вдається скопіювати символьне посилання %x до %y.</target> + <source>Unable to connect to %x.</source> <target>Не вдається з'єднатися з %x.</target> @@ -291,9 +294,6 @@ Actual: %y bytes <source>Cannot read directory %x.</source> <target>Не вдається прочитати папку %x.</target> -<source>Cannot read file %x.</source> -<target>Не вдається прочитати файл %x.</target> - <source>Cannot read file attributes of %x.</source> <target>Не вдається прочитати атрибути файлу %x.</target> @@ -316,7 +316,7 @@ Actual: %y bytes <target>Не вдається вирішити символьне посилання %x.</target> <source>Unable to move %x to the recycle bin.</source> -<target>Не вдається перемістити %x до Корзини.</target> +<target>Не вдається перемістити %x до корзини.</target> <source>Cannot open file %x.</source> <target>Не вдається відкрити файл %x.</target> @@ -501,7 +501,7 @@ Actual: %y bytes <target>Не вдалося встановити ім'я тому для %x.</target> <source>Volume name %x is not part of file path %y.</source> -<target>Ім'я тому %x не є частиною файлового шляху %y.</target> +<target>Ім'я тому %x не є частиною шляху до файлу %y.</target> <source>Stop requested: Waiting for current operation to finish...</source> <target>Запит зупинки: очікування завершення поточної операції...</target> @@ -601,8 +601,8 @@ The command is triggered if: <source>Automated Synchronization</source> <target>Автоматична Синхронізація</target> -<source>The following path does not support directory monitoring:</source> -<target>Наступний шлях не підтримує моніторинг папок:</target> +<source>The %x protocol does not support directory monitoring:</source> +<target>Протокол %x не підтримує моніторинг папок:</target> <source>Directory monitoring active</source> <target>Моніторинг папок активний</target> @@ -718,8 +718,8 @@ The command is triggered if: <source>Base folder:</source> <target>Основна папка:</target> -<source>The versioning folder will be synchronized because it is contained in a base folder.</source> -<target>Папка з версіями буде синхронізована, тому що вона міститься в основній папці.</target> +<source>The versioning folder is contained in a base folder.</source> +<target>Папка з версіями містить основну папку.</target> <source>Synchronizing folder pair:</source> <target>Синхронізація пари папок:</target> @@ -733,6 +733,15 @@ The command is triggered if: <source>job name</source> <target>назва завдання</target> +<source>Show summary</source> +<target>Показати підсумки</target> + +<source>Sleep</source> +<target>Перейти в режим сну</target> + +<source>Shut down</source> +<target>Вимкнути комп'ютер</target> + <source>Synchronization stopped</source> <target>Синхронізацію зупинено</target> @@ -754,6 +763,9 @@ The command is triggered if: <source>Synchronization completed successfully</source> <target>Синхронізація успішно завершена</target> +<source>Executing command %x</source> +<target>Виконати команду %x</target> + <source>Cleaning up old log files...</source> <target>Очистка старих журналів...</target> @@ -782,8 +794,8 @@ The command is triggered if: <pluralform>Автоматичний повтор за %x секунд...</pluralform> </target> -<source>&Ignore subsequent errors</source> -<target>&Ігнорувати наступні помилки</target> +<source>Ignore &all</source> +<target>Ігнорувати &усі</target> <source>Retrying operation...</source> <target>Повтор операції...</target> @@ -890,12 +902,12 @@ The command is triggered if: <source>&Find...</source> <target>З&найти...</target> -<source>&Reset layout</source> -<target>&Скинути розташування</target> - <source>&Export file list...</source> <target>&Експортувати список файлів...</target> +<source>&Reset layout</source> +<target>&Скинути розташування</target> + <source>&Tools</source> <target>&Інструменти</target> @@ -1026,14 +1038,11 @@ The command is triggered if: <target>Максимум:</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> -<target>Виберіть правила фільтрації для виключення деяких файлів із синхронізації. Введіть шляхи файлів відносно відповідної пари папок.</target> +<target>Виберіть правила фільтрації для виключення деяких файлів із синхронізації. Введіть шляхи до файлів відносно відповідної пари папок.</target> <source>C&lear</source> <target>О&чистити</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Визначити напрямок синхронізації за допомогою файлів баз даних</target> - <source>Detect moved files</source> <target>Виявляти переміщені файли</target> @@ -1054,38 +1063,23 @@ The command is triggered if: <source>&Recycle bin</source> <target>&Корзина</target> -<source>Back up deleted and overwritten files in the recycle bin</source> -<target>Робити резервну копію вилучених та перезаписаних файлів в Корзині</target> - <source>&Permanent</source> <target>&Безповоротно</target> -<source>Delete or overwrite files permanently</source> -<target>Вилучати чи перезаписувати файли безповоротно</target> - <source>&Versioning</source> <target>&Управління версіями</target> -<source>Move files to a user-defined folder</source> -<target>Перемістити файли у визначену користувачем папку</target> - <source>Naming convention:</source> <target>Метод іменування:</target> -<source>Handle errors:</source> -<target>Обробка помилок:</target> - -<source>&Pop-up</source> -<target>&Спливаючі вікна</target> +<source>&Ignore errors</source> +<target>&Ігнорувати помилки</target> <source>Show pop-up on errors or warnings</source> <target>Показувати виринаючі вікна при помилках та попередженнях</target> -<source>Hide all error and warning messages</source> -<target>Приховати всі помилки і повідомлення з попередженнями</target> - -<source>On completion:</source> -<target>Після завершення:</target> +<source>Run a command after synchronization:</source> +<target>Виконати команду після синхронізації:</target> <source>OK</source> <target>OK</target> @@ -1123,6 +1117,9 @@ The command is triggered if: <source>&Key file</source> <target>&Файл ключа</target> +<source>&SSH agent</source> +<target>&SSH агент</target> + <source>User name:</source> <target>Ім'я користувача:</target> @@ -1141,11 +1138,8 @@ The command is triggered if: <source>How to get best performance?</source> <target>Як отримати найкращу швидкодію?</target> -<source>SSH connections for directory reading:</source> -<target>SSH з'єднання для читання папок:</target> - -<source>Suggested range: [1 - 10]</source> -<target>Рекомендований діапазон: [1 - 10]</target> +<source>Connections for directory reading:</source> +<target>З'єднань для читання папок:</target> <source>SFTP channels per connection:</source> <target>SFTP канали на з'єднання:</target> @@ -1153,9 +1147,6 @@ The command is triggered if: <source>Detect server limit</source> <target>Визначити ліміти сервера</target> -<source>2 connections x 10 channels = 20 times faster directory reading</source> -<target>2 з'єднання x 10 каналів = у 20 раз швидше читання папок</target> - <source>Select a directory on the server:</source> <target>Вибрати папку на сервері:</target> @@ -1195,6 +1186,9 @@ The command is triggered if: <source>Bytes copied:</source> <target>Байт скопійовано:</target> +<source>When finished:</source> +<target>Після завершення:</target> + <source>Close</source> <target>Закрити</target> @@ -1207,15 +1201,18 @@ The command is triggered if: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Створити пакетний файл для автоматичної синхронізації. Щоб запустити двічі клацніть цей файл або заплануйте в планувальнику завдань: %x</target> -<source>&Stop</source> -<target>&Зупинити</target> +<source>Run minimized</source> +<target>Запустити згорнутим</target> + +<source>&Show error dialog</source> +<target>&Показати діалог з помилками</target> + +<source>&Cancel</source> +<target>&Відмінити</target> <source>Stop synchronization at first error</source> <target>Зупинити синхронізацію при першій помилці</target> -<source>Run minimized</source> -<target>Запустити згорнутим</target> - <source>Save log:</source> <target>Зберегти журнал:</target> @@ -1246,14 +1243,14 @@ This guarantees a consistent state even in case of a serious error. Це гарантує цілісність навіть у випадку серйозної помилки. </target> -<source>(recommended)</source> -<target>(рекомендовано)</target> +<source>recommended</source> +<target>рекомендовано</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> <target>Копіювати спільні та заблоковані файли за допомогою сервісу Тіньового Копіювання Тому.</target> -<source>(requires administrator rights)</source> -<target>(потрібні права адміністратора)</target> +<source>requires administrator rights</source> +<target>потрібні права адміністратора</target> <source>Transfer file and folder permissions.</source> <target>Перенести права доступу файлів і папок.</target> @@ -1285,14 +1282,17 @@ This guarantees a consistent state even in case of a serious error. <source>Source code written in C++ using:</source> <target>Код програми написаний на C++ з використанням:</target> -<source>Donation details</source> -<target>Докладно про пожертвування</target> - <source>If you like FreeFileSync:</source> <target>Якщо Вам сподобався FreeFileSync:</target> -<source>Donate with PayPal</source> -<target>Пожертвувати через PayPal</target> +<source>Support with a donation</source> +<target>Підтримати пожертвуванням.</target> + +<source>Donation details</source> +<target>Докладно про пожертвування</target> + +<source>The auto updater was disabled by the administrator.</source> +<target>Автоматичне оновлення було відключене адміністратором.</target> <source>Feedback and suggestions are welcome</source> <target>Відгуки та пропозиції вітаються</target> @@ -1330,8 +1330,8 @@ This guarantees a consistent state even in case of a serious error. <source>Activate offline</source> <target>Активувати offline</target> -<source>Save as Batch Job</source> -<target>Зберегти як пакетне завдання</target> +<source>Save as a Batch Job</source> +<target>Зберегти як Пакетне Завдання</target> <source>Delete Items</source> <target>Вилучити Елементи</target> @@ -1369,11 +1369,17 @@ This guarantees a consistent state even in case of a serious error. <source>Overview</source> <target>Огляд</target> +<source>Show "%x"</source> +<target>Показати "%x"</target> + <source>&Show details</source> <target>&Показати докладніше</target> -<source>A new version of FreeFileSync is available:</source> -<target>Доступна нова версія FreeFileSync:</target> +<source>FreeFileSync %x is available!</source> +<target>FreeFileSync %x доступний!</target> + +<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> +<target>Файли встановлення пошкоджені. Будь ласка, перевстановіть FreeFileSync.</target> <source>Local path not available for %x.</source> <target>Локальний шлях не доступний для %x.</target> @@ -1469,9 +1475,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>Виберіть інтервал часу...</target> -<source>Show "%x"</source> -<target>Показати "%x"</target> - <source>Last session</source> <target>Остання сесія</target> @@ -1571,18 +1574,6 @@ This guarantees a consistent state even in case of a serious error. <source>Searching for program updates...</source> <target>Пошук оновлень програми ...</target> -<source>Close progress dialog</source> -<target>Закрити вікно прогресу</target> - -<source>Log off</source> -<target>Вийти із системи</target> - -<source>Standby</source> -<target>Сплячий режим</target> - -<source>Shut down</source> -<target>Вимкнути комп'ютер</target> - <source>Paused</source> <target>Призупинено</target> @@ -1613,18 +1604,21 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>Лог</target> -<source>Installation files are corrupted. Please reinstall FreeFileSync.</source> -<target>Файли встановлення пошкоджені. Будь ласка, перевстановіть FreeFileSync.</target> - <source>Thank you, %x, for your donation and support!</source> <target>Дякуємо Вам, %x, за ваше пожертвування та підтримку!</target> +<source>Recommended range:</source> +<target>Рекомендований діапазон:</target> + <source>Password:</source> <target>Пароль:</target> <source>Key password:</source> <target>Пароль ключа:</target> +<source>Please enter a file path.</source> +<target>Будь-ласка, введіть шлях до файлу.</target> + <source> <pluralform>Copy the following item to another folder?</pluralform> <pluralform>Copy the following %x items to another folder?</pluralform> @@ -1643,9 +1637,9 @@ This guarantees a consistent state even in case of a serious error. <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> </source> <target> -<pluralform>Ви дійсно хочете перемістити цей %x елемент у Корзину?</pluralform> -<pluralform>Ви дійсно хочете перемістити ці %x елементи у Корзину?</pluralform> -<pluralform>Ви дійсно хочете перемістити ці %x елементів у Корзину?</pluralform> +<pluralform>Ви дійсно хочете перемістити цей %x елемент у корзину?</pluralform> +<pluralform>Ви дійсно хочете перемістити ці %x елементи у корзину?</pluralform> +<pluralform>Ви дійсно хочете перемістити ці %x елементів у корзину?</pluralform> </target> <source>Move</source> @@ -1742,6 +1736,15 @@ This guarantees a consistent state even in case of a serious error. <source>MB</source> <target>МБ</target> +<source>Retain deleted and overwritten files in the recycle bin</source> +<target>Залишити видалені і перезаписані файли у корзині</target> + +<source>Delete and overwrite files permanently</source> +<target>Видалити і перезаписати файли назавжди</target> + +<source>Move files to a user-defined folder</source> +<target>Перемістити файли у визначену користувачем папку</target> + <source>Replace</source> <target>Замінити</target> @@ -1754,6 +1757,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>Приєднати відмітку часу до кожної назви файлу</target> +<source>On completion:</source> +<target>Після завершення:</target> + +<source>On errors:</source> +<target>Після завершення з помилками:</target> + +<source>On success:</source> +<target>Після успішного завершення:</target> + <source>Main config</source> <target>Головна конфігурація</target> @@ -1775,9 +1787,6 @@ This guarantees a consistent state even in case of a serious error. <source>Name</source> <target>Назва</target> -<source>Items</source> -<target>Елементи</target> - <source>Percentage</source> <target>Проценти</target> @@ -1910,8 +1919,11 @@ This guarantees a consistent state even in case of a serious error. <source>Cannot change process I/O priorities.</source> <target>Не вдалося змінити пріоритетів Вх/Вих процесу.</target> +<source>Unable to shut down the system.</source> +<target>Не вдається завершити роботу системи.</target> + <source>Checking recycle bin failed for folder %x.</source> -<target>Перевірка Корзини для папки %x не вдалася.</target> +<target>Перевірка корзини для папки %x не вдалася.</target> <source>The following XML elements could not be read:</source> <target>Наступні XML елементи не вдалося прочитати:</target> @@ -1934,9 +1946,6 @@ This guarantees a consistent state even in case of a serious error. <source>Portable</source> <target>Портативна</target> -<source>recommended</source> -<target>рекомендовано</target> - <source>Save settings to "%APPDATA%\FreeFileSync"</source> <target>Зберегти налаштування в "%APPDATA%\FreeFileSync"</target> @@ -1988,8 +1997,8 @@ This guarantees a consistent state even in case of a serious error. <source>Edit with FreeFileSync</source> <target>Редагувати за допомогою FreeFileSync</target> -<source>The portable version cannot install into the selected folder.</source> -<target>Портативна версія не може бути встановлена у вибрану папку.</target> +<source>The FreeFileSync portable version cannot install into a subfolder of %x.</source> +<target>Портативна версія FreeFileSync не може бути встановлена в підпапку %x.</target> <source>Please choose the local installation type or select a different folder for installation.</source> <target>Будь ласка, виберіть локальний тип інсталяції чи іншу папку для встановлення.</target> diff --git a/FreeFileSync/Build/Resources.zip b/FreeFileSync/Build/Resources.zip Binary files differindex 39f43566..5c7cc44b 100755 --- a/FreeFileSync/Build/Resources.zip +++ b/FreeFileSync/Build/Resources.zip diff --git a/FreeFileSync/Source/Makefile b/FreeFileSync/Source/Makefile index 46e18617..46e18617 100644..100755 --- a/FreeFileSync/Source/Makefile +++ b/FreeFileSync/Source/Makefile diff --git a/FreeFileSync/Source/RealTimeSync/app_icon.h b/FreeFileSync/Source/RealTimeSync/app_icon.h index 69f54b4a..00797e37 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/RealTimeSync/application.cpp b/FreeFileSync/Source/RealTimeSync/application.cpp index 72fbcc37..e4cfc530 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/RealTimeSync/application.h b/FreeFileSync/Source/RealTimeSync/application.h index df3f030b..b4228c50 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/RealTimeSync/folder_selector2.cpp b/FreeFileSync/Source/RealTimeSync/folder_selector2.cpp index 38ba3f02..fce01000 100755 --- a/FreeFileSync/Source/RealTimeSync/folder_selector2.cpp +++ b/FreeFileSync/Source/RealTimeSync/folder_selector2.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/RealTimeSync/folder_selector2.h b/FreeFileSync/Source/RealTimeSync/folder_selector2.h index 7b32e15a..a11567a8 100755 --- a/FreeFileSync/Source/RealTimeSync/folder_selector2.h +++ b/FreeFileSync/Source/RealTimeSync/folder_selector2.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/RealTimeSync/main_dlg.cpp b/FreeFileSync/Source/RealTimeSync/main_dlg.cpp index 6ba72874..4acd8c25 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -159,7 +159,7 @@ void MainDialog::OnShowHelp(wxCommandEvent& event) void MainDialog::OnMenuAbout(wxCommandEvent& event) { - wxString build = formatTime<std::wstring>(FORMAT_DATE, getCompileTime()) + SPACED_DASH + L"Unicode"; + std::wstring build = formatTime<std::wstring>(FORMAT_DATE, getCompileTime()) + SPACED_DASH + L"Unicode"; #ifndef wxUSE_UNICODE #error what is going on? #endif diff --git a/FreeFileSync/Source/RealTimeSync/main_dlg.h b/FreeFileSync/Source/RealTimeSync/main_dlg.h index cee7574c..21decc40 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/RealTimeSync/monitor.cpp b/FreeFileSync/Source/RealTimeSync/monitor.cpp index ba6afd0c..54f5ae65 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/RealTimeSync/monitor.h b/FreeFileSync/Source/RealTimeSync/monitor.h index 8fb7ae3f..c8809998 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/RealTimeSync/tray_menu.cpp b/FreeFileSync/Source/RealTimeSync/tray_menu.cpp index 735ffadc..ec2185d3 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/RealTimeSync/tray_menu.h b/FreeFileSync/Source/RealTimeSync/tray_menu.h index 42afeb06..c0833784 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/RealTimeSync/xml_proc.cpp b/FreeFileSync/Source/RealTimeSync/xml_proc.cpp index e1a625c7..8b631d6c 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/RealTimeSync/xml_proc.h b/FreeFileSync/Source/RealTimeSync/xml_proc.h index 73b283bb..3969ba23 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/algorithm.cpp b/FreeFileSync/Source/algorithm.cpp index 90f60a6a..861ca36d 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/algorithm.h b/FreeFileSync/Source/algorithm.h index 55022ae6..98067b4e 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/application.cpp b/FreeFileSync/Source/application.cpp index 395ae1d3..005f5a64 100755 --- a/FreeFileSync/Source/application.cpp +++ b/FreeFileSync/Source/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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -72,7 +72,6 @@ bool Application::OnInit() catch (const FileError&) { assert(false); } - Connect(wxEVT_QUERY_END_SESSION, wxEventHandler(Application::onQueryEndSession), nullptr, this); Connect(wxEVT_END_SESSION, wxEventHandler(Application::onQueryEndSession), nullptr, this); @@ -120,7 +119,7 @@ int Application::OnRun() } //catch (...) -> let it crash and create mini dump!!! - return returnCode; + return returnCode_; } @@ -153,7 +152,7 @@ void Application::launch(const std::vector<Zstring>& commandArgs) auto titleFmt = copyStringTo<std::wstring>(wxTheApp->GetAppDisplayName()) + SPACED_DASH + title; wxSafeShowMessage(titleFmt, msg); - raiseReturnCode(returnCode, FFS_RC_ABORTED); + raiseReturnCode(returnCode_, FFS_RC_ABORTED); }; //parse command line arguments @@ -327,7 +326,7 @@ void Application::launch(const std::vector<Zstring>& commandArgs) } if (!replaceDirectories(batchCfg.mainCfg)) return; - runBatchMode(globalConfigFilePath, batchCfg, filepath, returnCode); + runBatchMode(globalConfigFilePath, batchCfg, filepath, returnCode_); } //GUI mode: single config (ffs_gui *or* ffs_batch) else diff --git a/FreeFileSync/Source/application.h b/FreeFileSync/Source/application.h index 72a5ad82..5803bee6 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -26,7 +26,7 @@ private: void onQueryEndSession(wxEvent& event); void launch(const std::vector<Zstring>& commandArgs); - zen::FfsReturnCode returnCode = zen::FFS_RC_SUCCESS; + zen::FfsReturnCode returnCode_ = zen::FFS_RC_SUCCESS; }; #endif //APPLICATION_H_081568741942010985702395 diff --git a/FreeFileSync/Source/comparison.cpp b/FreeFileSync/Source/comparison.cpp index a8dba8fd..b75dc62a 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/comparison.h b/FreeFileSync/Source/comparison.h index b326a44c..03afa415 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/file_hierarchy.cpp b/FreeFileSync/Source/file_hierarchy.cpp index 64f36bd1..dfe1bffb 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -194,8 +194,8 @@ SyncOperation FolderPair::getSyncOperation() const [](const FileSystemObject& fsObj) { const SyncOperation op = fsObj.getSyncOperation(); - return op == SO_CREATE_NEW_LEFT || - op == SO_MOVE_LEFT_TO; + return op == SO_CREATE_NEW_LEFT || + op == SO_MOVE_LEFT_TO; })) syncOpBuffered_ = SO_CREATE_NEW_LEFT; //2. cancel parent deletion if only a single child is not also scheduled for deletion diff --git a/FreeFileSync/Source/file_hierarchy.h b/FreeFileSync/Source/file_hierarchy.h index c91354df..ca9e6248 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/fs/abstract.cpp b/FreeFileSync/Source/fs/abstract.cpp index e23c5abf..4c100bdd 100755 --- a/FreeFileSync/Source/fs/abstract.cpp +++ b/FreeFileSync/Source/fs/abstract.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -116,8 +116,8 @@ AFS::FileCopyResult AFS::copyFileAsStream(const AfsPath& afsPathSource, const St Failing to set modification time is not a serious problem from synchronization perspective (treated like external update) => Support additional scenarios: - - GVFS failing to set modTime for FTP: http://www.freefilesync.org/forum/viewtopic.php?t=2372 - - GVFS failing to set modTime for MTP: http://www.freefilesync.org/forum/viewtopic.php?t=2803 + - GVFS failing to set modTime for FTP: https://www.freefilesync.org/forum/viewtopic.php?t=2372 + - GVFS failing to set modTime for MTP: https://www.freefilesync.org/forum/viewtopic.php?t=2803 - MTP failing to set modTime in general: fail non-silently rather than silently during file creation - FTP failing to set modTime for servers lacking MFMT-support */ @@ -167,7 +167,7 @@ AFS::FileCopyResult AFS::copyFileTransactional(const AbstractPath& apSource, con const Zstring fileName = AFS::getItemName(apTarget); //- generate (hopefully) unique file name to avoid clashing with some remnant ffs_tmp file - //- do not loop and avoid pathological cases, e.g. http://www.freefilesync.org/forum/viewtopic.php?t=1592 + //- do not loop and avoid pathological cases, e.g. https://www.freefilesync.org/forum/viewtopic.php?t=1592 const Zstring shortGuid = printNumber<Zstring>(Zstr("%04x"), static_cast<unsigned int>(getCrc16(generateGUID()))); auto it = find_last(fileName.begin(), fileName.end(), Zchar('.')); //gracefully handle case of missing "." const Zstring fileNameTmp = Zstring(fileName.begin(), it) + Zchar('.') + shortGuid + TEMP_FILE_ENDING; @@ -263,7 +263,7 @@ private: } -//essentially an (abstract) duplicate of zen::getPathStatus() +//essentially a(n abstract) duplicate of zen::getPathStatus() AFS::PathStatusImpl AFS::getPathStatusViaFolderTraversal(const AfsPath& afsPath) const //throw FileError { const Opt<AfsPath> parentAfsPath = getParentAfsPath(afsPath); diff --git a/FreeFileSync/Source/fs/abstract.h b/FreeFileSync/Source/fs/abstract.h index 6fb561b4..c612dfd9 100755 --- a/FreeFileSync/Source/fs/abstract.h +++ b/FreeFileSync/Source/fs/abstract.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/fs/concrete.cpp b/FreeFileSync/Source/fs/concrete.cpp index 6fd5a1c9..056daace 100755 --- a/FreeFileSync/Source/fs/concrete.cpp +++ b/FreeFileSync/Source/fs/concrete.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/fs/concrete.h b/FreeFileSync/Source/fs/concrete.h index a647c74c..3e3a933d 100755 --- a/FreeFileSync/Source/fs/concrete.h +++ b/FreeFileSync/Source/fs/concrete.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/fs/native.cpp b/FreeFileSync/Source/fs/native.cpp index cd3e5002..8a9e461d 100755 --- a/FreeFileSync/Source/fs/native.cpp +++ b/FreeFileSync/Source/fs/native.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/fs/native.h b/FreeFileSync/Source/fs/native.h index d9ff62f0..b8957a51 100755 --- a/FreeFileSync/Source/fs/native.h +++ b/FreeFileSync/Source/fs/native.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/fs/native_traverser_impl.h b/FreeFileSync/Source/fs/native_traverser_impl.h index fe37a729..cc4d8a52 100755 --- a/FreeFileSync/Source/fs/native_traverser_impl.h +++ b/FreeFileSync/Source/fs/native_traverser_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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/binary.cpp b/FreeFileSync/Source/lib/binary.cpp index da68f573..d7f7bf63 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/binary.h b/FreeFileSync/Source/lib/binary.h index 46d0e059..914fedea 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/cmp_filetime.h b/FreeFileSync/Source/lib/cmp_filetime.h index 3fd1dba8..e3c490df 100755 --- a/FreeFileSync/Source/lib/cmp_filetime.h +++ b/FreeFileSync/Source/lib/cmp_filetime.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/db_file.cpp b/FreeFileSync/Source/lib/db_file.cpp index 2d26b32d..c4cfd837 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -183,7 +183,7 @@ public: try { /* Zlib: optimal level - testcase 1 million files - level/size [MB]/time [ms] + level|size [MB]|time [ms] 0 49.54 272 (uncompressed) 1 14.53 1013 2 14.13 1106 diff --git a/FreeFileSync/Source/lib/db_file.h b/FreeFileSync/Source/lib/db_file.h index ba980f50..99bcfb79 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/dir_exist_async.h b/FreeFileSync/Source/lib/dir_exist_async.h index 891ff8aa..47bf5241 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/dir_lock.cpp b/FreeFileSync/Source/lib/dir_lock.cpp index 13c0e744..03149a77 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** #include "dir_lock.h" @@ -102,8 +102,8 @@ Opt<SessionId> getSessionId(ProcessId processId) //throw FileError if (::kill(processId, 0) != 0) //sig == 0: no signal sent, just existence check return NoValue(); - pid_t procSid = ::getsid(processId); //NOT to be confused with "login session", e.g. not stable on OS X!!! - if (procSid == -1) + const pid_t procSid = ::getsid(processId); //NOT to be confused with "login session", e.g. not stable on OS X!!! + if (procSid < 0) //pids are never negative, empiric proof: https://linux.die.net/man/2/wait THROW_LAST_FILE_ERROR(_("Cannot get process information."), L"getsid"); return procSid; diff --git a/FreeFileSync/Source/lib/dir_lock.h b/FreeFileSync/Source/lib/dir_lock.h index 7ed26849..5a1e3b7e 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/error_log.h b/FreeFileSync/Source/lib/error_log.h index 7b21c85c..89c2c61d 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/ffs_paths.cpp b/FreeFileSync/Source/lib/ffs_paths.cpp index 02fa9525..0ae1f132 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -57,6 +57,7 @@ Zstring zen::getConfigDirPathPf() return getExecutablePathPf(); //use OS' standard paths Zstring configDirPath = utfTo<Zstring>(wxStandardPaths::Get().GetUserDataDir()); + try { createDirectoryIfMissingRecursion(configDirPath); //throw FileError diff --git a/FreeFileSync/Source/lib/ffs_paths.h b/FreeFileSync/Source/lib/ffs_paths.h index 0a78029a..ba6f4b32 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/generate_logfile.h b/FreeFileSync/Source/lib/generate_logfile.h index b99a0b78..8906099b 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/hard_filter.cpp b/FreeFileSync/Source/lib/hard_filter.cpp index 86783fd9..7fc3b7f6 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/hard_filter.h b/FreeFileSync/Source/lib/hard_filter.h index e548ab79..801f06ca 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/help_provider.h b/FreeFileSync/Source/lib/help_provider.h index ab70ee29..755adad2 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -10,7 +10,7 @@ #if 1 namespace zen { -inline void displayHelpEntry(const wxString& topic, wxWindow* parent) { wxLaunchDefaultBrowser(L"http://www.freefilesync.org/manual.php?topic=" + topic); } +inline void displayHelpEntry(const wxString& topic, wxWindow* parent) { wxLaunchDefaultBrowser(L"https://www.freefilesync.org/manual.php?topic=" + topic); } inline void uninitializeHelp() {} } @@ -42,7 +42,7 @@ inline void displayHelpEntry(const wxString& topic, wxWindow* parent) { if (internetIsAlive()) //noexcept - wxLaunchDefaultBrowser(L"http://www.freefilesync.org/manual.php?topic=" + topic); + wxLaunchDefaultBrowser(L"https://www.freefilesync.org/manual.php?topic=" + topic); else -> what if FFS is blocked, but the web browser would have internet access?? { diff --git a/FreeFileSync/Source/lib/icon_buffer.cpp b/FreeFileSync/Source/lib/icon_buffer.cpp index 97eb8f15..dc4f03c0 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/icon_buffer.h b/FreeFileSync/Source/lib/icon_buffer.h index 6721497b..55427fcb 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/icon_holder.h b/FreeFileSync/Source/lib/icon_holder.h index 9046a18a..f8a44611 100755 --- a/FreeFileSync/Source/lib/icon_holder.h +++ b/FreeFileSync/Source/lib/icon_holder.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/icon_loader.cpp b/FreeFileSync/Source/lib/icon_loader.cpp index 6fb91c06..5415919b 100755 --- a/FreeFileSync/Source/lib/icon_loader.cpp +++ b/FreeFileSync/Source/lib/icon_loader.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/icon_loader.h b/FreeFileSync/Source/lib/icon_loader.h index f4a1ba99..c93113c8 100755 --- a/FreeFileSync/Source/lib/icon_loader.h +++ b/FreeFileSync/Source/lib/icon_loader.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/localization.cpp b/FreeFileSync/Source/lib/localization.cpp index 81ad1565..a594e004 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/localization.h b/FreeFileSync/Source/lib/localization.h index 4f88e54e..ad603af2 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/norm_filter.h b/FreeFileSync/Source/lib/norm_filter.h index 21fad07d..b357bdaa 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/parallel_scan.cpp b/FreeFileSync/Source/lib/parallel_scan.cpp index 376a2e01..adb13bee 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/parallel_scan.h b/FreeFileSync/Source/lib/parallel_scan.h index 901e9037..fbfbca06 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/parse_lng.h b/FreeFileSync/Source/lib/parse_lng.h index 64eacdee..f2009585 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/parse_plural.h b/FreeFileSync/Source/lib/parse_plural.h index 0f7ba186..3964d7b3 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/perf_check.cpp b/FreeFileSync/Source/lib/perf_check.cpp index c2cd9b01..b101c9b2 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/perf_check.h b/FreeFileSync/Source/lib/perf_check.h index 081abcbb..1f85ba63 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/process_xml.cpp b/FreeFileSync/Source/lib/process_xml.cpp index 3165a108..f60bf16d 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/process_xml.h b/FreeFileSync/Source/lib/process_xml.h index 30e05fab..1ff7584e 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/resolve_path.h b/FreeFileSync/Source/lib/resolve_path.h index 9120acac..8e977c4a 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/return_codes.h b/FreeFileSync/Source/lib/return_codes.h index 6d1115a5..21995ccc 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/soft_filter.h b/FreeFileSync/Source/lib/soft_filter.h index d1e77a3f..c6ce8cd0 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/status_handler.cpp b/FreeFileSync/Source/lib/status_handler.cpp index 55765fc3..11d04f48 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/status_handler.h b/FreeFileSync/Source/lib/status_handler.h index 64abced3..6e8b5f96 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/status_handler_impl.h b/FreeFileSync/Source/lib/status_handler_impl.h index ff833cc9..cffee505 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/lib/versioning.cpp b/FreeFileSync/Source/lib/versioning.cpp index 3a96628a..591b3117 100755 --- a/FreeFileSync/Source/lib/versioning.cpp +++ b/FreeFileSync/Source/lib/versioning.cpp @@ -108,7 +108,15 @@ void moveExistingItemToVersioning(const AbstractPath& sourcePath, const Abstract { Opt<AFS::PathStatus> pd; try { pd = AFS::getPathStatus(targetPath); /*throw FileError*/ } - catch (FileError&) {} //previous exception is more relevant + catch (FileError&) + { + + warn_static("remove after test: https://www.freefilesync.org/forum/viewtopic.php?f=8&t=4765&p=15981#p15981") + warn_static("really? is previous exception is more relevant?") + throw; + + + } //previous exception is more relevant if (pd) { diff --git a/FreeFileSync/Source/lib/versioning.h b/FreeFileSync/Source/lib/versioning.h index 2b168267..a0a437f3 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/process_callback.h b/FreeFileSync/Source/process_callback.h index b47c2a89..523c888b 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/structures.cpp b/FreeFileSync/Source/structures.cpp index fb605b9a..9e9d3cf8 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/structures.h b/FreeFileSync/Source/structures.h index ee8f625c..1395ca6e 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/synchronization.cpp b/FreeFileSync/Source/synchronization.cpp index 0aa4500e..5dae742e 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -2094,7 +2094,7 @@ void zen::synchronize(const std::chrono::system_clock::time_point& syncStartTime msg += item.second; } if (!msg.empty()) - callback.reportWarning(_("The versioning folder will be synchronized because it is contained in a base folder.") + L"\n" + + callback.reportWarning(_("The versioning folder is contained in a base folder.") + L"\n" + _("The folder should be excluded from synchronization via filter.") + msg, warnings.warnVersioningFolderPartOfSync); } diff --git a/FreeFileSync/Source/synchronization.h b/FreeFileSync/Source/synchronization.h index 68587793..44a58114 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/app_icon.h b/FreeFileSync/Source/ui/app_icon.h index 72666602..265fdf38 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/batch_config.cpp b/FreeFileSync/Source/ui/batch_config.cpp index fdacb34a..80a03bfb 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/batch_config.h b/FreeFileSync/Source/ui/batch_config.h index f60d6e97..e79d2f25 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/batch_status_handler.cpp b/FreeFileSync/Source/ui/batch_status_handler.cpp index f6d466a7..50945143 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -38,7 +38,7 @@ std::unique_ptr<AFS::OutputStream> prepareNewLogfile(const AbstractPath& logFold AFS::createFolderIfMissingRecursion(logFolderPath); //throw FileError //const std::string colon = "\xcb\xb8"; //="modifier letter raised colon" => regular colon is forbidden in file names on Windows and OS X - //=> too many issues, most notably cmd.exe is not Unicode-aware: http://www.freefilesync.org/forum/viewtopic.php?t=1679 + //=> too many issues, most notably cmd.exe is not Unicode-aware: https://www.freefilesync.org/forum/viewtopic.php?t=1679 //assemble logfile name const TimeComp timeStamp = getLocalTime(std::chrono::system_clock::to_time_t(batchStartTime)); @@ -299,7 +299,7 @@ BatchStatusHandler::~BatchStatusHandler() if (!commandLine.empty()) try { - //use EXEC_TYPE_ASYNC until there is reason not to: http://www.freefilesync.org/forum/viewtopic.php?t=31 + //use EXEC_TYPE_ASYNC until there is reason not to: https://www.freefilesync.org/forum/viewtopic.php?t=31 tryReportingError([&] { shellExecute(expandMacros(commandLine), EXEC_TYPE_ASYNC); /*throw FileError*/ }, *this); //throw X } catch (...) {} @@ -336,12 +336,12 @@ BatchStatusHandler::~BatchStatusHandler() showSummary = false; //close progress dialog - if (showSummary) //warning: wxWindow::Show() is called within processHasFinished()! + if (showSummary) //warning: wxWindow::Show() is called within showSummary()! //notify about (logical) application main window => program won't quit, but stay on this dialog //setMainWindow(progressDlg_->getAsWindow()); -> not required anymore since we block waiting until dialog is closed below - progressDlg_->processHasFinished(finalStatus, errorLog_); + progressDlg_->showSummary(finalStatus, errorLog_); else - progressDlg_->closeWindowDirectly(); //progressDlg_ is main window => program will quit shortly after + progressDlg_->closeDirectly(true /*restoreParentFrame: n/a here*/); //progressDlg_ is main window => program will quit shortly after //wait until progress dialog notified shutdown via onProgressDialogTerminate() //-> required since it has our "this" pointer captured in lambda "notifyWindowTerminate"! diff --git a/FreeFileSync/Source/ui/batch_status_handler.h b/FreeFileSync/Source/ui/batch_status_handler.h index b7c08a2b..072d0f80 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/column_attr.h b/FreeFileSync/Source/ui/column_attr.h index 5b607eec..25a96736 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/command_box.cpp b/FreeFileSync/Source/ui/command_box.cpp index a881a6b7..fc848fa2 100755 --- a/FreeFileSync/Source/ui/command_box.cpp +++ b/FreeFileSync/Source/ui/command_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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/command_box.h b/FreeFileSync/Source/ui/command_box.h index 40503ebd..719a62ac 100755 --- a/FreeFileSync/Source/ui/command_box.h +++ b/FreeFileSync/Source/ui/command_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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/custom_grid.cpp b/FreeFileSync/Source/ui/custom_grid.cpp index a3689c90..bcc97859 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/custom_grid.h b/FreeFileSync/Source/ui/custom_grid.h index 412a48bc..c5353ba9 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/folder_history_box.cpp b/FreeFileSync/Source/ui/folder_history_box.cpp index c0b344af..ff434468 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/folder_history_box.h b/FreeFileSync/Source/ui/folder_history_box.h index 4dfb94e1..94b9f494 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/folder_pair.h b/FreeFileSync/Source/ui/folder_pair.h index 625b233a..49a24c7c 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/folder_selector.cpp b/FreeFileSync/Source/ui/folder_selector.cpp index 09d8a4b5..40033094 100755 --- a/FreeFileSync/Source/ui/folder_selector.cpp +++ b/FreeFileSync/Source/ui/folder_selector.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/folder_selector.h b/FreeFileSync/Source/ui/folder_selector.h index 633fc2e6..df3293e3 100755 --- a/FreeFileSync/Source/ui/folder_selector.h +++ b/FreeFileSync/Source/ui/folder_selector.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/grid_view.cpp b/FreeFileSync/Source/ui/grid_view.cpp index d6c3c2db..0de75f14 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/grid_view.h b/FreeFileSync/Source/ui/grid_view.h index 8fad4c68..70838122 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/gui_generated.cpp index 72b7a4ad..6fa0d35b 100755 --- a/FreeFileSync/Source/ui/gui_generated.cpp +++ b/FreeFileSync/Source/ui/gui_generated.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) +// C++ code generated with wxFormBuilder (version Nov 6 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "command_box.h" @@ -83,9 +83,8 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const m_menuItemFind = new wxMenuItem( m_menuTools, wxID_FIND, wxString( _("&Find...") ) + wxT('\t') + wxT("Ctrl+F"), wxEmptyString, wxITEM_NORMAL ); m_menuTools->Append( m_menuItemFind ); - wxMenuItem* m_menuItem5; - m_menuItem5 = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Export file list...") ), wxEmptyString, wxITEM_NORMAL ); - m_menuTools->Append( m_menuItem5 ); + m_menuItemExportList = new wxMenuItem( m_menuTools, wxID_ANY, wxString( _("&Export file list...") ), wxEmptyString, wxITEM_NORMAL ); + m_menuTools->Append( m_menuItemExportList ); m_menuTools->AppendSeparator(); @@ -144,7 +143,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const bSizerTopButtons->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 ); m_buttonCancel = new zen::BitmapTextButton( m_panelTopButtons, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); - m_buttonCancel->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_buttonCancel->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); m_buttonCancel->Enable( false ); m_buttonCancel->Hide(); @@ -152,7 +151,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const m_buttonCompare = new zen::BitmapTextButton( m_panelTopButtons, wxID_ANY, _("Compare"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); m_buttonCompare->SetDefault(); - m_buttonCompare->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_buttonCompare->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); m_buttonCompare->SetToolTip( _("dummy") ); bSizerTopButtons->Add( m_buttonCompare, 0, wxEXPAND, 5 ); @@ -222,7 +221,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const bSizerTopButtons->Add( 4, 0, 0, 0, 5 ); m_buttonSync = new zen::BitmapTextButton( m_panelTopButtons, wxID_ANY, _("Synchronize"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); - m_buttonSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_buttonSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); m_buttonSync->SetToolTip( _("dummy") ); bSizerTopButtons->Add( m_buttonSync, 0, wxEXPAND, 5 ); @@ -567,7 +566,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const m_staticTextFullStatus = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextFullStatus->Wrap( -1 ); - m_staticTextFullStatus->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_staticTextFullStatus->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer451->Add( m_staticTextFullStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -597,7 +596,6 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const bSizer1713->Add( m_staticText101, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_textCtrlSearchTxt = new wxTextCtrl( m_panelSearch, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 220, -1 ), wxTE_PROCESS_ENTER|wxWANTS_CHARS ); - m_textCtrlSearchTxt->SetMaxLength( 0 ); bSizer1713->Add( m_textCtrlSearchTxt, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_checkBoxMatchCase = new wxCheckBox( m_panelSearch, wxID_ANY, _("Match case"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -988,7 +986,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const this->Connect( m_menuItemSynchronize->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) ); this->Connect( m_menuItemOptions->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuOptions ) ); this->Connect( m_menuItemFind->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuFindItem ) ); - this->Connect( m_menuItem5->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) ); + this->Connect( m_menuItemExportList->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) ); this->Connect( m_menuItem51->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuResetLayout ) ); this->Connect( m_menuItemHelp->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) ); this->Connect( m_menuItemCheckVersionNow->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) ); @@ -1130,17 +1128,17 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w bSizer2381 = new wxBoxSizer( wxVERTICAL ); m_toggleBtnByTimeSize = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File time and size"), wxDefaultPosition, wxSize( -1, 30 ), 0 ); - m_toggleBtnByTimeSize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_toggleBtnByTimeSize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer2381->Add( m_toggleBtnByTimeSize, 0, wxEXPAND|wxBOTTOM, 5 ); m_toggleBtnByContent = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File content"), wxDefaultPosition, wxSize( -1, 30 ), 0 ); - m_toggleBtnByContent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_toggleBtnByContent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer2381->Add( m_toggleBtnByContent, 0, wxEXPAND|wxBOTTOM, 5 ); m_toggleBtnBySize = new wxToggleButton( m_panelComparisonSettings, wxID_ANY, _("File size"), wxDefaultPosition, wxSize( -1, 30 ), 0 ); - m_toggleBtnBySize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_toggleBtnBySize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer2381->Add( m_toggleBtnBySize, 0, wxEXPAND, 5 ); @@ -1530,22 +1528,22 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w bSizer236 = new wxBoxSizer( wxVERTICAL ); m_toggleBtnTwoWay = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, 30 ), 0 ); - m_toggleBtnTwoWay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_toggleBtnTwoWay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer236->Add( m_toggleBtnTwoWay, 0, wxBOTTOM|wxEXPAND, 5 ); m_toggleBtnMirror = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, 30 ), 0 ); - m_toggleBtnMirror->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_toggleBtnMirror->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer236->Add( m_toggleBtnMirror, 0, wxEXPAND|wxBOTTOM, 5 ); m_toggleBtnUpdate = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, 30 ), 0 ); - m_toggleBtnUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_toggleBtnUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer236->Add( m_toggleBtnUpdate, 0, wxEXPAND|wxBOTTOM, 5 ); m_toggleBtnCustom = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, 30 ), 0 ); - m_toggleBtnCustom->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_toggleBtnCustom->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer236->Add( m_toggleBtnCustom, 0, wxEXPAND, 5 ); @@ -1798,7 +1796,7 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w m_staticTextNamingCvtPart2Bold = new wxStaticText( m_panelVersioning, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextNamingCvtPart2Bold->Wrap( -1 ); - m_staticTextNamingCvtPart2Bold->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_staticTextNamingCvtPart2Bold->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); m_staticTextNamingCvtPart2Bold->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) ); bSizer198->Add( m_staticTextNamingCvtPart2Bold, 0, wxALIGN_CENTER_VERTICAL, 5 ); @@ -1848,7 +1846,7 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w bSizerOnCompletion = new wxBoxSizer( wxVERTICAL ); - m_staticText89 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Run command after synchronization:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText89 = new wxStaticText( m_panelSyncSettings, wxID_ANY, _("Run a command after synchronization:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText89->Wrap( -1 ); bSizerOnCompletion->Add( m_staticText89, 0, wxBOTTOM, 5 ); @@ -1893,7 +1891,7 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); m_buttonOkay->SetDefault(); - m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -2092,12 +2090,12 @@ CloudSetupDlgGenerated::CloudSetupDlgGenerated( wxWindow* parent, wxWindowID id, bSizer231->Add( m_staticText136, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); m_toggleBtnSftp = new wxToggleButton( this, wxID_ANY, _("SFTP"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); - m_toggleBtnSftp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_toggleBtnSftp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer231->Add( m_toggleBtnSftp, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); m_toggleBtnFtp = new wxToggleButton( this, wxID_ANY, _("FTP"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); - m_toggleBtnFtp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_toggleBtnFtp->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer231->Add( m_toggleBtnFtp, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -2432,7 +2430,7 @@ CloudSetupDlgGenerated::CloudSetupDlgGenerated( wxWindow* parent, wxWindowID id, m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); m_buttonOkay->SetDefault(); - m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizerStdButtons->Add( m_buttonOkay, 0, wxALL, 5 ); @@ -2516,7 +2514,7 @@ AbstractFolderPickerGenerated::AbstractFolderPickerGenerated( wxWindow* parent, m_buttonOkay = new wxButton( this, wxID_OK, _("Select Folder"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); m_buttonOkay->SetDefault(); - m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizerStdButtons->Add( m_buttonOkay, 0, wxALL, 5 ); @@ -2598,7 +2596,7 @@ SyncConfirmationDlgGenerated::SyncConfirmationDlgGenerated( wxWindow* parent, wx m_staticTextVariant = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextVariant->Wrap( -1 ); - m_staticTextVariant->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_staticTextVariant->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer182->Add( m_staticTextVariant, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -2737,7 +2735,7 @@ SyncConfirmationDlgGenerated::SyncConfirmationDlgGenerated( wxWindow* parent, wx m_buttonStartSync = new wxButton( this, wxID_OK, _("Start"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); m_buttonStartSync->SetDefault(); - m_buttonStartSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_buttonStartSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizerStdButtons->Add( m_buttonStartSync, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); @@ -2794,7 +2792,7 @@ CompareProgressDlgGenerated::CompareProgressDlgGenerated( wxWindow* parent, wxWi m_staticTextItemsFound = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextItemsFound->Wrap( -1 ); - m_staticTextItemsFound->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_staticTextItemsFound->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); fgSizer7->Add( m_staticTextItemsFound, 0, wxALIGN_BOTTOM, 5 ); @@ -2806,7 +2804,7 @@ CompareProgressDlgGenerated::CompareProgressDlgGenerated( wxWindow* parent, wxWi m_staticTextItemsRemaining = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextItemsRemaining->Wrap( -1 ); - m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizerItemsRemaining->Add( m_staticTextItemsRemaining, 0, wxALIGN_BOTTOM, 5 ); @@ -2823,7 +2821,7 @@ CompareProgressDlgGenerated::CompareProgressDlgGenerated( wxWindow* parent, wxWi m_staticTextTimeRemaining = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTimeRemaining->Wrap( -1 ); - m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); fgSizer7->Add( m_staticTextTimeRemaining, 0, wxALIGN_BOTTOM, 5 ); @@ -2834,7 +2832,7 @@ CompareProgressDlgGenerated::CompareProgressDlgGenerated( wxWindow* parent, wxWi m_staticTextTimeElapsed = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTimeElapsed->Wrap( -1 ); - m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); fgSizer7->Add( m_staticTextTimeElapsed, 0, wxALIGN_BOTTOM, 5 ); @@ -2933,7 +2931,7 @@ SyncProgressPanelGenerated::SyncProgressPanelGenerated( wxWindow* parent, wxWind m_staticTextPhase = new wxStaticText( this, wxID_ANY, _("Synchronizing..."), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPhase->Wrap( -1 ); - m_staticTextPhase->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_staticTextPhase->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer42->Add( m_staticTextPhase, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 ); @@ -3000,7 +2998,7 @@ SyncProgressPanelGenerated::SyncProgressPanelGenerated( wxWindow* parent, wxWind m_staticTextItemsProcessed = new wxStaticText( m_panelItemsProcessed, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); m_staticTextItemsProcessed->Wrap( -1 ); - m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_staticTextItemsProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer169->Add( m_staticTextItemsProcessed, 0, wxALIGN_BOTTOM, 5 ); @@ -3039,7 +3037,7 @@ SyncProgressPanelGenerated::SyncProgressPanelGenerated( wxWindow* parent, wxWind m_staticTextItemsRemaining = new wxStaticText( m_panelItemsRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); m_staticTextItemsRemaining->Wrap( -1 ); - m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_staticTextItemsRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer170->Add( m_staticTextItemsRemaining, 0, wxALIGN_BOTTOM, 5 ); @@ -3075,7 +3073,7 @@ SyncProgressPanelGenerated::SyncProgressPanelGenerated( wxWindow* parent, wxWind m_staticTextTimeRemaining = new wxStaticText( m_panelTimeRemaining, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTimeRemaining->Wrap( -1 ); - m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_staticTextTimeRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer167->Add( m_staticTextTimeRemaining, 0, wxRIGHT|wxLEFT, 5 ); @@ -3105,7 +3103,7 @@ SyncProgressPanelGenerated::SyncProgressPanelGenerated( wxWindow* parent, wxWind m_staticTextTimeElapsed = new wxStaticText( m_panelTimeElapsed, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTimeElapsed->Wrap( -1 ); - m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer168->Add( m_staticTextTimeElapsed, 0, wxRIGHT|wxLEFT, 5 ); @@ -3460,7 +3458,7 @@ BatchDlgGenerated::BatchDlgGenerated( wxWindow* parent, wxWindowID id, const wxS m_buttonSaveAs = new wxButton( this, wxID_SAVE, _("Save &as..."), wxDefaultPosition, wxSize( -1, -1 ), 0 ); m_buttonSaveAs->SetDefault(); - m_buttonSaveAs->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_buttonSaveAs->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizerStdButtons->Add( m_buttonSaveAs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -3549,7 +3547,7 @@ DeleteDlgGenerated::DeleteDlgGenerated( wxWindow* parent, wxWindowID id, const w m_buttonOK = new wxButton( this, wxID_OK, _("dummy"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); m_buttonOK->SetDefault(); - m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizerStdButtons->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); @@ -3668,7 +3666,7 @@ CopyToDlgGenerated::CopyToDlgGenerated( wxWindow* parent, wxWindowID id, const w m_buttonOK = new wxButton( this, wxID_OK, _("Copy"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); m_buttonOK->SetDefault(); - m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizerStdButtons->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); @@ -3742,11 +3740,23 @@ OptionsDlgGenerated::OptionsDlgGenerated( wxWindow* parent, wxWindowID id, const bSizer176->Add( m_checkBoxFailSafe, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - m_staticText91 = new wxStaticText( m_panel39, wxID_ANY, _("(recommended)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText911 = new wxStaticText( m_panel39, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText911->Wrap( -1 ); + m_staticText911->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) ); + + bSizer176->Add( m_staticText911, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 ); + + m_staticText91 = new wxStaticText( m_panel39, wxID_ANY, _("recommended"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText91->Wrap( -1 ); m_staticText91->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) ); - bSizer176->Add( m_staticText91, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + bSizer176->Add( m_staticText91, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 ); + + m_staticText9111 = new wxStaticText( m_panel39, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText9111->Wrap( -1 ); + m_staticText9111->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) ); + + bSizer176->Add( m_staticText9111, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); bSizer160->Add( bSizer176, 0, wxEXPAND, 5 ); @@ -3759,11 +3769,23 @@ OptionsDlgGenerated::OptionsDlgGenerated( wxWindow* parent, wxWindowID id, const bSizerLockedFiles->Add( m_checkBoxCopyLocked, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - m_staticText92 = new wxStaticText( m_panel39, wxID_ANY, _("(requires administrator rights)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText921 = new wxStaticText( m_panel39, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText921->Wrap( -1 ); + m_staticText921->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) ); + + bSizerLockedFiles->Add( m_staticText921, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 ); + + m_staticText92 = new wxStaticText( m_panel39, wxID_ANY, _("requires administrator rights"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText92->Wrap( -1 ); m_staticText92->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) ); - bSizerLockedFiles->Add( m_staticText92, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + bSizerLockedFiles->Add( m_staticText92, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 ); + + m_staticText922 = new wxStaticText( m_panel39, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText922->Wrap( -1 ); + m_staticText922->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) ); + + bSizerLockedFiles->Add( m_staticText922, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); bSizer160->Add( bSizerLockedFiles, 0, wxEXPAND, 5 ); @@ -3777,11 +3799,23 @@ OptionsDlgGenerated::OptionsDlgGenerated( wxWindow* parent, wxWindowID id, const bSizer178->Add( m_checkBoxCopyPermissions, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_staticText93 = new wxStaticText( m_panel39, wxID_ANY, _("(requires administrator rights)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText931 = new wxStaticText( m_panel39, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText931->Wrap( -1 ); + m_staticText931->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) ); + + bSizer178->Add( m_staticText931, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 ); + + m_staticText93 = new wxStaticText( m_panel39, wxID_ANY, _("requires administrator rights"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText93->Wrap( -1 ); m_staticText93->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) ); - bSizer178->Add( m_staticText93, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + bSizer178->Add( m_staticText93, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 ); + + m_staticText932 = new wxStaticText( m_panel39, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText932->Wrap( -1 ); + m_staticText932->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) ); + + bSizer178->Add( m_staticText932, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); bSizer160->Add( bSizer178, 0, wxEXPAND, 5 ); @@ -3924,7 +3958,7 @@ OptionsDlgGenerated::OptionsDlgGenerated( wxWindow* parent, wxWindowID id, const m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); m_buttonOkay->SetDefault(); - m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -4014,7 +4048,7 @@ SelectTimespanDlgGenerated::SelectTimespanDlgGenerated( wxWindow* parent, wxWind m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); m_buttonOkay->SetDefault(); - m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -4079,9 +4113,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://www.visualstudio.com"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); + m_hyperlink11 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("MS Visual Studio"), wxT("https://www.visualstudio.com"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_hyperlink11->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); - m_hyperlink11->SetToolTip( _("http://www.visualstudio.com") ); + m_hyperlink11->SetToolTip( _("https://www.visualstudio.com") ); bSizer171->Add( m_hyperlink11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); @@ -4091,9 +4125,9 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS bSizer171->Add( m_hyperlink7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - m_hyperlink14 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("wxFormBuilder"), wxT("http://wxformbuilder.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); + m_hyperlink14 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("wxFormBuilder"), wxT("https://github.com/wxFormBuilder/wxFormBuilder"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_hyperlink14->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); - m_hyperlink14->SetToolTip( _("http://wxformbuilder.org") ); + m_hyperlink14->SetToolTip( _("https://github.com/wxFormBuilder/wxFormBuilder") ); bSizer171->Add( m_hyperlink14, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); @@ -4180,14 +4214,14 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS m_staticTextDonate = new wxStaticText( m_panel39, wxID_ANY, _("If you like FreeFileSync:"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE ); m_staticTextDonate->Wrap( -1 ); - m_staticTextDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) ); + m_staticTextDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) ); bSizer178->Add( m_staticTextDonate, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); m_buttonDonate = new wxButton( m_panel39, wxID_ANY, _("Support with a donation"), wxDefaultPosition, wxDefaultSize, 0 ); - m_buttonDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - m_buttonDonate->SetToolTip( _("http://www.freefilesync.org/donate.php") ); + m_buttonDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); + m_buttonDonate->SetToolTip( _("https://www.freefilesync.org/donate.php") ); bSizer178->Add( m_buttonDonate, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 ); @@ -4201,7 +4235,7 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS m_panel39->SetSizer( bSizer184 ); m_panel39->Layout(); bSizer184->Fit( m_panel39 ); - bSizer183->Add( m_panel39, 0, wxEXPAND|wxALL, 5 ); + bSizer183->Add( m_panel39, 0, wxALL|wxEXPAND, 5 ); m_panelDonate->SetSizer( bSizer183 ); @@ -4218,12 +4252,12 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS m_panel391 = new wxPanel( m_panelThankYou, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panel391->SetBackgroundColour( wxColour( 248, 248, 248 ) ); + wxBoxSizer* bSizer243; + bSizer243 = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* bSizer1841; bSizer1841 = new wxBoxSizer( wxHORIZONTAL ); - - bSizer1841->Add( 0, 0, 1, wxEXPAND, 5 ); - m_bitmapThanks = new wxStaticBitmap( m_panel391, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); bSizer1841->Add( m_bitmapThanks, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 10 ); @@ -4232,13 +4266,13 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS m_staticTextThanks = new wxStaticText( m_panel391, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE ); m_staticTextThanks->Wrap( -1 ); - m_staticTextThanks->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) ); + m_staticTextThanks->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); m_staticTextThanks->SetForegroundColour( wxColour( 0, 0, 0 ) ); bSizer1781->Add( m_staticTextThanks, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); m_buttonShowDonationDetails = new wxButton( m_panel391, wxID_ANY, _("Donation details"), wxDefaultPosition, wxDefaultSize, 0 ); - m_buttonShowDonationDetails->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) ); + m_buttonShowDonationDetails->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); bSizer1781->Add( m_buttonShowDonationDetails, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 ); @@ -4246,12 +4280,18 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS bSizer1841->Add( bSizer1781, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - bSizer1841->Add( 0, 0, 1, wxEXPAND, 5 ); + bSizer243->Add( bSizer1841, 1, wxALIGN_CENTER_HORIZONTAL, 5 ); + + m_staticTextNoAutoUpdate = new wxStaticText( m_panel391, wxID_ANY, _("The auto updater was disabled by the administrator."), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextNoAutoUpdate->Wrap( -1 ); + m_staticTextNoAutoUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + + bSizer243->Add( m_staticTextNoAutoUpdate, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_panel391->SetSizer( bSizer1841 ); + m_panel391->SetSizer( bSizer243 ); m_panel391->Layout(); - bSizer1841->Fit( m_panel391 ); + bSizer243->Fit( m_panel391 ); bSizer1831->Add( m_panel391, 0, wxEXPAND|wxALL, 5 ); @@ -4278,10 +4318,10 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS bSizer166->Add( m_bitmapHomepage, 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->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, true, wxEmptyString ) ); + m_hyperlink1 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("FreeFileSync.org"), wxT("https://www.freefilesync.org/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); + m_hyperlink1->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, true, wxEmptyString ) ); m_hyperlink1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); - m_hyperlink1->SetToolTip( _("http://www.freefilesync.org") ); + m_hyperlink1->SetToolTip( _("https://www.freefilesync.org") ); bSizer166->Add( m_hyperlink1, 0, wxALIGN_CENTER_VERTICAL, 5 ); @@ -4294,7 +4334,7 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS bSizer166->Add( m_bitmapEmail, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_hyperlink2 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("zenju@freefilesync.org"), wxT("mailto:zenju@freefilesync.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); - m_hyperlink2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, true, wxEmptyString ) ); + m_hyperlink2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, true, wxEmptyString ) ); m_hyperlink2->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); m_hyperlink2->SetToolTip( _("mailto:zenju@freefilesync.org") ); @@ -4325,7 +4365,7 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS m_bitmapGpl = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1, -1 ), 0 ); bSizer1671->Add( m_bitmapGpl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - 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 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("https://www.gnu.org/licenses/gpl-3.0"), wxT("https://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 ); @@ -4347,7 +4387,7 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS m_staticText54 = new wxStaticText( m_panel41, wxID_ANY, _("Many thanks for localization:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText54->Wrap( 200 ); - m_staticText54->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_staticText54->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer177->Add( m_staticText54, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); @@ -4547,7 +4587,7 @@ ActivationDlgGenerated::ActivationDlgGenerated( wxWindow* parent, wxWindowID id, m_buttonActivateOnline = new wxButton( m_panel3511, wxID_ANY, _("Activate online"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); m_buttonActivateOnline->SetDefault(); - m_buttonActivateOnline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_buttonActivateOnline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer234->Add( m_buttonActivateOnline, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -4584,7 +4624,7 @@ ActivationDlgGenerated::ActivationDlgGenerated( wxWindow* parent, wxWindowID id, m_buttonCopyUrl = new wxButton( m_panel351, wxID_ANY, _("&Copy to clipboard"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); m_buttonCopyUrl->SetDefault(); - m_buttonCopyUrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) ); + m_buttonCopyUrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); bSizer236->Add( m_buttonCopyUrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -4592,7 +4632,6 @@ ActivationDlgGenerated::ActivationDlgGenerated( wxWindow* parent, wxWindowID id, bSizer237->Add( bSizer236, 0, wxEXPAND, 5 ); m_textCtrlManualActivationUrl = new wxTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 220, -1 ), wxTE_MULTILINE|wxTE_READONLY|wxWANTS_CHARS ); - m_textCtrlManualActivationUrl->SetMaxLength( 0 ); bSizer237->Add( m_textCtrlManualActivationUrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); wxBoxSizer* bSizer235; @@ -4603,11 +4642,10 @@ ActivationDlgGenerated::ActivationDlgGenerated( wxWindow* parent, wxWindowID id, bSizer235->Add( m_staticText13611, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); m_textCtrlOfflineActivationKey = new wxTextCtrl( m_panel351, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 220, -1 ), wxTE_PROCESS_ENTER|wxWANTS_CHARS ); - m_textCtrlOfflineActivationKey->SetMaxLength( 0 ); bSizer235->Add( m_textCtrlOfflineActivationKey, 1, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_buttonActivateOffline = new wxButton( m_panel351, wxID_ANY, _("Activate offline"), wxDefaultPosition, wxSize( -1, -1 ), 0 ); - m_buttonActivateOffline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_buttonActivateOffline->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer235->Add( m_buttonActivateOffline, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); diff --git a/FreeFileSync/Source/ui/gui_generated.h b/FreeFileSync/Source/ui/gui_generated.h index 6de17864..c0b02b82 100755 --- a/FreeFileSync/Source/ui/gui_generated.h +++ b/FreeFileSync/Source/ui/gui_generated.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) +// C++ code generated with wxFormBuilder (version Nov 6 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __GUI_GENERATED_H__ @@ -83,6 +83,7 @@ protected: wxMenuItem* m_menuItemOptions; wxMenu* m_menuLanguages; wxMenuItem* m_menuItemFind; + wxMenuItem* m_menuItemExportList; wxMenuItem* m_menuItemShowMain; wxMenuItem* m_menuItemShowFolders; wxMenuItem* m_menuItemShowViewFilter; @@ -827,7 +828,7 @@ public: FolderHistoryBox* m_logFolderPath; wxBitmapButton* m_bpButtonSelectAltLogFolder; - BatchDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Save as Batch Job"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + BatchDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Save as a Batch Job"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~BatchDlgGenerated(); }; @@ -917,12 +918,18 @@ protected: wxStaticLine* m_staticline20; wxPanel* m_panel39; wxCheckBox* m_checkBoxFailSafe; + wxStaticText* m_staticText911; wxStaticText* m_staticText91; + wxStaticText* m_staticText9111; wxBoxSizer* bSizerLockedFiles; wxCheckBox* m_checkBoxCopyLocked; + wxStaticText* m_staticText921; wxStaticText* m_staticText92; + wxStaticText* m_staticText922; wxCheckBox* m_checkBoxCopyPermissions; + wxStaticText* m_staticText931; wxStaticText* m_staticText93; + wxStaticText* m_staticText932; wxStaticLine* m_staticline39; wxStaticText* m_staticText95; wxStaticText* m_staticText96; @@ -1045,6 +1052,7 @@ protected: wxStaticBitmap* m_bitmapThanks; wxStaticText* m_staticTextThanks; wxButton* m_buttonShowDonationDetails; + wxStaticText* m_staticTextNoAutoUpdate; wxStaticText* m_staticText94; wxStaticBitmap* m_bitmapHomepage; wxHyperlinkCtrl* m_hyperlink1; diff --git a/FreeFileSync/Source/ui/gui_status_handler.cpp b/FreeFileSync/Source/ui/gui_status_handler.cpp index 52a75366..54b4ee93 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -337,7 +337,7 @@ StatusHandlerFloatingDialog::~StatusHandlerFloatingDialog() if (!commandLine.empty()) try { - //use EXEC_TYPE_ASYNC until there is reason not to: http://www.freefilesync.org/forum/viewtopic.php?t=31 + //use EXEC_TYPE_ASYNC until there is reason not to: https://www.freefilesync.org/forum/viewtopic.php?t=31 tryReportingError([&] { shellExecute(expandMacros(commandLine), EXEC_TYPE_ASYNC); /*throw FileError*/ }, *this); //throw X } catch (...) {} @@ -375,9 +375,9 @@ StatusHandlerFloatingDialog::~StatusHandlerFloatingDialog() //close progress dialog if (showSummary) - progressDlg_->processHasFinished(finalStatus, errorLog_); + progressDlg_->showSummary(finalStatus, errorLog_); else - progressDlg_->closeWindowDirectly(); + progressDlg_->closeDirectly(false /*restoreParentFrame*/); //wait until progress dialog notified shutdown via onProgressDialogTerminate() //-> required since it has our "this" pointer captured in lambda "notifyWindowTerminate"! diff --git a/FreeFileSync/Source/ui/gui_status_handler.h b/FreeFileSync/Source/ui/gui_status_handler.h index 0efb7e20..e72ae864 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/main_dlg.cpp b/FreeFileSync/Source/ui/main_dlg.cpp index b90415f0..ddd864fd 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -10,6 +10,7 @@ #include <zen/file_io.h> #include <zen/thread.h> #include <zen/shell_execute.h> +#include <zen/perf.h> #include <wx/clipbrd.h> #include <wx/wupdlock.h> #include <wx/sound.h> @@ -670,7 +671,7 @@ MainDialog::MainDialog(const Zstring& globalConfigFile, }, menuItem->GetId()); //"hide" menu items by default - detachedMenuItemsLayout_.insert(m_menuTools->Remove(menuItem)); //pass ownership + detachedMenuItems_.insert(m_menuTools->Remove(menuItem)); //pass ownership }; setupLayoutMenuEvent(m_menuItemShowMain, m_panelTopButtons); setupLayoutMenuEvent(m_menuItemShowFolders, m_panelDirectoryPairs); @@ -837,26 +838,27 @@ MainDialog::~MainDialog() { using namespace xmlAccess; + Opt<FileError> firstError; try //save "GlobalSettings.xml" { writeConfig(getGlobalCfgBeforeExit(), globalConfigFile_); //throw FileError } - catch (const FileError& e) - { - showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(e.toString())); - } + catch (const FileError& e) { firstError = e; } try //save "LastRun.ffs_gui" { writeConfig(getConfig(), lastRunConfigPath_); //throw FileError } + catch (const FileError& e) { firstError = e; } + //don't annoy users on read-only drives: it's enough to show a single error message when saving global config - catch (const FileError&) {} + if (firstError) + showNotificationDialog(this, DialogInfoType::ERROR2, PopupDialogCfg().setDetailInstructions(firstError->toString())); auiMgr_.UnInit(); - for (wxMenuItem* item : detachedMenuItemsLayout_) + for (wxMenuItem* item : detachedMenuItems_) delete item; //something's got to give //no need for wxEventHandler::Disconnect() here; event sources are components of this window and are destroyed, too @@ -868,14 +870,43 @@ void MainDialog::onQueryEndSession() { using namespace xmlAccess; + //we try our best to do something useful in this extreme situation - no reason to notify or even log errors here! try { writeConfig(getGlobalCfgBeforeExit(), globalConfigFile_); } - catch (const FileError&) {} //we try our best to do something useful in this extreme situation - no reason to notify or even log errors here! + catch (const FileError&) {} try { writeConfig(getConfig(), lastRunConfigPath_); } catch (const FileError&) {} } +void MainDialog::OnClose(wxCloseEvent& event) +{ + //attention: system shutdown is handled in onQueryEndSession()! + + //regular destruction handling + if (event.CanVeto()) + { + //=> veto all attempts to close the main window while comparison or synchronization are running: + if (!allowMainDialogClose_) + { + event.Veto(); + Raise(); //=what Windows does when vetoing a close (via middle mouse on taskbar preview) while showing a modal dialog + SetFocus(); // + return; + } + + const bool cancelled = !saveOldConfig(); //notify user about changed settings + if (cancelled) + { + event.Veto(); + return; + } + } + + Destroy(); +} + + void MainDialog::setGlobalCfgOnInit(const xmlAccess::XmlGlobalSettings& globalSettings) { globalCfg_ = globalSettings; @@ -1377,7 +1408,6 @@ void invokeCommandLine(const Zstring& commandLinePhrase, //throw FileError replace(command, Zstr("%local_path%"), localPath); replace(command, Zstr("%local_path2%"), localPath2); - //caveat: spawning too many threads asynchronously can easily kill a user's desktop session on Ubuntu (resource drain)! shellExecute(command, selection.size() > EXT_APP_MASS_INVOKE_THRESHOLD ? EXEC_TYPE_SYNC : EXEC_TYPE_ASYNC); //throw FileError } } @@ -1599,10 +1629,16 @@ void MainDialog::disableAllElements(bool enableAbort) //disables all elements (except abort button) that might receive user input during long-running processes: //when changing consider: comparison, synchronization, manual deletion - EnableCloseButton(false); //not allowed for synchronization! progress indicator is top window! - //OS X: wxWidgets portability promise is again a mess: http://wxwidgets.10942.n7.nabble.com/Disable-panel-and-appropriate-children-windows-linux-macos-td35357.html + EnableCloseButton(false); //closing main dialog is not allowed during synchronization! crash! + //EnableCloseButton(false) just does not work reliably! + //- Windows: dialog can still be closed by clicking the task bar preview window with the middle mouse button or by pressing ALT+F4! + //- OS X: Quit/Preferences menu items still enabled during sync, + // ([[m_macWindow standardWindowButton:NSWindowCloseButton] setEnabled:enable]) does not stick after calling Maximize() ([m_macWindow zoom:nil]) + //- Linux: it just works! :) + allowMainDialogClose_ = false; + localKeyEventsEnabled_ = false; for (size_t pos = 0; pos < m_menubar1->GetMenuCount(); ++pos) @@ -1620,9 +1656,9 @@ void MainDialog::disableAllElements(bool enableAbort) m_panelConfig ->Disable(); m_gridOverview ->Disable(); m_panelSearch ->Disable(); - m_bpButtonCmpContext ->Disable(); + m_bpButtonCmpContext ->Disable(); + m_bpButtonSyncContext->Disable(); m_bpButtonFilterContext->Disable(); - m_bpButtonSyncContext ->Disable(); if (enableAbort) { @@ -1646,6 +1682,7 @@ void MainDialog::enableAllElements() //wxGTK, yet another QOI issue: some stupid bug, keeps moving main dialog to top!! EnableCloseButton(true); + allowMainDialogClose_ = true; localKeyEventsEnabled_ = true; @@ -1664,9 +1701,9 @@ void MainDialog::enableAllElements() m_panelConfig ->Enable(); m_gridOverview ->Enable(); m_panelSearch ->Enable(); - m_bpButtonCmpContext ->Enable(); + m_bpButtonCmpContext ->Enable(); + m_bpButtonSyncContext->Enable(); m_bpButtonFilterContext->Enable(); - m_bpButtonSyncContext ->Enable(); //show compare button m_buttonCancel->Disable(); @@ -2550,16 +2587,16 @@ void MainDialog::resetLayout() void MainDialog::onOpenMenuTools(wxMenuEvent& event) { - //each layout menu item is either shown and owned by m_menuTools OR detached from m_menuTools and owned by detachedMenuItemsLayout_: + //each layout menu item is either shown and owned by m_menuTools OR detached from m_menuTools and owned by detachedMenuItems_: auto filterLayoutItems = [&](wxMenuItem* menuItem, wxWindow* panelWindow) { - if (detachedMenuItemsLayout_.find(menuItem) == detachedMenuItemsLayout_.end()) - detachedMenuItemsLayout_.insert(m_menuTools->Remove(menuItem)); //pass ownership + if (detachedMenuItems_.find(menuItem) == detachedMenuItems_.end()) + detachedMenuItems_.insert(m_menuTools->Remove(menuItem)); //pass ownership wxAuiPaneInfo& paneInfo = this->auiMgr_.GetPane(panelWindow); if (!paneInfo.IsShown()) { - detachedMenuItemsLayout_.erase(menuItem); //pass ownership + detachedMenuItems_.erase(menuItem); //pass ownership m_menuTools->Append(menuItem); // } }; @@ -3264,26 +3301,6 @@ void MainDialog::OnCfgHistoryKeyEvent(wxKeyEvent& event) } -void MainDialog::OnClose(wxCloseEvent& event) -{ - //attention: system shutdown is handled in onQueryEndSession()! - - //regular destruction handling - if (event.CanVeto()) - { - const bool cancelled = !saveOldConfig(); //notify user about changed settings - if (cancelled) - { - //attention: this Veto() will NOT cancel system shutdown since saveOldConfig() blocks on modal dialog - event.Veto(); - return; - } - } - - Destroy(); -} - - void MainDialog::onCheckRows(CheckRowsEvent& event) { std::vector<size_t> selectedRows; @@ -3798,15 +3815,6 @@ void MainDialog::OnCompare(wxCommandEvent& event) } -void MainDialog::updateTopButtonImages() -{ - updateTopButton(*m_buttonCompare, getResourceImage(L"compare"), getConfig().mainCfg.getCompVariantName(), false /*makeGrey*/); - updateTopButton(*m_buttonSync, getResourceImage(L"sync"), getConfig().mainCfg.getSyncVariantName(), folderCmp_.empty()); - - m_panelTopButtons->Layout(); -} - - void MainDialog::updateGui() { updateGridViewData(); //update gridDataView and write status information @@ -3815,7 +3823,11 @@ void MainDialog::updateGui() updateUnsavedCfgStatus(); - updateTopButtonImages(); + updateTopButton(*m_buttonCompare, getResourceImage(L"compare"), getConfig().mainCfg.getCompVariantName(), false /*makeGrey*/); + updateTopButton(*m_buttonSync, getResourceImage(L"sync"), getConfig().mainCfg.getSyncVariantName(), folderCmp_.empty()); + m_panelTopButtons->Layout(); + + m_menuItemExportList->Enable(!folderCmp_.empty()); //a CSV without even folder names confuses users: https://www.freefilesync.org/forum/viewtopic.php?t=4787 auiMgr_.Update(); //fix small display distortion, if view filter panel is empty } @@ -4871,12 +4883,12 @@ void MainDialog::OnMenuCheckVersionAutomatically(wxCommandEvent& event) m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck)); - if (shouldRunPeriodicUpdateCheck(globalCfg_.gui.lastUpdateCheck)) + if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck)) { flashStatusInformation(_("Searching for program updates...")); //synchronous update check is sufficient here: - periodicUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion, - periodicUpdateCheckRunAsync(periodicUpdateCheckPrepare().get()).get()); + automaticUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion, + automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare().get()).get()); } } @@ -4886,17 +4898,17 @@ void MainDialog::OnRegularUpdateCheck(wxIdleEvent& event) //execute just once per startup! Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this); - if (shouldRunPeriodicUpdateCheck(globalCfg_.gui.lastUpdateCheck)) + if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck)) { flashStatusInformation(_("Searching for program updates...")); - std::shared_ptr<UpdateCheckResultPrep> resultPrep = periodicUpdateCheckPrepare(); //run on main thread: + std::shared_ptr<UpdateCheckResultPrep> resultPrep = automaticUpdateCheckPrepare(); //run on main thread: - guiQueue_.processAsync([resultPrep] { return periodicUpdateCheckRunAsync(resultPrep.get()); }, //run on worker thread: (long-running part of the check) + guiQueue_.processAsync([resultPrep] { return automaticUpdateCheckRunAsync(resultPrep.get()); }, //run on worker thread: (long-running part of the check) [this] (std::shared_ptr<UpdateCheckResult>&& resultAsync) { - periodicUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion, - resultAsync.get()); //run on main thread: + automaticUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion, + resultAsync.get()); //run on main thread: }); } } diff --git a/FreeFileSync/Source/ui/main_dlg.h b/FreeFileSync/Source/ui/main_dlg.h index 7e686431..045e94f1 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -105,7 +105,6 @@ private: void updateGridViewData(); // void updateStatistics(); // more fine-grained updaters void updateUnsavedCfgStatus(); // - void updateTopButtonImages(); // //context menu functions std::vector<zen::FileSystemObject*> getGridSelection(bool fromLeft = true, bool fromRight = true) const; @@ -271,7 +270,7 @@ private: void switchProgramLanguage(wxLanguage langId); - std::set<wxMenuItem*> detachedMenuItemsLayout_; //owning pointers!!! + std::set<wxMenuItem*> detachedMenuItems_; //owning pointers!!! //alternatives: 1. std::set<unique_ptr<>>? key is const => no support for moving items out! 2. std::map<wxMenuItem*, unique_ptr<>>: redundant info, inconvenient use void clearGrid(ptrdiff_t pos = -1); @@ -328,7 +327,7 @@ private: time_t manualTimeSpanFrom_ = 0; time_t manualTimeSpanTo_ = 0; //buffer manual time span selection at session level - std::shared_ptr<FolderHistory> folderHistoryLeft_ = std::make_shared<FolderHistory>(); //shared by all wxComboBox dropdown controls + std::shared_ptr<FolderHistory> folderHistoryLeft_ = std::make_shared<FolderHistory>(); //shared by all wxComboBox dropdown controls std::shared_ptr<FolderHistory> folderHistoryRight_ = std::make_shared<FolderHistory>(); //always bound! zen::AsyncGuiQueue guiQueue_; //schedule and run long-running tasks asynchronously, but process results on GUI queue @@ -338,6 +337,7 @@ private: wxWindow* focusWindowAfterSearch_ = nullptr; //used to restore focus after search panel is closed bool localKeyEventsEnabled_ = true; + bool allowMainDialogClose_ = true; //e.g. do NOT allow close while sync is running => crash!!! zen::TempFileBuffer tempFileBuf_; //buffer temporary copies of non-native files for %local_path% }; diff --git a/FreeFileSync/Source/ui/progress_indicator.cpp b/FreeFileSync/Source/ui/progress_indicator.cpp index c926f25d..3738b3ce 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -64,7 +64,7 @@ inline wxColor getColorItemsBackgroundRim() { return { 53, 25, 255 }; } //dark //don't use wxStopWatch for long-running measurements: internally it uses ::QueryPerformanceCounter() which can overflow after only a few days: // std::chrono::system_clock is not a steady clock, but at least doesn't overflow! -//http://www.freefilesync.org/forum/viewtopic.php?t=1426 +//https://www.freefilesync.org/forum/viewtopic.php?t=1426 class StopWatch { @@ -1106,7 +1106,7 @@ private: { { 0, y_ }, { x_, y_ }, - { x_, 0 }, + { x_, 0 }, }; } @@ -1129,7 +1129,7 @@ private: { { 0, y_ }, { x1_, y_ }, - { x1_, 0 }, + { x1_, 0 }, { x1_, y_ }, { x2_, y_ }, }; @@ -1248,8 +1248,8 @@ public: ~SyncProgressDialogImpl() override; //call this in StatusUpdater derived class destructor at the LATEST(!) to prevent access to currentStatusUpdater - void processHasFinished(SyncResult resultId, const ErrorLog& log) override; - void closeWindowDirectly() override; + void showSummary(SyncResult resultId, const ErrorLog& log) override; + void closeDirectly(bool restoreParentFrame) override; wxWindow* getWindowIfVisible() override { return this->IsShown() ? this : nullptr; } //workaround OS X bug: if "this" is used as parent window for a modal dialog then this dialog will erroneously un-hide its parent! @@ -1274,7 +1274,8 @@ public: } private: - void OnKeyPressed(wxKeyEvent& event); + void OnKeyPressed (wxKeyEvent& event); + void OnKeyPressedParent(wxKeyEvent& event); void OnOkay (wxCommandEvent& event); void OnPause (wxCommandEvent& event); void OnCancel (wxCommandEvent& event); @@ -1372,6 +1373,9 @@ SyncProgressDialogImpl<TopLevelDialog>::SyncProgressDialogImpl(long style, //wxF pnl_.m_bpButtonMinimizeToTray->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(SyncProgressDialogImpl::OnMinimizeToTray), NULL, this); pnl_.m_checkBoxIgnoreErrors->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(SyncProgressDialogImpl::OnToggleIgnoreErrors), NULL, this); + if (parentFrame_) + parentFrame_->Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(SyncProgressDialogImpl::OnKeyPressedParent), nullptr, this); + assert(pnl_.m_buttonClose->GetId() == wxID_OK); //we cannot use wxID_CLOSE else Esc key won't work: yet another wxWidgets bug?? @@ -1383,7 +1387,7 @@ SyncProgressDialogImpl<TopLevelDialog>::SyncProgressDialogImpl(long style, //wxF //pnl.m_animCtrlSyncing->SetAnimation(getResourceAnimation(L"working")); //pnl.m_animCtrlSyncing->Play(); - this->EnableCloseButton(false); //this is NOT honored on OS X or during system shutdown on Windows! + //this->EnableCloseButton(false); //this is NOT honored on OS X or with ALT+F4 on Windows! -> why disable button at all?? timeElapsed_.restart(); //measure total time @@ -1477,9 +1481,11 @@ SyncProgressDialogImpl<TopLevelDialog>::~SyncProgressDialogImpl() { if (parentFrame_) { + parentFrame_->Disconnect(wxEVT_CHAR_HOOK, wxKeyEventHandler(SyncProgressDialogImpl::OnKeyPressedParent), nullptr, this); + parentFrame_->SetTitle(parentTitleBackup_); //restore title text - //make sure main dialog is shown again if still "minimized to systray"! see SyncProgressDialog::closeWindowDirectly() + //make sure main dialog is shown again if still "minimized to systray"! see SyncProgressDialog::closeDirectly() parentFrame_->Show(); //if (parentFrame_->IsIconized()) //caveat: if window is maximized calling Iconize(false) will erroneously un-maximize! // parentFrame_->Iconize(false); @@ -1517,6 +1523,22 @@ void SyncProgressDialogImpl<TopLevelDialog>::OnKeyPressed(wxKeyEvent& event) template <class TopLevelDialog> +void SyncProgressDialogImpl<TopLevelDialog>::OnKeyPressedParent(wxKeyEvent& event) +{ + //redirect keys from main dialog to progress dialog + const int keyCode = event.GetKeyCode(); + if (keyCode == WXK_ESCAPE) + { + this->SetFocus(); + this->OnKeyPressed(event); + return; + } + + event.Skip(); +} + + +template <class TopLevelDialog> void SyncProgressDialogImpl<TopLevelDialog>::initNewPhase() { updateStaticGui(); //evaluates "syncStat_->currentPhase()" @@ -1886,22 +1908,30 @@ void SyncProgressDialogImpl<TopLevelDialog>::updateStaticGui() //depends on "syn template <class TopLevelDialog> -void SyncProgressDialogImpl<TopLevelDialog>::closeWindowDirectly() //this should really be called: do not call back + schedule deletion +void SyncProgressDialogImpl<TopLevelDialog>::closeDirectly(bool restoreParentFrame) //this should really be called: do not call back + schedule deletion { + assert(syncStat_ && abortCb_); + + if (!restoreParentFrame) + parentFrame_ = nullptr; //avoid destructor calls like parentFrame_->Show(), ::TransformProcessType(&psn, kProcessTransformToForegroundApplication); + paused_ = false; //you never know? + //ATTENTION: dialog may live a little longer, so watch callbacks! //e.g. wxGTK calls OnIconize after wxWindow::Close() (better not ask why) and before physical destruction! => indirectly calls updateStaticGui(), which reads syncStat_!!! syncStat_ = nullptr; abortCb_ = nullptr; - //resumeFromSystray(); -> NO, instead ~SyncProgressDialogImpl() makes sure that main dialog is shown again! + + //resumeFromSystray(); -> NO, instead ~SyncProgressDialogImpl() makes sure that main dialog is shown again! e.g. avoid calls to this/parentFrame_->Raise() this->Close(); //generate close event: do NOT destroy window unconditionally! } template <class TopLevelDialog> -void SyncProgressDialogImpl<TopLevelDialog>::processHasFinished(SyncResult resultId, const ErrorLog& log) //essential to call this in StatusHandler derived class destructor +void SyncProgressDialogImpl<TopLevelDialog>::showSummary(SyncResult resultId, const ErrorLog& log) //essential to call this in StatusHandler derived class destructor { + assert(syncStat_ && abortCb_); //at the LATEST(!) to prevent access to currentStatusHandler //enable okay and close events; may be set in this method ONLY @@ -1964,7 +1994,7 @@ void SyncProgressDialogImpl<TopLevelDialog>::processHasFinished(SyncResult resul resumeFromSystray(); //if in tray mode... - this->EnableCloseButton(true); + //this->EnableCloseButton(true); pnl_.m_bpButtonMinimizeToTray->Hide(); pnl_.m_buttonStop->Disable(); @@ -2009,6 +2039,7 @@ void SyncProgressDialogImpl<TopLevelDialog>::processHasFinished(SyncResult resul //show log instead of graph if errors occurred! (not required for ignored warnings) if (log.getItemCount(TYPE_ERROR | TYPE_FATAL_ERROR) > 0) pnl_.m_notebookResult->ChangeSelection(posLog); + warn_static("/|\ not working on linux") //GetSizer()->SetSizeHints(this); //~=Fit() //not a good idea: will shrink even if window is maximized or was enlarged by the user pnl_.Layout(); @@ -2074,17 +2105,17 @@ void SyncProgressDialogImpl<TopLevelDialog>::OnPause(wxCommandEvent& event) template <class TopLevelDialog> void SyncProgressDialogImpl<TopLevelDialog>::OnClose(wxCloseEvent& event) { - //this event handler may be called *during* sync, e.g. due to a system shutdown (Windows), anytime (OS X) - //try to stop sync gracefully and cross fingers: + //this event handler may be called *during* sync! + //=> try to stop sync gracefully and cross fingers: if (abortCb_) abortCb_->userRequestAbort(); //Note: we must NOT veto dialog destruction, else we will cancel system shutdown if this dialog is application main window (like in batch mode) - notifyWindowTerminate_(); //don't wait until delayed "Destroy()" finally calls destructor -> avoid calls to processHasFinished()/closeWindowDirectly() + notifyWindowTerminate_(); //don't wait until delayed "Destroy()" finally calls destructor -> avoid calls to showSummary()/closeDirectly() paused_ = false; //[!] we could be pausing here! - //now that we notified window termination prematurely, and since processHasFinished()/closeWindowDirectly() won't be called, make sure we don't call back, too! + //now that we notified window termination prematurely, and since showSummary()/closeDirectly() won't be called, make sure we don't call back, too! //e.g. a second notifyWindowTerminate_() in ~SyncProgressDialogImpl()!!! syncStat_ = nullptr; abortCb_ = nullptr; diff --git a/FreeFileSync/Source/ui/progress_indicator.h b/FreeFileSync/Source/ui/progress_indicator.h index f17116ba..4d230429 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -52,8 +52,8 @@ struct SyncProgressDialog }; //essential to call one of these two methods in StatusUpdater derived class' destructor at the LATEST(!) //to prevent access to callback to updater (e.g. request abort) - virtual void processHasFinished(SyncResult resultId, const zen::ErrorLog& log) = 0; //sync finished, still dialog may live on - virtual void closeWindowDirectly() = 0; //don't wait for user + virtual void showSummary(SyncResult resultId, const zen::ErrorLog& log) = 0; //sync finished, still dialog may live on + virtual void closeDirectly(bool restoreParentFrame) = 0; //don't wait for user //--------------------------------------------------------------------------- @@ -85,7 +85,7 @@ SyncProgressDialog* createProgressDialog(zen::AbortCallback& abortCb, const Zstring& soundFileSyncComplete, bool ignoreErrors, xmlAccess::PostSyncAction postSyncAction); -//DON'T delete the pointer! it will be deleted by the user clicking "OK/Cancel"/wxWindow::Destroy() after processHasFinished() or closeWindowDirectly() +//DON'T delete the pointer! it will be deleted by the user clicking "OK/Cancel"/wxWindow::Destroy() after showSummary() or closeDirectly() class PauseTimers diff --git a/FreeFileSync/Source/ui/search.cpp b/FreeFileSync/Source/ui/search.cpp index c09863c1..e22146d4 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/search.h b/FreeFileSync/Source/ui/search.h index 8f8023e3..362460d1 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp index e63ff95c..5c5c3851 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -46,7 +46,7 @@ public: private: void OnOK (wxCommandEvent& event) override { EndModal(ReturnSmallDlg::BUTTON_OKAY); } void OnClose (wxCloseEvent& event) override { EndModal(ReturnSmallDlg::BUTTON_CANCEL); } - void OnDonate(wxCommandEvent& event) override { wxLaunchDefaultBrowser(L"http://www.freefilesync.org/donate.php"); } + void OnDonate(wxCommandEvent& event) override { wxLaunchDefaultBrowser(L"https://www.freefilesync.org/donate.php"); } }; @@ -88,8 +88,7 @@ AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent) fgSizerTranslators->Fit(m_scrolledWindowTranslators); - //build information - wxString build = formatTime<std::wstring>(FORMAT_DATE, getCompileTime()) + SPACED_DASH + L"Unicode"; + std::wstring build = formatTime<std::wstring>(FORMAT_DATE, getCompileTime()) + SPACED_DASH + L"Unicode"; #ifndef wxUSE_UNICODE #error what is going on? #endif diff --git a/FreeFileSync/Source/ui/small_dlgs.h b/FreeFileSync/Source/ui/small_dlgs.h index b62bf1ab..ceff867b 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/sorting.h b/FreeFileSync/Source/ui/sorting.h index f97e57dc..a2b598d9 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/sync_cfg.cpp b/FreeFileSync/Source/ui/sync_cfg.cpp index 0863232a..7cbd3afe 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -315,8 +315,8 @@ ConfigDialog::ConfigDialog(wxWindow* parent, setRelativeFontSize(*m_toggleBtnUpdate, 1.25); setRelativeFontSize(*m_toggleBtnCustom, 1.25); - m_toggleBtnRecycler ->SetToolTip(_("Back up deleted and overwritten files in the recycle bin")); - m_toggleBtnPermanent ->SetToolTip(_("Delete or overwrite files permanently")); + m_toggleBtnRecycler ->SetToolTip(_("Retain deleted and overwritten files in the recycle bin")); + m_toggleBtnPermanent ->SetToolTip(_("Delete and overwrite files permanently")); m_toggleBtnVersioning->SetToolTip(_("Move files to a user-defined folder")); enumVersioningStyle_. @@ -994,11 +994,11 @@ void ConfigDialog::updateSyncGui() { case DeletionPolicy::RECYCLER: setBitmap(*m_bitmapDeletionType, getResourceImage(L"delete_recycler")); - setText(*m_staticTextDeletionTypeDescription, _("Back up deleted and overwritten files in the recycle bin")); + setText(*m_staticTextDeletionTypeDescription, _("Retain deleted and overwritten files in the recycle bin")); break; case DeletionPolicy::PERMANENT: setBitmap(*m_bitmapDeletionType, getResourceImage(L"delete_permanently")); - setText(*m_staticTextDeletionTypeDescription, _("Delete or overwrite files permanently")); + setText(*m_staticTextDeletionTypeDescription, _("Delete and overwrite files permanently")); break; case DeletionPolicy::VERSIONING: setBitmap(*m_bitmapDeletionType, getResourceImage(L"delete_versioning_small")); diff --git a/FreeFileSync/Source/ui/sync_cfg.h b/FreeFileSync/Source/ui/sync_cfg.h index fc7b07e5..087cbdd4 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/taskbar.cpp b/FreeFileSync/Source/ui/taskbar.cpp index 9015f3f2..d5ee9b16 100755 --- a/FreeFileSync/Source/ui/taskbar.cpp +++ b/FreeFileSync/Source/ui/taskbar.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/taskbar.h b/FreeFileSync/Source/ui/taskbar.h index 97b9a754..81d1483b 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/tray_icon.cpp b/FreeFileSync/Source/ui/tray_icon.cpp index 04b442e5..b86c7af5 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -216,7 +216,7 @@ FfsTrayIcon::~FfsTrayIcon() => !!!clicking on the icon after ~wxTaskBarIcon ran crashes the application!!! - if ~wxTaskBarIcon() ran from the SyncProgressDialog::updateGui() event loop (e.g. user manually clicking the icon) => icon removed on return - - if ~wxTaskBarIcon() ran from SyncProgressDialog::closeWindowDirectly() => leaves the icon dangling until user closes this dialog and outter event loop runs! + - if ~wxTaskBarIcon() ran from SyncProgressDialog::closeDirectly() => leaves the icon dangling until user closes this dialog and outter event loop runs! */ trayIcon->RemoveIcon(); //required on Windows: unlike on OS X, wxPendingDelete does not kick in before main event loop! diff --git a/FreeFileSync/Source/ui/tray_icon.h b/FreeFileSync/Source/ui/tray_icon.h index 0e2bbbb9..bb1d0175 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/tree_view.cpp b/FreeFileSync/Source/ui/tree_view.cpp index e7c5a699..19f80f4d 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -63,7 +63,7 @@ void TreeView::extractVisibleSubtree(ContainerObject& hierObj, //in // } //prefer file-browser semantics over sync preview (=> always show useful numbers, even for SyncDirection::NONE) - //discussion: http://www.freefilesync.org/forum/viewtopic.php?t=1595 + //discussion: https://www.freefilesync.org/forum/viewtopic.php?t=1595 return std::max(file.getFileSize<LEFT_SIDE>(), file.getFileSize<RIGHT_SIDE>()); }; diff --git a/FreeFileSync/Source/ui/tree_view.h b/FreeFileSync/Source/ui/tree_view.h index 6a1d8810..6ec1a2d8 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/triple_splitter.cpp b/FreeFileSync/Source/ui/triple_splitter.cpp index 21c65cdb..6a288ca3 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/triple_splitter.h b/FreeFileSync/Source/ui/triple_splitter.h index c5c80ef1..c93e478e 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/FreeFileSync/Source/ui/version_check.cpp b/FreeFileSync/Source/ui/version_check.cpp index d1288951..265b6e38 100755 --- a/FreeFileSync/Source/ui/version_check.cpp +++ b/FreeFileSync/Source/ui/version_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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -119,12 +119,12 @@ void showUpdateAvailableDialog(wxWindow* parent, const std::string& onlineVersio switch (showConfirmationDialog(parent, DialogInfoType::INFO, PopupDialogCfg(). setIcon(getResourceImage(L"update_available")). setTitle(_("Check for Program Updates")). - setMainInstructions(replaceCpy(_("FreeFileSync %x is available!"), L"%x", utfTo<std::wstring>(onlineVersion)) + L"\n" + _("Download now?")). + setMainInstructions(replaceCpy(_("FreeFileSync %x is available!"), L"%x", utfTo<std::wstring>(onlineVersion)) + L" " + _("Download now?")). setDetailInstructions(updateDetailsMsg), _("&Download"))) { case ConfirmationButton::ACCEPT: - wxLaunchDefaultBrowser(L"http://www.freefilesync.org/get_latest.php"); + wxLaunchDefaultBrowser(L"https://www.freefilesync.org/get_latest.php"); break; case ConfirmationButton::CANCEL: break; @@ -185,7 +185,7 @@ void zen::checkForUpdateNow(wxWindow* parent, std::string& lastOnlineVersion) lastOnlineVersion = onlineVersion; if (haveNewerVersionOnline(onlineVersion)) - showUpdateAvailableDialog(parent, lastOnlineVersion); + showUpdateAvailableDialog(parent, onlineVersion); else showNotificationDialog(parent, DialogInfoType::INFO, PopupDialogCfg(). setIcon(getResourceImage(L"update_check")). @@ -204,7 +204,7 @@ void zen::checkForUpdateNow(wxWindow* parent, std::string& lastOnlineVersion) setDetailInstructions(e.toString()), _("&Check"), _("&Retry"))) { case QuestionButton2::YES: - wxLaunchDefaultBrowser(L"http://www.freefilesync.org/get_latest.php"); + wxLaunchDefaultBrowser(L"https://www.freefilesync.org/get_latest.php"); break; case QuestionButton2::NO: //retry checkForUpdateNow(parent, lastOnlineVersion); //note: retry via recursion!!! @@ -235,7 +235,7 @@ struct zen::UpdateCheckResultPrep }; //run on main thread: -std::shared_ptr<UpdateCheckResultPrep> zen::periodicUpdateCheckPrepare() +std::shared_ptr<UpdateCheckResultPrep> zen::automaticUpdateCheckPrepare() { return nullptr; } @@ -252,14 +252,14 @@ struct zen::UpdateCheckResult }; //run on worker thread: -std::shared_ptr<UpdateCheckResult> zen::periodicUpdateCheckRunAsync(const UpdateCheckResultPrep* resultPrep) +std::shared_ptr<UpdateCheckResult> zen::automaticUpdateCheckRunAsync(const UpdateCheckResultPrep* resultPrep) { return nullptr; } //run on main thread: -void zen::periodicUpdateCheckEval(wxWindow* parent, time_t& lastUpdateCheck, std::string& lastOnlineVersion, const UpdateCheckResult* resultAsync) +void zen::automaticUpdateCheckEval(wxWindow* parent, time_t& lastUpdateCheck, std::string& lastOnlineVersion, const UpdateCheckResult* resultAsync) { UpdateCheckResult result; try @@ -278,8 +278,8 @@ void zen::periodicUpdateCheckEval(wxWindow* parent, time_t& lastUpdateCheck, std lastUpdateCheck = getVersionCheckCurrentTime(); lastOnlineVersion = result.onlineVersion; - if (haveNewerVersionOnline(result.onlineVersion)) - showUpdateAvailableDialog(parent, lastOnlineVersion); + if (haveNewerVersionOnline(result.onlineVersion)) + showUpdateAvailableDialog(parent, result.onlineVersion); } else { @@ -287,21 +287,21 @@ void zen::periodicUpdateCheckEval(wxWindow* parent, time_t& lastUpdateCheck, std { lastOnlineVersion = "Unknown"; - switch (showQuestionDialog(parent, DialogInfoType::ERROR2, PopupDialogCfg(). - setTitle(_("Check for Program Updates")). - setMainInstructions(_("Cannot find current FreeFileSync version number online. A newer version is likely available. Check manually now?")). - setDetailInstructions(result.error->toString()), - _("&Check"), _("&Retry"))) - { - case QuestionButton2::YES: - wxLaunchDefaultBrowser(L"http://www.freefilesync.org/get_latest.php"); - break; - case QuestionButton2::NO: //retry - periodicUpdateCheckEval(parent, lastUpdateCheck, lastOnlineVersion, resultAsync); //note: retry via recursion!!! - break; - case QuestionButton2::CANCEL: - break; - } + switch (showQuestionDialog(parent, DialogInfoType::ERROR2, PopupDialogCfg(). + setTitle(_("Check for Program Updates")). + setMainInstructions(_("Cannot find current FreeFileSync version number online. A newer version is likely available. Check manually now?")). + setDetailInstructions(result.error->toString()), + _("&Check"), _("&Retry"))) + { + case QuestionButton2::YES: + wxLaunchDefaultBrowser(L"https://www.freefilesync.org/get_latest.php"); + break; + case QuestionButton2::NO: //retry + automaticUpdateCheckEval(parent, lastUpdateCheck, lastOnlineVersion, resultAsync); //note: retry via recursion!!! + break; + case QuestionButton2::CANCEL: + break; + } } //else: ignore this error } diff --git a/FreeFileSync/Source/ui/version_check.h b/FreeFileSync/Source/ui/version_check.h index fb824a2e..2e306747 100755 --- a/FreeFileSync/Source/ui/version_check.h +++ b/FreeFileSync/Source/ui/version_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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -18,18 +18,18 @@ void disableUpdateCheck(time_t& lastUpdateCheck); bool haveNewerVersionOnline(const std::string& onlineVersion); //---------------------------------------------------------------------------- //periodic update check: -bool shouldRunPeriodicUpdateCheck(time_t lastUpdateCheck); +bool shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck); struct UpdateCheckResultPrep; struct UpdateCheckResult; //run on main thread: -std::shared_ptr<UpdateCheckResultPrep> periodicUpdateCheckPrepare(); +std::shared_ptr<UpdateCheckResultPrep> automaticUpdateCheckPrepare(); //run on worker thread: (long-running part of the check) -std::shared_ptr<UpdateCheckResult> periodicUpdateCheckRunAsync(const UpdateCheckResultPrep* resultPrep); +std::shared_ptr<UpdateCheckResult> automaticUpdateCheckRunAsync(const UpdateCheckResultPrep* resultPrep); //run on main thread: -void periodicUpdateCheckEval(wxWindow* parent, time_t& lastUpdateCheck, std::string& lastOnlineVersion, - const UpdateCheckResult* resultAsync); +void automaticUpdateCheckEval(wxWindow* parent, time_t& lastUpdateCheck, std::string& lastOnlineVersion, + const UpdateCheckResult* resultAsync); //---------------------------------------------------------------------------- //call from main thread: void checkForUpdateNow(wxWindow* parent, std::string& lastOnlineVersion); diff --git a/FreeFileSync/Source/ui/version_check_impl.h b/FreeFileSync/Source/ui/version_check_impl.h index 5693f9c9..5ced0190 100755 --- a/FreeFileSync/Source/ui/version_check_impl.h +++ b/FreeFileSync/Source/ui/version_check_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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -46,7 +46,7 @@ time_t getVersionCheckCurrentTime() inline -bool shouldRunPeriodicUpdateCheck(time_t lastUpdateCheck) +bool shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck) { if (lastUpdateCheck == getVersionCheckInactiveId()) return false; diff --git a/FreeFileSync/Source/version/version.h b/FreeFileSync/Source/version/version.h index 75692b6d..06eb503f 100755 --- a/FreeFileSync/Source/version/version.h +++ b/FreeFileSync/Source/version/version.h @@ -3,7 +3,7 @@ namespace zen { -const char ffsVersion[] = "9.5"; //internal linkage! +const char ffsVersion[] = "9.6"; //internal linkage! const char FFS_VERSION_SEPARATOR = '.'; } diff --git a/wx+/app_main.h b/wx+/app_main.h index 48148802..d9559fea 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/async_task.h b/wx+/async_task.h index df688147..1d64e262 100755 --- a/wx+/async_task.h +++ b/wx+/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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/bitmap_button.h b/wx+/bitmap_button.h index 18702dd3..379cf52d 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/choice_enum.h b/wx+/choice_enum.h index 03048c43..a19e1457 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/context_menu.h b/wx+/context_menu.h index 27e794b1..de351df4 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/file_drop.cpp b/wx+/file_drop.cpp index 6a02749a..2c0b471e 100755 --- a/wx+/file_drop.cpp +++ b/wx+/file_drop.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/file_drop.h b/wx+/file_drop.h index 526ee64d..9826bf27 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/font_size.h b/wx+/font_size.h index cd2b80f2..636b07aa 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/graph.cpp b/wx+/graph.cpp index 132361b3..b81896b4 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -227,12 +227,12 @@ void drawCornerText(wxDC& dc, const wxRect& graphArea, const wxString& txt, Grap break; } - { - //add text shadow to improve readability: - wxDCTextColourChanger dummy(dc, backgroundColor); - dc.DrawText(txt, drawPos + wxPoint(borderX + 1, borderY + 1)); - } - wxDCTextColourChanger dummy(dc, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); + { + //add text shadow to improve readability: + wxDCTextColourChanger dummy(dc, backgroundColor); + dc.DrawText(txt, drawPos + wxPoint(borderX + 1, borderY + 1)); + } + wxDCTextColourChanger dummy(dc, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); dc.DrawText(txt, drawPos + wxPoint(borderX, borderY)); } @@ -546,9 +546,9 @@ void Graph2D::render(wxDC& dc) const const wxRect clientRect = GetClientRect(); //DON'T use wxDC::GetSize()! DC may be larger than visible area! - clearArea(dc, clientRect, GetBackgroundColour() /*user-configurable!*/); - //wxPanel::GetClassDefaultAttributes().colBg : - //wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); + clearArea(dc, clientRect, GetBackgroundColour() /*user-configurable!*/); + //wxPanel::GetClassDefaultAttributes().colBg : + //wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); /* ----------------------- @@ -731,10 +731,10 @@ void Graph2D::render(wxDC& dc) const //save current selection as "double" coordinates activeSel_->refSelection().from = CurvePoint(cvrtX.screenToReal(screenFromX), - cvrtY.screenToReal(screenFromY)); + cvrtY.screenToReal(screenFromY)); activeSel_->refSelection().to = CurvePoint(cvrtX.screenToReal(screenToX), - cvrtY.screenToReal(screenToY)); + cvrtY.screenToReal(screenToY)); } //#################### begin drawing #################### diff --git a/wx+/graph.h b/wx+/graph.h index 6007ca30..5c71ed52 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -78,7 +78,7 @@ struct ArrayCurveData : public SparseCurveData virtual size_t getSize () const = 0; private: - std::pair<double, double> getRangeX() const override { const size_t sz = getSize(); return { 0.0, sz == 0 ? 0.0 : sz - 1.0}; } + std::pair<double, double> getRangeX() const override { const size_t sz = getSize(); return { 0.0, sz == 0 ? 0.0 : sz - 1.0}; } Opt<CurvePoint> getLessEq(double x) const override { diff --git a/wx+/grid.cpp b/wx+/grid.cpp index 6652ec56..f048d059 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/http.cpp b/wx+/http.cpp index d4fe1547..dd3cb3bc 100755 --- a/wx+/http.cpp +++ b/wx+/http.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -1,11 +1,11 @@ // ***************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * -// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** -#ifndef HTTP_h_879083425703425702 -#define HTTP_h_879083425703425702 +#ifndef HTTP_H_879083425703425702 +#define HTTP_H_879083425703425702 #include <zen/file_error.h> #include <zen/serialize.h> @@ -46,4 +46,4 @@ std::string xWwwFormUrlEncode(const std::vector<std::pair<std::string, std::stri std::vector<std::pair<std::string, std::string>> xWwwFormUrlDecode(const std::string& str); } -#endif //HTTP_h_879083425703425702 +#endif //HTTP_H_879083425703425702 diff --git a/wx+/image_resources.cpp b/wx+/image_resources.cpp index b185771b..d4547d35 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/image_resources.h b/wx+/image_resources.h index c29adb9f..3c3bf39c 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/image_tools.cpp b/wx+/image_tools.cpp index 1e63346a..235ebe59 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/image_tools.h b/wx+/image_tools.h index a1fed061..6dd9b26b 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/no_flicker.h b/wx+/no_flicker.h index 11443a1d..f9bf862b 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/popup_dlg.cpp b/wx+/popup_dlg.cpp index 1d18be5e..5babaff3 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/popup_dlg.h b/wx+/popup_dlg.h index 771f5cb0..2aedf9b8 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/std_button_layout.h b/wx+/std_button_layout.h index 0f0d607f..8fe5f405 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/toggle_button.h b/wx+/toggle_button.h index 9c3cb3f1..0172881e 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/tooltip.cpp b/wx+/tooltip.cpp index 053b0714..a8fd1da1 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/tooltip.h b/wx+/tooltip.h index f2a7043e..d74beb9d 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/zlib_wrap.cpp b/wx+/zlib_wrap.cpp index 32ed65e1..540854a1 100755 --- a/wx+/zlib_wrap.cpp +++ b/wx+/zlib_wrap.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/wx+/zlib_wrap.h b/wx+/zlib_wrap.h index ae2e6d0e..7265331e 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/basic_math.h b/zen/basic_math.h index 22f29ca7..1b6b7e97 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -288,9 +288,9 @@ double median(RandomAccessIterator first, RandomAccessIterator last) //note: inv { const size_t n = last - first; if (n == 0) - return 0; + return 0; - std::nth_element(first, first + n / 2, last); //complexity: O(n) + std::nth_element(first, first + n / 2, last); //complexity: O(n) const double midVal = *(first + n / 2); if (n % 2 != 0) @@ -306,7 +306,7 @@ double mad(RandomAccessIterator first, RandomAccessIterator last) //note: invali //http://en.wikipedia.org/wiki/Median_absolute_deviation const size_t n = last - first; if (n == 0) - return 0; + return 0; const double m = median(first, last); diff --git a/zen/build_info.h b/zen/build_info.h index 8354f492..7b0aa9cf 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/deprecate.h b/zen/deprecate.h index c2a1ebfa..2a6bcb0d 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/dir_watcher.cpp b/zen/dir_watcher.cpp index 4e759d55..17f2244d 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/dir_watcher.h b/zen/dir_watcher.h index 5676555f..8045d184 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/error_log.h b/zen/error_log.h index 0d62dd1f..1fcbdefb 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/file_access.cpp b/zen/file_access.cpp index e7467325..1711e934 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -379,17 +379,17 @@ void setWriteTimeNative(const Zstring& itemPath, const struct ::timespec& modTim using open()/futimens() for regular files and utimensat(AT_SYMLINK_NOFOLLOW) for symlinks is consistent with "cp" and "touch"! */ struct ::timespec newTimes[2] = {}; - newTimes[0].tv_sec = ::time(nullptr); //access time; using UTIME_OMIT for tv_nsec would trigger even more bugs: http://www.freefilesync.org/forum/viewtopic.php?t=1701 + newTimes[0].tv_sec = ::time(nullptr); //access time; using UTIME_OMIT for tv_nsec would trigger even more bugs: https://www.freefilesync.org/forum/viewtopic.php?t=1701 newTimes[1] = modTime; //modification time if (procSl == ProcSymlink::FOLLOW) { //hell knows why files on gvfs-mounted Samba shares fail to open(O_WRONLY) returning EOPNOTSUPP: - //http://www.freefilesync.org/forum/viewtopic.php?t=2803 => utimensat() works (but not for gvfs SFTP) + //https://www.freefilesync.org/forum/viewtopic.php?t=2803 => utimensat() works (but not for gvfs SFTP) if (::utimensat(AT_FDCWD, itemPath.c_str(), newTimes, 0) == 0) return; - //in other cases utimensat() returns EINVAL for CIFS/NTFS drives, but open+futimens works: http://www.freefilesync.org/forum/viewtopic.php?t=387 + //in other cases utimensat() returns EINVAL for CIFS/NTFS drives, but open+futimens works: https://www.freefilesync.org/forum/viewtopic.php?t=387 const int fdFile = ::open(itemPath.c_str(), O_WRONLY | O_APPEND); //2017-07-04: O_WRONLY | O_APPEND seems to avoid EOPNOTSUPP on gvfs SFTP! if (fdFile == -1) THROW_LAST_FILE_ERROR(replaceCpy(_("Cannot write modification time of %x."), L"%x", fmtPath(itemPath)), L"open"); @@ -649,7 +649,7 @@ FileCopyResult copyFileOsSpecific(const Zstring& sourceFile, //throw FileError, //this triggers bugs on samba shares where the modification time is set to current time instead. //Linux: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=340236 // http://comments.gmane.org/gmane.linux.file-systems.cifs/2854 - //OS X: http://www.freefilesync.org/forum/viewtopic.php?t=356 + //OS X: https://www.freefilesync.org/forum/viewtopic.php?t=356 setWriteTimeNative(targetFile, sourceInfo.st_mtim, ProcSymlink::FOLLOW); //throw FileError } catch (const FileError& e) diff --git a/zen/file_access.h b/zen/file_access.h index 0a9b2d0c..743ad15d 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/file_error.h b/zen/file_error.h index 18e790de..decc0f7e 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/file_id_def.h b/zen/file_id_def.h index 8d429fbc..7772e3e3 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/file_io.cpp b/zen/file_io.cpp index 68b41bcb..bb4848c6 100755 --- a/zen/file_io.cpp +++ b/zen/file_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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -115,6 +115,8 @@ size_t FileInput::tryRead(void* buffer, size_t bytesToRead) //throw FileError, E bytesRead = ::read(getHandle(), buffer, bytesToRead); } while (bytesRead < 0 && errno == EINTR); //Compare copy_reg() in copy.c: ftp://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz + //EINTR is not checked on macOS' copyfile: https://opensource.apple.com/source/copyfile/copyfile-146/copyfile.c.auto.html + //read() on macOS: https://developer.apple.com/legacy/library/documentation/Darwin/Reference/ManPages/man2/read.2.html if (bytesRead < 0) THROW_LAST_FILE_ERROR(replaceCpy(_("Cannot read file %x."), L"%x", fmtPath(getFilePath())), L"read"); @@ -129,23 +131,41 @@ size_t FileInput::tryRead(void* buffer, size_t bytesToRead) //throw FileError, E size_t FileInput::read(void* buffer, size_t bytesToRead) //throw FileError, ErrorFileLocked, X; return "bytesToRead" bytes unless end of stream! { + warn_static("implement PERF_AWESOME_BUFFER program wide for all buffers!?") + + /* + FFS 8.9-9.5 perf issues on macOS: https://www.freefilesync.org/forum/viewtopic.php?t=4808 + app-level buffering is essential to optimize random data sizes; e.g. "export file list": + => big perf improvement on Windows, Linux. No significant improvement on macOS in tests + impact on stream-based file copy: + => no drawback vs block-wise copy loop on Linux, HOWEVER: big perf issue on macOS! + + Possible cause of macOS perf issue unclear: + - getting rid of std::vector::resize() and std::vector::erase() "fixed" the problem + => costly zero-initializing memory? problem with inlining? QOI issue of std:vector on clang/macOS? + - replacing std::copy() with memcpy() also *seems* to have improved speed "somewhat" + */ + const size_t blockSize = getBlockSize(); - assert(memBuf_.size() <= blockSize); + assert(memBuf_.size() >= blockSize); + assert(bufPos_ <= bufPosEnd_ && bufPosEnd_ <= memBuf_.size()); + char* it = static_cast<char*>(buffer); char* const itEnd = it + bytesToRead; for (;;) { - const size_t junkSize = std::min(static_cast<size_t>(itEnd - it), memBuf_.size()); - std::copy (memBuf_.begin(), memBuf_.begin() + junkSize, it); - memBuf_.erase(memBuf_.begin(), memBuf_.begin() + junkSize); - it += junkSize; + const size_t junkSize = std::min(static_cast<size_t>(itEnd - it), bufPosEnd_ - bufPos_); + std::memcpy(it, &memBuf_[bufPos_], junkSize); + bufPos_ += junkSize; + it += junkSize; if (it == itEnd) break; + //-------------------------------------------------------------------- - memBuf_.resize(blockSize); const size_t bytesRead = tryRead(&memBuf_[0], blockSize); //throw FileError, ErrorFileLocked; may return short, only 0 means EOF! => CONTRACT: bytesToRead > 0 - memBuf_.resize(bytesRead); + bufPos_ = 0; + bufPosEnd_ = bytesRead; if (notifyUnbufferedIO_) notifyUnbufferedIO_(bytesRead); //throw X @@ -213,6 +233,7 @@ size_t FileOutput::tryWrite(const void* buffer, size_t bytesToWrite) //throw Fil bytesWritten = ::write(getHandle(), buffer, bytesToWrite); } while (bytesWritten < 0 && errno == EINTR); + //write() on macOS: https://developer.apple.com/legacy/library/documentation/Darwin/Reference/ManPages/man2/write.2.html if (bytesWritten <= 0) { @@ -232,20 +253,32 @@ size_t FileOutput::tryWrite(const void* buffer, size_t bytesToWrite) //throw Fil void FileOutput::write(const void* buffer, size_t bytesToWrite) //throw FileError, X { const size_t blockSize = getBlockSize(); - assert(memBuf_.size() <= blockSize); - const char* it = static_cast<const char*>(buffer); + assert(memBuf_.size() >= blockSize); + assert(bufPos_ <= bufPosEnd_ && bufPosEnd_ <= memBuf_.size()); + + const char* it = static_cast<const char*>(buffer); const char* const itEnd = it + bytesToWrite; for (;;) { - const size_t junkSize = std::min(static_cast<size_t>(itEnd - it), blockSize - memBuf_.size()); - memBuf_.insert(memBuf_.end(), it, it + junkSize); - it += junkSize; + if (memBuf_.size() - bufPos_ < blockSize) //support memBuf_.size() > blockSize to reduce memmove()s, but perf test shows: not really needed! + // || bufPos_ == bufPosEnd_) -> not needed while memBuf_.size() == blockSize + { + std::memmove(&memBuf_[0], &memBuf_[bufPos_], bufPosEnd_ - bufPos_); + bufPosEnd_ -= bufPos_; + bufPos_ = 0; + } + + const size_t junkSize = std::min(static_cast<size_t>(itEnd - it), blockSize - (bufPosEnd_ - bufPos_)); + std::memcpy(&memBuf_[bufPosEnd_], it, junkSize); + bufPosEnd_ += junkSize; + it += junkSize; if (it == itEnd) return; + //-------------------------------------------------------------------- - const size_t bytesWritten = tryWrite(&memBuf_[0], blockSize); //throw FileError; may return short! CONTRACT: bytesToWrite > 0 - memBuf_.erase(memBuf_.begin(), memBuf_.begin() + bytesWritten); + const size_t bytesWritten = tryWrite(&memBuf_[bufPos_], blockSize); //throw FileError; may return short! CONTRACT: bytesToWrite > 0 + bufPos_ += bytesWritten; if (notifyUnbufferedIO_) notifyUnbufferedIO_(bytesWritten); //throw X! } } @@ -253,11 +286,12 @@ void FileOutput::write(const void* buffer, size_t bytesToWrite) //throw FileErro void FileOutput::flushBuffers() //throw FileError, X { - assert(memBuf_.size() <= getBlockSize()); - while (!memBuf_.empty()) + assert(bufPosEnd_ - bufPos_ <= getBlockSize()); + assert(bufPos_ <= bufPosEnd_ && bufPosEnd_ <= memBuf_.size()); + while (bufPos_ != bufPosEnd_) { - const size_t bytesWritten = tryWrite(&memBuf_[0], memBuf_.size()); //throw FileError; may return short! CONTRACT: bytesToWrite > 0 - memBuf_.erase(memBuf_.begin(), memBuf_.begin() + bytesWritten); + const size_t bytesWritten = tryWrite(&memBuf_[bufPos_], bufPosEnd_ - bufPos_); //throw FileError; may return short! CONTRACT: bytesToWrite > 0 + bufPos_ += bytesWritten; if (notifyUnbufferedIO_) notifyUnbufferedIO_(bytesWritten); //throw X! } } diff --git a/zen/file_io.h b/zen/file_io.h index c2071500..369cdc01 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -64,8 +64,11 @@ public: private: size_t tryRead(void* buffer, size_t bytesToRead); //throw FileError, ErrorFileLocked; may return short, only 0 means EOF! => CONTRACT: bytesToRead > 0! - std::vector<char> memBuf_; const IOCallback notifyUnbufferedIO_; //throw X + + std::vector<char> memBuf_ = std::vector<char>(getBlockSize()); + size_t bufPos_ = 0; + size_t bufPosEnd_= 0; }; @@ -90,8 +93,11 @@ public: private: size_t tryWrite(const void* buffer, size_t bytesToWrite); //throw FileError; may return short! CONTRACT: bytesToWrite > 0 - std::vector<char> memBuf_; IOCallback notifyUnbufferedIO_; //throw X + + std::vector<char> memBuf_ = std::vector<char>(getBlockSize()); + size_t bufPos_ = 0; + size_t bufPosEnd_ = 0; }; //----------------------------------------------------------------------------------------------- diff --git a/zen/file_traverser.cpp b/zen/file_traverser.cpp index 916b6e8d..aa4c439e 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/file_traverser.h b/zen/file_traverser.h index 1f7142de..19359148 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/fixed_list.h b/zen/fixed_list.h index 27eb488c..535ffa31 100755 --- a/zen/fixed_list.h +++ b/zen/fixed_list.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/format_unit.cpp b/zen/format_unit.cpp index e62c9286..0f54a34b 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/format_unit.h b/zen/format_unit.h index 3dcc6858..154ec542 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/globals.h b/zen/globals.h index b85d5f77..32781f2a 100755 --- a/zen/globals.h +++ b/zen/globals.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/optional.h b/zen/optional.h index 0efc34fe..a2a1a169 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/process_priority.cpp b/zen/process_priority.cpp index 5767e60c..e925f142 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/process_priority.h b/zen/process_priority.h index ac96a8ae..bec8f9b5 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/recycler.cpp b/zen/recycler.cpp index c84ef8f3..30b37cb2 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/recycler.h b/zen/recycler.h index 54dd75ca..0e5ebbb1 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/scope_guard.h b/zen/scope_guard.h index ccc6db0c..2048af9b 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/serialize.h b/zen/serialize.h index 8f7e813c..381d102a 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/shell_execute.h b/zen/shell_execute.h index 077f18e7..18e4854b 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -9,14 +9,14 @@ #include "file_error.h" - #include "thread.h" + #include <unistd.h> //fork() #include <stdlib.h> //::system() namespace zen { //launch commandline and report errors via popup dialog -//windows: COM needs to be initialized before calling this function! +//Windows: COM needs to be initialized before calling this function! enum ExecutionType { EXEC_TYPE_SYNC, @@ -38,24 +38,34 @@ void shellExecute(const Zstring& command, ExecutionType type) //throw FileError if (type == EXEC_TYPE_SYNC) { - //Posix::system - execute a shell command + //Posix ::system() - execute a shell command const int rv = ::system(command.c_str()); //do NOT use std::system as its documentation says nothing about "WEXITSTATUS(rv)", ect... - if (rv == -1 || WEXITSTATUS(rv) == 127) //http://linux.die.net/man/3/system "In case /bin/sh could not be executed, the exit status will be that of a command that does exit(127)" + if (rv == -1 || WEXITSTATUS(rv) == 127) throw FileError(_("Incorrect command line:") + L"\n" + utfTo<std::wstring>(command)); + //http://linux.die.net/man/3/system "In case /bin/sh could not be executed, the exit status will be that of a command that does exit(127)" + //Bonus: For an incorrect command line /bin/sh also returns with 127! } else - { - runAsync([=] { int rv = ::system(command.c_str()); (void)rv; }); - - warn_static("finish:") - - - - - - - - } + { + //follow implemenation of ::system() except for waitpid(): + const pid_t pid = ::fork(); + if (pid < 0) //pids are never negative, empiric proof: https://linux.die.net/man/2/wait + THROW_LAST_FILE_ERROR(_("Incorrect command line:") + L"\n" + utfTo<std::wstring>(command), L"fork"); + + if (pid == 0) //child process + { + const char* argv[] = { "sh", "-c", command.c_str(), nullptr }; + /*int rv =*/::execv("/bin/sh", const_cast<char**>(argv)); + //safe to cast away const: http://pubs.opengroup.org/onlinepubs/9699919799/functions/exec.html + // "The statement about argv[] and envp[] being constants is included to make explicit to future + // writers of language bindings that these objects are completely constant. Due to a limitation of + // the ISO C standard, it is not possible to state that idea in standard C." + + //"execv() only returns if an error has occurred. The return value is -1, and errno is set to indicate the error." + ::_exit(127); //[!] avoid flushing I/O buffers or doing other clean up from child process like with "exit(127)"! + } + //else //parent process + } } } } diff --git a/zen/shutdown.cpp b/zen/shutdown.cpp index b21ab8db..dd02814f 100755 --- a/zen/shutdown.cpp +++ b/zen/shutdown.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -17,18 +17,16 @@ void zen::shutdownSystem() //throw FileError { //https://linux.die.net/man/2/reboot => needs admin rights! - //should work without admin rights: + //"systemctl" should work without admin rights: shellExecute("sleep 1; systemctl poweroff", EXEC_TYPE_ASYNC); //throw FileError //sleep 1: give FFS some time to properly shut down! - //Linux: main thread will wait on detached threads! - warn_static("get rid of shellExecute's thread implementation!") } void zen::suspendSystem() //throw FileError { - //should work without admin rights: + //"systemctl" should work without admin rights: shellExecute("systemctl suspend", EXEC_TYPE_ASYNC); //throw FileError } @@ -38,25 +36,25 @@ Command line alternatives: #ifdef ZEN_WIN #ifdef ZEN_WIN_VISTA_AND_LATER - Shut down: shutdown /s /t 60 - Sleep: rundll32.exe powrprof.dll,SetSuspendState Sleep - Log off: shutdown /l + Shut down: shutdown /s /t 60 + Sleep: rundll32.exe powrprof.dll,SetSuspendState Sleep + Log off: shutdown /l #else //XP - Shut down: shutdown -s -t 60 - Standby: rundll32.exe powrprof.dll,SetSuspendState //this triggers standby OR hibernate, depending on whether hibernate setting is active! no suspend on XP? - Log off: shutdown -l + Shut down: shutdown -s -t 60 + Standby: rundll32.exe powrprof.dll,SetSuspendState //this triggers standby OR hibernate, depending on whether hibernate setting is active! no suspend on XP? + Log off: shutdown -l #endif #elif defined ZEN_LINUX - Shut down: systemctl poweroff //alternative requiring admin: sudo shutdown -h 1 - Sleep: systemctl suspend //alternative requiring admin: sudo pm-suspend - Log off: gnome-session-quit --no-prompt - //alternative requiring admin: sudo killall Xorg - //alternative without admin: dbus-send --session --print-reply --dest=org.gnome.SessionManager /org/gnome/SessionManager org.gnome.SessionManager.Logout uint32:1 + Shut down: systemctl poweroff //alternative requiring admin: sudo shutdown -h 1 + Sleep: systemctl suspend //alternative requiring admin: sudo pm-suspend + Log off: gnome-session-quit --no-prompt + //alternative requiring admin: sudo killall Xorg + //alternative without admin: dbus-send --session --print-reply --dest=org.gnome.SessionManager /org/gnome/SessionManager org.gnome.SessionManager.Logout uint32:1 #elif defined ZEN_MAC - Shut down: osascript -e 'tell application "System Events" to shut down' - Sleep: osascript -e 'tell application "System Events" to sleep' - Log off: osascript -e 'tell application "System Events" to log out' + Shut down: osascript -e 'tell application "System Events" to shut down' + Sleep: osascript -e 'tell application "System Events" to sleep' + Log off: osascript -e 'tell application "System Events" to log out' #endif */ diff --git a/zen/shutdown.h b/zen/shutdown.h index e64dee41..b9d47df6 100755 --- a/zen/shutdown.h +++ b/zen/shutdown.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/stl_tools.h b/zen/stl_tools.h index 2fcecd11..ba4a6c89 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/string_base.h b/zen/string_base.h index cb7ced20..30699c38 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/string_tools.h b/zen/string_tools.h index 0a24ab2a..5058f78d 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/string_traits.h b/zen/string_traits.h index f17e5e0d..502250c2 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/symlink_target.h b/zen/symlink_target.h index 6ff7f327..2393013e 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/sys_error.cpp b/zen/sys_error.cpp index fd4c8f1e..2acaca1d 100755 --- a/zen/sys_error.cpp +++ b/zen/sys_error.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/sys_error.h b/zen/sys_error.h index f4361e69..31eb8209 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/thread.h b/zen/thread.h index 85e64493..0bff5adc 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/type_tools.h b/zen/type_tools.h index d0a62ea2..a705d9bd 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/type_traits.h b/zen/type_traits.h index 917b3258..f0f96b43 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/warn_static.h b/zen/warn_static.h index c2232f74..5b9a4fee 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/xml_io.cpp b/zen/xml_io.cpp index 8192d6e6..a618f27c 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/xml_io.h b/zen/xml_io.h index 6c2fc720..8d3346c6 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zen/zstring.cpp b/zen/zstring.cpp index fb62424a..2aa3b3f2 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** @@ -75,11 +75,11 @@ int cmpStringNaturalLinux(const char* lhs, size_t lhsLen, const char* rhs, size_ - implement strict weak ordering! - don't follow broken "strnatcasecmp": https://github.com/php/php-src/blob/master/ext/standard/strnatcmp.c 1. incorrect non-ASCII CI-comparison - 2. incorrect bounds checks + 2. incorrect bounds checks 3. incorrect trimming of *all* whitespace - 4. arbitrary handling of leading 0 only at string begin + 4. arbitrary handling of leading 0 only at string begin 5. incorrect handling of whitespace following a number - 6. code is a mess + 6. code is a mess */ for (;;) { diff --git a/zen/zstring.h b/zen/zstring.h index 33f48990..2a4a549e 100755 --- 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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zenXml/zenxml/bind.h b/zenXml/zenxml/bind.h index 6de10a44..f3cfa398 100755 --- a/zenXml/zenxml/bind.h +++ b/zenXml/zenxml/bind.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zenXml/zenxml/cvrt_struc.h b/zenXml/zenxml/cvrt_struc.h index 7797c0fe..3a724376 100755 --- a/zenXml/zenxml/cvrt_struc.h +++ b/zenXml/zenxml/cvrt_struc.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zenXml/zenxml/cvrt_text.h b/zenXml/zenxml/cvrt_text.h index 529ead57..6ff1ec94 100755 --- a/zenXml/zenxml/cvrt_text.h +++ b/zenXml/zenxml/cvrt_text.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zenXml/zenxml/dom.h b/zenXml/zenxml/dom.h index 1b1267d8..09977f1d 100755 --- a/zenXml/zenxml/dom.h +++ b/zenXml/zenxml/dom.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zenXml/zenxml/error.h b/zenXml/zenxml/error.h index b50da44a..ceb36816 100755 --- a/zenXml/zenxml/error.h +++ b/zenXml/zenxml/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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zenXml/zenxml/io.h b/zenXml/zenxml/io.h index 7bb1a01d..1361d865 100755 --- a/zenXml/zenxml/io.h +++ b/zenXml/zenxml/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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zenXml/zenxml/parser.h b/zenXml/zenxml/parser.h index 6f08297b..bff2bb50 100755 --- a/zenXml/zenxml/parser.h +++ b/zenXml/zenxml/parser.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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** diff --git a/zenXml/zenxml/xml.h b/zenXml/zenxml/xml.h index d3ce2814..e0035c2b 100755 --- a/zenXml/zenxml/xml.h +++ b/zenXml/zenxml/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-3.0 * +// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0 * // * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved * // ***************************************************************************** |
