diff options
69 files changed, 3113 insertions, 2949 deletions
diff --git a/FreeFileSync/Build/Changelog.txt b/FreeFileSync/Build/Changelog.txt index bfb1b000..a2b21734 100644 --- a/FreeFileSync/Build/Changelog.txt +++ b/FreeFileSync/Build/Changelog.txt @@ -1,8 +1,20 @@ +FreeFileSync 6.9 +---------------- +Use FreeFileSync taskbar icon when available (Windows 7) +Limit number of retries when creating temporary files +Fixed bitmap rendering issue for high-contrast color schemes +Revised and fixed unclear GUI texts +Updated deprecated system call when suspending idle (OS X) +Fixed retry when failing to determine recycle bin status +Added progress graph legend +Updated translation files + + FreeFileSync 6.8 [2014-08-01] ----------------------------- New comparison option to ignore file time shift in hours Tentatively disabled DST hack affecting FAT file creation times -New menu option to reset gui layout +New menu option to reset GUI layout File sizes ignore sync direction in overview panel Sort by file name also sorts folder names Main grid column "full path" includes file name @@ -64,7 +76,7 @@ Redesigned configuration dialog layouts Fixed startup error after moving installation directory Fixed retry on failure to resolve path by volume name Resolved ERROR_ALREADY_EXISTS when creating temporary recycle bin subdirectory -Added "save as gui job" button on main dialog +Added "save as GUI job" button on main dialog Added Bulgarian language @@ -136,7 +148,7 @@ Copy high-precision modification times for files and symlinks Align top panel height with comparison and sync buttons Show lock owner while waiting on a locked directory Resolved help file W3C validation issues -Fixed high contrast accessibility issues in help +Fixed high-contrast accessibility issues in help Fixed crash for CPUs without SSE2 when using VSS (Windows XP) Prevent progress statistics timer overflow Save RealtimeSync settings before forced exit due to shutdown or log off @@ -162,7 +174,7 @@ Updated and revised help file Early parameter validation for filter and sync config dialogs Fixed followed directory symlinks being incorrectly excluded Automatically calculate best initial message box size -Progress graph and status icons support high contrast color schemes +Progress graph and status icons support high-contrast color schemes Include directory child-elements when manually setting filter Allow manual filter for short name on overview panel Don't treat file drops on directory input fields as URI (Linux) @@ -527,7 +539,7 @@ Use the same time stamp for log file and versioning Handle folder drag and drop outside main grid Avoid name clash having multiple folder pairs delete into the same versioning folder Exit FreeFileSync automatically while upgrading to new version -Accessibility: Support high contrast color schemes +Accessibility: Support high-contrast color schemes Yet another UI design overhaul Fixed "access denied" issue on OS X-hosted network shares Support Citrix folder shares diff --git a/FreeFileSync/Build/Help/html/Daylight Saving Time.html b/FreeFileSync/Build/Help/html/Daylight Saving Time.html index 9709111c..b60c2052 100644 --- a/FreeFileSync/Build/Help/html/Daylight Saving Time.html +++ b/FreeFileSync/Build/Help/html/Daylight Saving Time.html @@ -34,14 +34,21 @@ that used to be the same show up as different after a DST switch or when the tim <BR> -<h3>Solution:</h3> - -<P>In FreeFileSync's comparison settings you can enter a full-hour time shift to ignore during comparison: -If you need to handle differences due to daylight saving time enter a one hour shift. If the differences are caused by changing the time zone -enter a larger shift as needed. -</P> - -<IMG SRC="../img/time_shift.png"><BR> +<h3>Solutions:</h3> + +<OL TYPE=1> + <LI> + <P>In FreeFileSync's comparison settings you can enter a full-hour time shift to ignore during comparison: + If you need to handle differences due to daylight saving time enter a one hour shift. If the differences are caused by changing the time zone + enter a larger shift as needed. + </P> + <IMG SRC="../img/time_shift.png"><BR> + <BR> + + <LI> + Alternatively you can avoid the problem in first place by only synchronizing from FAT to FAT or NTFS to NTFS file systems. + Since most local disks are formatted with NTFS and USB memory sticks with FAT, this situation could be handled by formatting the USB stick with NTFS as well. +</OL> </BODY> </HTML>
\ No newline at end of file diff --git a/FreeFileSync/Build/Help/html/Macros.html b/FreeFileSync/Build/Help/html/Macros.html index b9b803ab..3ea49486 100644 --- a/FreeFileSync/Build/Help/html/Macros.html +++ b/FreeFileSync/Build/Help/html/Macros.html @@ -112,7 +112,7 @@ handling time and date, the <B>operating system's environment variables</B> can <P> <B>Hint:</B> You can add a great amount of flexibility to a ffs_batch configuration file - by creating new temporary environment variables in a bat or cmd file that are evaluated by FreeFileSync at runtime. + by creating new temporary environment variables in a bat or cmd file that are evaluated by FreeFileSync at runtime: </P> <BR> diff --git a/FreeFileSync/Build/Help/html/Run as Service.html b/FreeFileSync/Build/Help/html/Run as Service.html index 022e6463..370d5ac3 100644 --- a/FreeFileSync/Build/Help/html/Run as Service.html +++ b/FreeFileSync/Build/Help/html/Run as Service.html @@ -37,15 +37,15 @@ <BR> <OL> - <LI><p>RealtimeSync should be monitoring only while a specific user is logged in: Create - a new shortcut, enter the command line from above as target and place it into the user's autostart folder. + <LI><p>RealtimeSync should be monitoring while a user is logged in:<br> + Create a new shortcut, enter the command line from above as target and place it into the user's autostart folder. </p> <IMG SRC="../img/create_shortcut.png"><br><br> <IMG SRC="../img/shortcut_properties.png"> <br> - <LI><p>RealtimeSync should be monitoring while Windows is running irrespective of - currently logged in users: Create a new task in your operating systems's task scheduler and have it execute the command line above + <LI><p>RealtimeSync should be monitoring while Windows is running irrespective of currently logged in users:<br> + Create a new task in your operating systems's task scheduler and have it execute the command line above when the system starts. See <A HREF="Schedule%20a%20batch%20job.html">Schedule a Batch Job</A> for an example how to add a task. Then change the user which runs the task to <B>SYSTEM</B> - a special user account always running in the background. </p> diff --git a/FreeFileSync/Build/Help/html/Schedule a Batch Job.html b/FreeFileSync/Build/Help/html/Schedule a Batch Job.html index a1263ef3..46c1221b 100644 --- a/FreeFileSync/Build/Help/html/Schedule a Batch Job.html +++ b/FreeFileSync/Build/Help/html/Schedule a Batch Job.html @@ -31,10 +31,10 @@ <BR CLEAR=LEFT> <BR> - <LI>If you don't want error or warning messages to pause synchronization, set <B>Handle errors</B> to either <B>Ignore</B> or <B>Stop</B>. + <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>Setup the FreeFileSync batch job in your operating system's scheduler: + <LI>Set up the FreeFileSync batch job in your operating system's scheduler: <BR> <OL TYPE=A> @@ -58,7 +58,7 @@ <div class="bluebox_inner"> <B>Note</B><BR> Beginning with Windows Vista the <i>Program/script</i> always needs to point to an executable file like FreeFileSync.exe even - if ffs_batch file associations are setup. If a ffs_batch file were entered instead the task would return with + if ffs_batch file associations are set up. If a ffs_batch file were entered instead the task would return with error code 0xC1, "%1 is not a valid Win32 application". </div> </div> diff --git a/FreeFileSync/Build/Languages/arabic.lng b/FreeFileSync/Build/Languages/arabic.lng index b1c4c781..ceb27cba 100644 --- a/FreeFileSync/Build/Languages/arabic.lng +++ b/FreeFileSync/Build/Languages/arabic.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>سيتم اعتبار المجلد الموافق كمجلد فارغ</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>للمجلدات التالية مسارات مستقلة عن بعضها. انتبه عند ضبط إعدادات المزامنة:</target> +<source>The following folder paths are dependent from each other:</source> +<target>مسارات المجلدات التالية معتمدة على بعضها:</target> <source>File %x has an invalid date.</source> <target>يحتوي الملف %x تاريخ غير صالح.</target> @@ -199,6 +199,28 @@ <source>Update attributes on right</source> <target>تحديث السمات على اليسار</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>0 byte</pluralform> +<pluralform>1 byte</pluralform> +<pluralform>2 bytes</pluralform> +<pluralform>%x bytes</pluralform> +<pluralform>%x bytes</pluralform> +<pluralform>%x bytes</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>ملف قاعدة البيانات %x غير متوافق.</target> @@ -263,28 +285,6 @@ <source>Total time:</source> <target>مجموع الوقت:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>0 byte</pluralform> -<pluralform>1 byte</pluralform> -<pluralform>2 bytes</pluralform> -<pluralform>%x bytes</pluralform> -<pluralform>%x bytes</pluralform> -<pluralform>%x bytes</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>حدث خطأ أثناء تحليل الملف %x، الصف %y، و العمود %z.</target> @@ -344,7 +344,7 @@ <target>طلب إحباط المهمة: في انتظار انتهاء المهمة الحالية...</target> <source>Unable to create time stamp for versioning:</source> -<target>تعذر إنشاء بصمة زمنية من أجل مفاضلة الزمنية:</target> +<target>تعذر إنشاء بصمة زمنية من أجل المفاضلة الزمنية:</target> <source>&Open...</source> <target>&فتح...</target> @@ -355,8 +355,8 @@ <source>&Quit</source> <target>إ&نهاء</target> -<source>&Program</source> -<target>ال&برنامج</target> +<source>&File</source> +<target>&ملف</target> <source>&View help</source> <target>إ&ظهار المساعدة</target> @@ -447,9 +447,6 @@ The command is triggered if: <source>&Show error</source> <target>إ&ظهار الخطأ</target> -<source>&Exit</source> -<target>&خروج</target> - <source>Incorrect command line:</source> <target>سطر أوامر خاطئ:</target> @@ -513,8 +510,8 @@ The command is triggered if: <source>Data verification error: %x and %y have different content.</source> <target>خطأ في التحقق من البيانات: يحتوي %x و %y بيانات مختلفة.</target> -<source>Cannot find %x.</source> -<target>تعذر العثور على %x.</target> +<source>Cannot find folder %x.</source> +<target>تعذر العثور على المجلد %x.</target> <source>Target folder %x already existing.</source> <target>المجلد الهدف %x موجود سابقاً.</target> @@ -543,8 +540,8 @@ The command is triggered if: <source>Available:</source> <target>متاح:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>سيتم تعديل مجلد الذي هو جزء من أزواج المجلدات المتعددة. الرجاء مراجعة إعدادات المزامنة.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>عدد من أزواج المجلدات يكتب إلى مجلد فرعي مشترك. رجاءً أعد النظر في خياراتك.</target> <source>Synchronizing folder pair:</source> <target>مزامنة زوج مجلدات:</target> @@ -649,8 +646,8 @@ The command is triggered if: <source>Name</source> <target>الاسم</target> -<source>Relative path</source> -<target>المسار النسبي</target> +<source>Relative folder</source> +<target>مجلد نسبي</target> <source>Base folder</source> <target>المجلد الأساسي (القاعدي)</target> @@ -691,8 +688,8 @@ The command is triggered if: <source>Remove local settings</source> <target>إزالة الإعدادات المحلية</target> -<source>Reset local filter</source> -<target>إعادة تعيين الفلتر المحلي</target> +<source>Clear local filter</source> +<target>إزالة الفلتر المحلي</target> <source>Copy</source> <target>نسخ</target> @@ -712,11 +709,11 @@ The command is triggered if: <source>Save as &batch job...</source> <target>&حفظ كمهمة دفعية...</target> -<source>1. &Compare</source> -<target>1-&مقارنة</target> +<source>Start &comparison</source> +<target>بدأ الم&قارنة</target> -<source>2. &Synchronize</source> -<target>2. &مزامنة</target> +<source>Start &synchronization</source> +<target>بدأ الم&زامنة</target> <source>&Options</source> <target>&خيارات</target> @@ -727,6 +724,9 @@ The command is triggered if: <source>&Find...</source> <target>&بحث...</target> +<source>&Reset layout</source> +<target>إعادة ال&تنسيق إلى الإفتراضي</target> + <source>&Export file list...</source> <target>&تصدير قائمة الملفات...</target> @@ -769,18 +769,15 @@ The command is triggered if: <source>Match case</source> <target>مطابقة حالة الأحرف (Match case)</target> +<source>New</source> +<target>جديد</target> + <source>Open...</source> <target>فتح...</target> <source>Save</source> <target>حفظ</target> -<source>Save as GUI job</source> -<target>الحفظ كمهمة GUI</target> - -<source>Save as batch job</source> -<target>حفظ كمهمة دفعية</target> - <source>Save as...</source> <target>حفظ كـ...</target> @@ -793,14 +790,14 @@ The command is triggered if: <source>Statistics:</source> <target>إحصائيات:</target> -<source>Number of files and folders that will be created</source> -<target>عدد الملفات و المجلدات التي سيتم إنشاؤها</target> +<source>Number of files and folders that will be deleted</source> +<target>عدد الملفات و المجلدات التي سيتم حذفها</target> <source>Number of files that will be overwritten</source> <target>عدد الملفات التي سيتم استبدالها</target> -<source>Number of files and folders that will be deleted</source> -<target>عدد الملفات و المجلدات التي سيتم حذفها</target> +<source>Number of files and folders that will be created</source> +<target>عدد الملفات و المجلدات التي سيتم إنشاؤها</target> <source>Total bytes to copy</source> <target>إجمالي عدد الـ bytes التي سيتم نسخها</target> @@ -817,6 +814,15 @@ The command is triggered if: <source>Identify equal files by comparing the file content.</source> <target>التعرف على الملفات المتساوية عن طريق مقارنة محتوى الملف</target> +<source>Ignore time shift (in hours)</source> +<target>إهمال الفارق الزمني (بالساعات)</target> + +<source>Consider file times with specified offset as equal</source> +<target>اعتبار الملفات ذات الفارق الزمني المحدد و كأنها متساوية</target> + +<source>Handle daylight saving time</source> +<target>تعامل مع التوقيت الصيفي</target> + <source>Symbolic links:</source> <target>ارتباطات رمزية:</target> @@ -847,8 +853,8 @@ The command is triggered if: <source>Maximum:</source> <target>الحد الأقصى:</target> -<source>&Reset</source> -<target>إ&عادة</target> +<source>C&lear</source> +<target>إ&زالة</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>اختيار قوانين فلترة لاستثناء ملفات معينة من المزامنة. أدخل مسارات الملفات منسوبة إلى زوج المجلدات المقابل.</target> @@ -873,20 +879,20 @@ The command is triggered if: <source>Delete files:</source> <target>حذف الملفات:</target> -<source>Permanent</source> -<target>الدائم</target> +<source>&Permanent</source> +<target>&دائم</target> <source>Delete or overwrite files permanently</source> <target>حذف أو الكتابة فوق الملفات بشكل دائم</target> -<source>Recycle bin</source> -<target>سلة المهملات</target> +<source>&Recycle bin</source> +<target>&سلة المهملات</target> <source>Back up deleted and overwritten files in the recycle bin</source> <target>نسخ احتياطي للملفات المحذوفة و المستبدلة في سلة المهملات</target> -<source>Versioning</source> -<target>الوسم برقم الإصدار</target> +<source>&Versioning</source> +<target>ال&وسم حسب الإصدار</target> <source>Move files to a user-defined folder</source> <target>نقل الملفات إلى المجلد المحدد من قبل المستخدم</target> @@ -897,14 +903,11 @@ The command is triggered if: <source>Handle errors:</source> <target>التعامل مع الأخطاء:</target> -<source>Ignore</source> -<target>تجاهل</target> - <source>Hide all error and warning messages</source> <target>إخفاء جميع رسائل الأخطاء و التحذير</target> -<source>Pop-up</source> -<target>إطار منبثق</target> +<source>&Pop-up</source> +<target>&منبثق</target> <source>Show pop-up on errors or warnings</source> <target>إظهار إطارات منبثقة عند حصول أخطاء أو تحذيرات</target> @@ -939,6 +942,9 @@ The command is triggered if: <source>Minimize to notification area</source> <target>تصغير إلى منطقة التنبيهات</target> +<source>Bytes copied:</source> +<target>Bytes المنسوخة:</target> + <source>Close</source> <target>إغلاق</target> @@ -951,6 +957,9 @@ 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>Stop synchronization at first error</source> <target>إحباط المزامنة عند أول خطأ</target> @@ -969,9 +978,6 @@ The command is triggered if: <source>How can I schedule a batch job?</source> <target>كيف يمكنني جدولة مهمة دفعية؟</target> -<source>&Recycle bin</source> -<target>&سلة المهملات</target> - <source>The following settings are used for all synchronization jobs.</source> <target>هذه الإعدادات مستخدمة لجميع مهمات المزامنة</target> @@ -1020,8 +1026,11 @@ This guarantees a consistent state even in case of a serious error. <source>Description</source> <target>الوصف</target> -<source>Restore hidden windows</source> -<target>استعادة نوافذ الحوار المخفية</target> +<source>Show hidden dialogs again</source> +<target>إظهار التنبهات و نوافذ الحوار المخفية</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>إعادة إظهار جميع التنبهات و نوافذ الحوار التي تم إخفاؤها</target> <source>&Default</source> <target>الا&فتراضي</target> @@ -1083,8 +1092,8 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>الشريط الرئيسي</target> -<source>Compare both sides</source> -<target>مقارنة بين كلا الجانبين</target> +<source>Start comparison</source> +<target>بدأ المقارنة</target> <source>Comparison settings</source> <target>إعدادات المقارنة</target> @@ -1195,9 +1204,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>حدد المجال الزمني...</target> -<source>Default view</source> -<target>طريقة العرض الافتراضية</target> - <source>Show "%x"</source> <target>إظهار "%x"</target> @@ -1228,8 +1234,8 @@ This guarantees a consistent state even in case of a serious error. <source>Synchronization Settings</source> <target>إعدادات المزامنة</target> -<source>Reset filter</source> -<target>إعادة تعيين الفلتر</target> +<source>Clear filter</source> +<target>إزالة الفلاتر الحالية</target> <source>Show files that exist on left side only</source> <target>إظهار الملفات الموجودة في الجانب الأيمن فقط</target> @@ -1395,8 +1401,11 @@ This guarantees a consistent state even in case of a serious error. <source>- Other side's counterpart to %item_folder%</source> <target>- االنظير للجانب الآخر لـ %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>استعادة جميع نوافذ الحوار و التحذيرات المخفية؟</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>إظهار التنبيهات و نوافذ الحوار المخفية مرة ثانية؟</target> + +<source>&Show</source> +<target>&إظهار</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>تحديد التغيرات و مواكبتها على الجانبين. عمليات الحذف, النقل و المشاكل المكتشفة باستخدام قواعد البيانات</target> diff --git a/FreeFileSync/Build/Languages/bulgarian.lng b/FreeFileSync/Build/Languages/bulgarian.lng index d1eebb1c..3d61b75a 100644 --- a/FreeFileSync/Build/Languages/bulgarian.lng +++ b/FreeFileSync/Build/Languages/bulgarian.lng @@ -50,7 +50,7 @@ <target>Получи се изключение</target> <source>A directory path is expected after %x.</source> -<target>Очакван път до директорията след %x.</target> +<target>Очаква се път до директорията след %x.</target> <source>Syntax error</source> <target>Синтактична грешка</target> @@ -89,10 +89,10 @@ <target>Път до алтернативен файл GlobalSettings.xml.</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 конфигурационни файлове на FFS.</target> <source>Any number of alternative directory pairs for at most one config file.</source> -<target>Всеки брой алтернативни двойки директории за най-много един конфигурационен файл.</target> +<target>Произволен брой алтернативни двойки директории за най-много един конфигурационен файл.</target> <source>Cannot find the following folders:</source> <target>Не са намерени следните папки:</target> @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Съответната папка ще се счита празна.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Следните папки имат зависими пътища. Внимавайте при задаване на правилата за синхронизация:</target> +<source>The following folder paths are dependent from each other:</source> +<target>Пътищата до следните папки са взаимнозависими:</target> <source>File %x has an invalid date.</source> <target>Файл %x има невалидна дата.</target> @@ -199,6 +199,24 @@ <source>Update attributes on right</source> <target>Актуализирай атрибутите на десния елемент</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>1 байт</pluralform> +<pluralform>%x байта</pluralform> +</target> + +<source>%x MB</source> +<target>%x МБ</target> + +<source>%x KB</source> +<target>%x КБ</target> + +<source>%x GB</source> +<target>%x ГБ</target> + <source>Database file %x is incompatible.</source> <target>Файлът на базата данни %x е несъвместим.</target> @@ -259,24 +277,6 @@ <source>Total time:</source> <target>Общо време:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>1 байт</pluralform> -<pluralform>%x байта</pluralform> -</target> - -<source>%x MB</source> -<target>%x МБ</target> - -<source>%x KB</source> -<target>%x КБ</target> - -<source>%x GB</source> -<target>%x ГБ</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Грешка при анализ на файл %x, ред %y, колона %z.</target> @@ -317,7 +317,7 @@ <target>Не може да получи достъп до услуга Volume Shadow Copy.</target> <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source> -<target>Моля, използвайте FreeFileSync 64-бит. за създаване фонови копия на тази система.</target> +<target>Моля, ползвайте 64-бит. версия на FFS за създаване фонови копия на тази система.</target> <source>Cannot load file %x.</source> <target>Файл %x не може да се зареди.</target> @@ -343,8 +343,8 @@ <source>&Quit</source> <target>Кра&й</target> -<source>&Program</source> -<target>&Програма</target> +<source>&File</source> +<target>&Файл</target> <source>&View help</source> <target>Помо&щ</target> @@ -368,7 +368,7 @@ <target>3. Натиснете 'Старт'.</target> <source>To get started just import a .ffs_batch file.</source> -<target>За стартиране просто импортирайте .ffs_batch файл.</target> +<target>За стартиране просто импортирайте файл .ffs_batch.</target> <source>Folders to watch:</source> <target>Папки за следене:</target> @@ -435,9 +435,6 @@ The command is triggered if: <source>&Show error</source> <target>Покажи гре&шката</target> -<source>&Exit</source> -<target>Из&ход</target> - <source>Incorrect command line:</source> <target>Невалиден команден ред:</target> @@ -466,43 +463,43 @@ The command is triggered if: <target>Разни...</target> <source>Moving file %x to %y</source> -<target>Преместване на файл %x към %y</target> +<target>Премества файл %x към %y</target> <source>Moving folder %x to %y</source> -<target>Преместване на папка %x към %y</target> +<target>Премества папка %x към %y</target> <source>Moving symbolic link %x to %y</source> -<target>Преместване на символна връзка %x към %y</target> +<target>Премества символна връзка %x към %y</target> <source>Removing old versions...</source> -<target>Премахване на стари версии...</target> +<target>Премахва стари версии...</target> <source>Creating symbolic link %x</source> -<target>Създаване на символна връзка %x</target> +<target>Създава символна връзка %x</target> <source>Creating folder %x</source> -<target>Създаване на папка %x</target> +<target>Създава папка %x</target> <source>Overwriting file %x</source> -<target>Презапис на файл %x</target> +<target>Презаписва файл %x</target> <source>Overwriting symbolic link %x</source> -<target>Презапис на символна връзка %x</target> +<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>Creating a Volume Shadow Copy for %x...</source> -<target>Създаване на Volume Shadow Copy за %x...</target> +<target>Създава Volume Shadow Copy за %x...</target> <source>Data verification error: %x and %y have different content.</source> <target>Грешка при верификация: %x и %y имат различно съдържание.</target> -<source>Cannot find %x.</source> -<target>%x не може да се намери.</target> +<source>Cannot find folder %x.</source> +<target>Не е открита папка %x.</target> <source>Target folder %x already existing.</source> <target>Целевата папка %x вече съществува.</target> @@ -531,8 +528,8 @@ The command is triggered if: <source>Available:</source> <target>Налично:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Ще бъде променена папка, част от повече двойки папки. Моля, проверете настройките за синхронизация.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Много двойки папки записват в обща подпапка. Моля, проверете конфигурацията.</target> <source>Synchronizing folder pair:</source> <target>Синхронизация на двойка папки:</target> @@ -553,7 +550,7 @@ The command is triggered if: <target>Синхронизацията завърши с предупреждения</target> <source>Nothing to synchronize</source> -<target>Няма нищо за синхронизация</target> +<target>Няма нищо за синхронизиране</target> <source>Synchronization completed successfully</source> <target>Синхронизацията завърши успешно</target> @@ -633,8 +630,8 @@ The command is triggered if: <source>Name</source> <target>Име</target> -<source>Relative path</source> -<target>Относителен път</target> +<source>Relative folder</source> +<target>Относителна папка</target> <source>Base folder</source> <target>Основна папка</target> @@ -675,8 +672,8 @@ The command is triggered if: <source>Remove local settings</source> <target>Премахни локалните настройки</target> -<source>Reset local filter</source> -<target>Инициализирай локалния филтър</target> +<source>Clear local filter</source> +<target>Изчисти локалния филтър</target> <source>Copy</source> <target>Копирай</target> @@ -696,11 +693,11 @@ The command is triggered if: <source>Save as &batch job...</source> <target>Запази &като пакетна задача</target> -<source>1. &Compare</source> -<target>1. С&равни</target> +<source>Start &comparison</source> +<target>Почни &сравняване</target> -<source>2. &Synchronize</source> -<target>2. &Синхронизирай</target> +<source>Start &synchronization</source> +<target>Почни &синхронизация</target> <source>&Options</source> <target>&Опции</target> @@ -711,21 +708,24 @@ The command is triggered if: <source>&Find...</source> <target>&Намери...</target> +<source>&Reset layout</source> +<target>&Инициализирай изгледа</target> + <source>&Export file list...</source> <target>Експорт на &файловия списък...</target> <source>&Tools</source> <target>Инстр&ументи</target> +<source>&Check for new version</source> +<target>&Провери за нова версия</target> + <source>&Check now</source> <target>&Провери сега</target> <source>Check &automatically once a week</source> <target>Проверявай &автоматично ежеседмично</target> -<source>&Check for new version</source> -<target>&Провери за нова версия</target> - <source>Cancel</source> <target>Отказ</target> @@ -753,23 +753,20 @@ The command is triggered if: <source>Match case</source> <target>Спазвай регистъра</target> +<source>New</source> +<target>Нов</target> + <source>Open...</source> <target>Отвори...</target> <source>Save</source> <target>Запази</target> -<source>Save as GUI job</source> -<target>Запази като GUI-задача</target> - -<source>Save as batch job</source> -<target>Запази като пакетна задача</target> - <source>Save as...</source> <target>Запази като...</target> <source>View type:</source> -<target>Тип на изгледа:</target> +<target>Тип изглед:</target> <source>Select view:</source> <target>Изберете изглед:</target> @@ -777,14 +774,14 @@ The command is triggered if: <source>Statistics:</source> <target>Статистика:</target> -<source>Number of files and folders that will be created</source> -<target>Брой файлове и папки, които ще бъдат създадени</target> +<source>Number of files and folders that will be deleted</source> +<target>Брой файлове и папки, които ще бъдат изтрити</target> <source>Number of files that will be overwritten</source> <target>Брой файлове, които ще бъдат презаписани</target> -<source>Number of files and folders that will be deleted</source> -<target>Брой файлове и папки, които ще бъдат изтрити</target> +<source>Number of files and folders that will be created</source> +<target>Брой файлове и папки, които ще бъдат създадени</target> <source>Total bytes to copy</source> <target>Общо байтове за копиране</target> @@ -801,6 +798,15 @@ The command is triggered if: <source>Identify equal files by comparing the file content.</source> <target>Определи еднаквите файлове, сравнявайки файловото съдържание.</target> +<source>Ignore time shift (in hours)</source> +<target>Игнорирай отместването на времето (в часове)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Считай файловите времена със зададено отместване за еднакви</target> + +<source>Handle daylight saving time</source> +<target>Отчитай лятното време</target> + <source>Symbolic links:</source> <target>Символни връзки:</target> @@ -831,8 +837,8 @@ The command is triggered if: <source>Maximum:</source> <target>Максимум:</target> -<source>&Reset</source> -<target>&Инициализирай настройките</target> +<source>C&lear</source> +<target>И&зчисти</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Изберете филтърни правила за изключване на някои файлове от синхронизация. Въведете файлови пътища относно съответните им двойки папки.</target> @@ -855,22 +861,22 @@ The command is triggered if: <target>Открий посоката на синхронизация чрез файловете на базата данни</target> <source>Delete files:</source> -<target>Изтрий файлове:</target> +<target>Изтриване на файлове:</target> -<source>Permanent</source> -<target>Необратимо</target> +<source>&Permanent</source> +<target>&Необратимо</target> <source>Delete or overwrite files permanently</source> <target>Изтрий или презапиши файловете необратимо</target> -<source>Recycle bin</source> -<target>Кошче</target> +<source>&Recycle bin</source> +<target>&Кошче</target> <source>Back up deleted and overwritten files in the recycle bin</source> <target>Резервирай изтритите или презаписани файлове в кошчето</target> -<source>Versioning</source> -<target>Версифициране</target> +<source>&Versioning</source> +<target>&Версифициране</target> <source>Move files to a user-defined folder</source> <target>Премести файловете в зададена потребителска папка</target> @@ -881,14 +887,11 @@ The command is triggered if: <source>Handle errors:</source> <target>Обработка на грешки:</target> -<source>Ignore</source> -<target>Игнорирай</target> - <source>Hide all error and warning messages</source> <target>Скрий всички грешки и предупреждения</target> -<source>Pop-up</source> -<target>Изскачащ прозорец</target> +<source>&Pop-up</source> +<target>&Запитай</target> <source>Show pop-up on errors or warnings</source> <target>Питай при грешки или предупреждения</target> @@ -911,9 +914,6 @@ The command is triggered if: <source>Items found:</source> <target>Намерени елементи:</target> -<source>Speed:</source> -<target>Скорост:</target> - <source>Time remaining:</source> <target>Оставащо време:</target> @@ -926,6 +926,9 @@ The command is triggered if: <source>Minimize to notification area</source> <target>Минимизирай в известяващото поле</target> +<source>Bytes copied:</source> +<target>Копирани байтове:</target> + <source>Close</source> <target>Затвори</target> @@ -938,6 +941,9 @@ 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>Stop synchronization at first error</source> <target>Спри синхронизацията при първа грешка</target> @@ -956,9 +962,6 @@ The command is triggered if: <source>How can I schedule a batch job?</source> <target>Как се планира пакетна задача?</target> -<source>&Recycle bin</source> -<target>&Кошче</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Следните настройки се ползват от всички задачи за синхронизация:</target> @@ -1007,8 +1010,11 @@ This guarantees a consistent state even in case of a serious error. <source>Description</source> <target>Описание</target> -<source>Restore hidden windows</source> -<target>Възстанови скритите прозорци</target> +<source>Show hidden dialogs again</source> +<target>Покажи отново скритите диалози</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Покажи отново всички постоянно скрити диалози и предупреждения</target> <source>&Default</source> <target>&По подразбиране</target> @@ -1070,8 +1076,8 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>Главен панел</target> -<source>Compare both sides</source> -<target>Сравни двете страни</target> +<source>Start comparison</source> +<target>Почни сравняване</target> <source>Comparison settings</source> <target>Настройки на сравняването</target> @@ -1166,9 +1172,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>Избори интервала време...</target> -<source>Default view</source> -<target>Изглед по подразбиране</target> - <source>Show "%x"</source> <target>Покажи "%x"</target> @@ -1199,8 +1202,8 @@ This guarantees a consistent state even in case of a serious error. <source>Synchronization Settings</source> <target>Настройки на синхронизацията</target> -<source>Reset filter</source> -<target>Инициализирай филтъра</target> +<source>Clear filter</source> +<target>Изчисти филтъра</target> <source>Show files that exist on left side only</source> <target>Покажи файловете, съществуващи само отляво</target> @@ -1358,8 +1361,11 @@ This guarantees a consistent state even in case of a serious error. <source>- Other side's counterpart to %item_folder%</source> <target>- съответствие от другата страна на %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Да се възстановят ли всички скрити прозорци и предупреждения?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Да покажа ли пак скритите диалози и предупреждения?</target> + +<source>&Show</source> +<target>&Покажи</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Определи и разпространи промените върху двете страни. Изтривания, премествания и конфликти се откриват автоматично чрез база данни.</target> @@ -1371,7 +1377,7 @@ This guarantees a consistent state even in case of a serious error. <target>Копирай новите и актуализирани файлове към дясната папка.</target> <source>Configure your own synchronization rules.</source> -<target>Дефиниране на свои правила за синхронизация.</target> +<target>Дефинирай свои правила за синхронизация.</target> <source>Exclude</source> <target>Изключи</target> diff --git a/FreeFileSync/Build/Languages/chinese_simple.lng b/FreeFileSync/Build/Languages/chinese_simple.lng index 44022f27..d8f33b6d 100644 --- a/FreeFileSync/Build/Languages/chinese_simple.lng +++ b/FreeFileSync/Build/Languages/chinese_simple.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>相应的文件夹将被视为空.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>如下的文件夹有路径依赖性. 请在设置同步规则时特别小心:</target> +<source>The following folder paths are dependent from each other:</source> +<target>如下的文件夹路径互相依赖:</target> <source>File %x has an invalid date.</source> <target>文件 %x 的日期非法.</target> @@ -199,6 +199,23 @@ <source>Update attributes on right</source> <target>更新右侧的文件属性</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>%x 字节</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>数据库文件 %x 不兼容.</target> @@ -258,23 +275,6 @@ <source>Total time:</source> <target>总共时间:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>%x 字节</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>当分析文件 %x , 行 %y, 列 %z 时出错.</target> @@ -340,8 +340,8 @@ <source>&Quit</source> <target>退出(&Q)</target> -<source>&Program</source> -<target>程序(&P)</target> +<source>&File</source> +<target>文件(&F)</target> <source>&View help</source> <target>查看帮助(&V)</target> @@ -432,9 +432,6 @@ The command is triggered if: <source>&Show error</source> <target>显示错误(&S)</target> -<source>&Exit</source> -<target>退出(&E)</target> - <source>Incorrect command line:</source> <target>不正确的命令行:</target> @@ -493,13 +490,13 @@ The command is triggered if: <target>更新 %x 的属性</target> <source>Creating a Volume Shadow Copy for %x...</source> -<target>为 %x 创建一个卷影副本...</target> +<target>正在为 %x 创建一个卷影副本...</target> <source>Data verification error: %x and %y have different content.</source> <target>数据校验错误: %x 和 %y 有不同的内容.</target> -<source>Cannot find %x.</source> -<target>无法找到 %x.</target> +<source>Cannot find folder %x.</source> +<target>无法找到文件夹 %x.</target> <source>Target folder %x already existing.</source> <target>目标文件夹 %x 已经存在.</target> @@ -528,8 +525,8 @@ The command is triggered if: <source>Available:</source> <target>可用:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>一个将被修改的文件夹是多个文件夹对的一部分. 请重新检视同步设置.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>多个文件夹对写入到一个公共的子文件夹. 请重新检查你的设置.</target> <source>Synchronizing folder pair:</source> <target>正在同步成对的文件夹:</target> @@ -629,8 +626,8 @@ The command is triggered if: <source>Name</source> <target>文件名</target> -<source>Relative path</source> -<target>相对路径</target> +<source>Relative folder</source> +<target>相对文件夹</target> <source>Base folder</source> <target>主文件夹</target> @@ -671,8 +668,8 @@ The command is triggered if: <source>Remove local settings</source> <target>移除本地设置</target> -<source>Reset local filter</source> -<target>重置本地过滤器</target> +<source>Clear local filter</source> +<target>清除本地过滤器</target> <source>Copy</source> <target>复制</target> @@ -690,13 +687,13 @@ The command is triggered if: <target>保存(&S)</target> <source>Save as &batch job...</source> -<target>另存为批处理作业(&b)</target> +<target>另存为批处理作业(&B)</target> -<source>1. &Compare</source> -<target>1. 比较(&C)</target> +<source>Start &comparison</source> +<target>开始比较(&C)</target> -<source>2. &Synchronize</source> -<target>2. 同步(&S)</target> +<source>Start &synchronization</source> +<target>开始同步(&S)</target> <source>&Options</source> <target>选项(&O)</target> @@ -707,21 +704,24 @@ 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>&Tools</source> <target>工具(&T)</target> +<source>&Check for new version</source> +<target>检查新版本(&C)</target> + <source>&Check now</source> <target>现在检查(&C)</target> <source>Check &automatically once a week</source> <target>每周自动检查一次(&A)</target> -<source>&Check for new version</source> -<target>检查新版本(&C)</target> - <source>Cancel</source> <target>取消</target> @@ -749,18 +749,15 @@ The command is triggered if: <source>Match case</source> <target>匹配大小写</target> +<source>New</source> +<target>新建</target> + <source>Open...</source> <target>打开...</target> <source>Save</source> <target>保存</target> -<source>Save as GUI job</source> -<target>保存为GUI作业</target> - -<source>Save as batch job</source> -<target>另存为批处理作业</target> - <source>Save as...</source> <target>另存为...</target> @@ -773,14 +770,14 @@ The command is triggered if: <source>Statistics:</source> <target>统计:</target> -<source>Number of files and folders that will be created</source> -<target>将被创建的文件和文件夹数</target> +<source>Number of files and folders that will be deleted</source> +<target>将被删除的文件和文件夹数</target> <source>Number of files that will be overwritten</source> <target>将被覆盖的文件数</target> -<source>Number of files and folders that will be deleted</source> -<target>将被删除的文件和文件夹数</target> +<source>Number of files and folders that will be created</source> +<target>将被创建的文件和文件夹数</target> <source>Total bytes to copy</source> <target>要复制的总字节数</target> @@ -797,6 +794,15 @@ The command is triggered if: <source>Identify equal files by comparing the file content.</source> <target>以比较文件内容来识别相同的文件.</target> +<source>Ignore time shift (in hours)</source> +<target>忽略时间偏移(以小时计)</target> + +<source>Consider file times with specified offset as equal</source> +<target>将文件时间有指定的偏移时视为相等</target> + +<source>Handle daylight saving time</source> +<target>处理夏令时</target> + <source>Symbolic links:</source> <target>符号连接:</target> @@ -827,8 +833,8 @@ The command is triggered if: <source>Maximum:</source> <target>最大:</target> -<source>&Reset</source> -<target>重置(&R)</target> +<source>C&lear</source> +<target>清除(&L)</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>选择过滤器规则以将某些文件从同步中排除. 输入与相关的文件夹对相对的与文件路径.</target> @@ -853,20 +859,20 @@ The command is triggered if: <source>Delete files:</source> <target>删除文件:</target> -<source>Permanent</source> -<target>永久</target> +<source>&Permanent</source> +<target>永久(&P)</target> <source>Delete or overwrite files permanently</source> <target>永久性删除或覆盖文件</target> -<source>Recycle bin</source> -<target>回收站</target> +<source>&Recycle bin</source> +<target>回收站(&R)</target> <source>Back up deleted and overwritten files in the recycle bin</source> <target>备份被删除和被覆盖的文件到回收站</target> -<source>Versioning</source> -<target>保留历史版本</target> +<source>&Versioning</source> +<target>历史版本(&V)</target> <source>Move files to a user-defined folder</source> <target>移动文件到一个用户定义的文件夹</target> @@ -877,14 +883,11 @@ The command is triggered if: <source>Handle errors:</source> <target>处理错误:</target> -<source>Ignore</source> -<target>忽略</target> - <source>Hide all error and warning messages</source> <target>隐藏所有错误与警告信息</target> -<source>Pop-up</source> -<target>弹出框</target> +<source>&Pop-up</source> +<target>弹出对话框(&P)</target> <source>Show pop-up on errors or warnings</source> <target>在错误或警告时显示弹出对话框</target> @@ -907,9 +910,6 @@ The command is triggered if: <source>Items found:</source> <target>已找到的项目:</target> -<source>Speed:</source> -<target>速度:</target> - <source>Time remaining:</source> <target>剩余时间:</target> @@ -922,6 +922,9 @@ The command is triggered if: <source>Minimize to notification area</source> <target>最小化到托盘</target> +<source>Bytes copied:</source> +<target>字节被复制:</target> + <source>Close</source> <target>关闭</target> @@ -934,6 +937,9 @@ 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>Stop synchronization at first error</source> <target>在遇到第一个错误时停止同步</target> @@ -952,9 +958,6 @@ The command is triggered if: <source>How can I schedule a batch job?</source> <target>我如何计划一个批处理作业?</target> -<source>&Recycle bin</source> -<target>回收站(&R)</target> - <source>The following settings are used for all synchronization jobs.</source> <target>如下的设置使用于所有同步作业.</target> @@ -1000,8 +1003,11 @@ This guarantees a consistent state even in case of a serious error. <source>Description</source> <target>描述</target> -<source>Restore hidden windows</source> -<target>恢复隐藏窗口</target> +<source>Show hidden dialogs again</source> +<target>重新显示被隐藏的对话框</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>重新显示所有被永久性隐藏的对话框和警告信息</target> <source>&Default</source> <target>默认(&D)</target> @@ -1063,8 +1069,8 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>主工具栏</target> -<source>Compare both sides</source> -<target>比较两侧</target> +<source>Start comparison</source> +<target>开始比较</target> <source>Comparison settings</source> <target>比较设置</target> @@ -1155,9 +1161,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>选择时间跨度...</target> -<source>Default view</source> -<target>默认视图</target> - <source>Show "%x"</source> <target>显示 "%x"</target> @@ -1188,8 +1191,8 @@ This guarantees a consistent state even in case of a serious error. <source>Synchronization Settings</source> <target>同步设置</target> -<source>Reset filter</source> -<target>重置过滤器</target> +<source>Clear filter</source> +<target>清除过滤器</target> <source>Show files that exist on left side only</source> <target>显示仅存在左侧的文件</target> @@ -1345,8 +1348,11 @@ This guarantees a consistent state even in case of a serious error. <source>- Other side's counterpart to %item_folder%</source> <target>- 另一边的对应项到 %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>要恢复所有隐藏的窗口和警告吗?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>是否要重新显示被隐藏的对话框和警告信息?</target> + +<source>&Show</source> +<target>显示(&S)</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>识别和传播两侧的变化. 删除, 移动和冲突会使用一个数据库来自动检测.</target> diff --git a/FreeFileSync/Build/Languages/chinese_traditional.lng b/FreeFileSync/Build/Languages/chinese_traditional.lng index 4fe0045c..6f82db92 100644 --- a/FreeFileSync/Build/Languages/chinese_traditional.lng +++ b/FreeFileSync/Build/Languages/chinese_traditional.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>對應的資料夾將視為空的。</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>下列資料夾有相依路徑。請小心設定同步規則：</target> +<source>The following folder paths are dependent from each other:</source> +<target>以下資料夾路徑是相互依賴：</target> <source>File %x has an invalid date.</source> <target>檔案 %x 的日期無效。</target> @@ -199,6 +199,23 @@ <source>Update attributes on right</source> <target>更新右邊的屬性</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>%x 個位元組</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>資料庫檔案 %x 是不相容的。</target> @@ -258,23 +275,6 @@ <source>Total time:</source> <target>全部時間：</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>%x 個位元組</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>解析 %x 檔案，第 %y 列，第 %z 行出現錯誤。</target> @@ -340,8 +340,8 @@ <source>&Quit</source> <target>離開(&Q)</target> -<source>&Program</source> -<target>程式(&P)</target> +<source>&File</source> +<target>檔案(&F)</target> <source>&View help</source> <target>檢視說明(&V)</target> @@ -432,9 +432,6 @@ The command is triggered if: <source>&Show error</source> <target>顯示錯誤(&S)</target> -<source>&Exit</source> -<target>結束(&E)</target> - <source>Incorrect command line:</source> <target>不正確的命令列：</target> @@ -498,8 +495,8 @@ The command is triggered if: <source>Data verification error: %x and %y have different content.</source> <target>資料驗證錯誤：%x 和 %y 內容不同！</target> -<source>Cannot find %x.</source> -<target>找不到 %x。</target> +<source>Cannot find folder %x.</source> +<target>找不到資料夾 %x。</target> <source>Target folder %x already existing.</source> <target>目標資料夾 %x 已存在。</target> @@ -528,8 +525,8 @@ The command is triggered if: <source>Available:</source> <target>可用：</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>一個將被修改的資料夾，是多個配對資料夾的一部分。請檢查同步設定。</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>多個配對資料夾寫入一個共同的子資料夾。請檢查您的配置。</target> <source>Synchronizing folder pair:</source> <target>同步配對資料夾：</target> @@ -629,8 +626,8 @@ The command is triggered if: <source>Name</source> <target>名稱</target> -<source>Relative path</source> -<target>相對路徑</target> +<source>Relative folder</source> +<target>對應資料夾</target> <source>Base folder</source> <target>底層資料夾</target> @@ -671,8 +668,8 @@ The command is triggered if: <source>Remove local settings</source> <target>移除本機設定</target> -<source>Reset local filter</source> -<target>重置本機篩選器</target> +<source>Clear local filter</source> +<target>清除本機篩選器</target> <source>Copy</source> <target>複製</target> @@ -692,11 +689,11 @@ The command is triggered if: <source>Save as &batch job...</source> <target>另存為批次處理作業(&b)</target> -<source>1. &Compare</source> -<target>1. 比對(&C)</target> +<source>Start &comparison</source> +<target>開始比對(&c)</target> -<source>2. &Synchronize</source> -<target>2. 同步(&S)</target> +<source>Start &synchronization</source> +<target>開始同步(&s)</target> <source>&Options</source> <target>選項(&O)</target> @@ -707,21 +704,24 @@ 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>&Tools</source> <target>工具(&T)</target> +<source>&Check for new version</source> +<target>檢查新版本(&C)</target> + <source>&Check now</source> <target>現在檢查(&C)</target> <source>Check &automatically once a week</source> <target>一週自動檢查一次(&a)</target> -<source>&Check for new version</source> -<target>檢查新版本(&C)</target> - <source>Cancel</source> <target>取消</target> @@ -749,18 +749,15 @@ The command is triggered if: <source>Match case</source> <target>區分大小寫</target> +<source>New</source> +<target>新增</target> + <source>Open...</source> <target>開啟...</target> <source>Save</source> <target>儲存</target> -<source>Save as GUI job</source> -<target>另存為GUI作業</target> - -<source>Save as batch job</source> -<target>另存為批次處理作業</target> - <source>Save as...</source> <target>另存新檔...</target> @@ -773,14 +770,14 @@ The command is triggered if: <source>Statistics:</source> <target>統計資料：</target> -<source>Number of files and folders that will be created</source> -<target>將被新建的檔案和資料夾數量</target> +<source>Number of files and folders that will be deleted</source> +<target>將被刪除的檔案和資料夾數量</target> <source>Number of files that will be overwritten</source> <target>一些檔案和目錄會被覆蓋</target> -<source>Number of files and folders that will be deleted</source> -<target>將被刪除的檔案和資料夾數量</target> +<source>Number of files and folders that will be created</source> +<target>將被新建的檔案和資料夾數量</target> <source>Total bytes to copy</source> <target>要複製的位元組總數</target> @@ -797,6 +794,15 @@ The command is triggered if: <source>Identify equal files by comparing the file content.</source> <target>由比對檔案內容來判斷相同檔案。</target> +<source>Ignore time shift (in hours)</source> +<target>忽略時間的轉變(以小時為單位)</target> + +<source>Consider file times with specified offset as equal</source> +<target>考慮檔案時間和相等的指定偏移量</target> + +<source>Handle daylight saving time</source> +<target>日光節約時間處理</target> + <source>Symbolic links:</source> <target>符號連結：</target> @@ -827,8 +833,8 @@ The command is triggered if: <source>Maximum:</source> <target>最大：</target> -<source>&Reset</source> -<target>重置(&R)</target> +<source>C&lear</source> +<target>清除(&C)</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>選擇從同步中排除某些檔案的篩選器規則。輸入相對於其對應的配對資料夾路徑。</target> @@ -853,20 +859,20 @@ The command is triggered if: <source>Delete files:</source> <target>刪除檔案：</target> -<source>Permanent</source> -<target>常駐</target> +<source>&Permanent</source> +<target>常駐(&P)</target> <source>Delete or overwrite files permanently</source> <target>永久刪除或覆蓋檔案</target> -<source>Recycle bin</source> -<target>資源回收筒</target> +<source>&Recycle bin</source> +<target>資源回收筒(&R)</target> <source>Back up deleted and overwritten files in the recycle bin</source> <target>在資源回收筒中刪除備份和覆蓋檔案</target> -<source>Versioning</source> -<target>版本控制</target> +<source>&Versioning</source> +<target>版本控制(&V)</target> <source>Move files to a user-defined folder</source> <target>將檔案移動到一個使用者定義的資料夾</target> @@ -877,14 +883,11 @@ The command is triggered if: <source>Handle errors:</source> <target>錯誤處理：</target> -<source>Ignore</source> -<target>忽略</target> - <source>Hide all error and warning messages</source> <target>隱藏所有錯誤和警告訊息</target> -<source>Pop-up</source> -<target>彈出視窗</target> +<source>&Pop-up</source> +<target>彈出(&P)</target> <source>Show pop-up on errors or warnings</source> <target>在彈出視窗上顯示錯誤或警告訊息</target> @@ -907,9 +910,6 @@ The command is triggered if: <source>Items found:</source> <target>尋找項目：</target> -<source>Speed:</source> -<target>速度：</target> - <source>Time remaining:</source> <target>剩餘時間：</target> @@ -922,6 +922,9 @@ The command is triggered if: <source>Minimize to notification area</source> <target>最小化到通知區域</target> +<source>Bytes copied:</source> +<target>已複製的位元組:</target> + <source>Close</source> <target>關閉</target> @@ -934,6 +937,9 @@ 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>Stop synchronization at first error</source> <target>在第一個錯誤出現停止同步</target> @@ -952,9 +958,6 @@ The command is triggered if: <source>How can I schedule a batch job?</source> <target>如何安排批次處理作業？</target> -<source>&Recycle bin</source> -<target>資源回收筒(&R)</target> - <source>The following settings are used for all synchronization jobs.</source> <target>以下設定用於所有同步作業。</target> @@ -1003,8 +1006,11 @@ This guarantees a consistent state even in case of a serious error. <source>Description</source> <target>描述</target> -<source>Restore hidden windows</source> -<target>還原隱藏視窗</target> +<source>Show hidden dialogs again</source> +<target>再次顯示隱藏的對話框</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>再次顯示所有永久隱藏的對話框和警告訊息</target> <source>&Default</source> <target>預設(&D)</target> @@ -1013,7 +1019,7 @@ This guarantees a consistent state even in case of a serious error. <target>使用C++編寫的原始碼</target> <source>If you like FreeFileSync</source> -<target>如果你喜歡FreeFileSync</target> +<target>如果您喜歡FreeFileSync</target> <source>Donate with PayPal</source> <target>使用PayPal捐款</target> @@ -1066,8 +1072,8 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>主欄位</target> -<source>Compare both sides</source> -<target>比對兩邊</target> +<source>Start comparison</source> +<target>開始比對</target> <source>Comparison settings</source> <target>比對設定</target> @@ -1086,7 +1092,7 @@ This guarantees a consistent state even in case of a serious error. <pluralform>Do you really want to execute the command %y for %x items?</pluralform> </source> <target> -<pluralform>你真的要執行 %x 項目的命令 %y 嗎？</pluralform> +<pluralform>您真的要執行 %x 項目的命令 %y 嗎？</pluralform> </target> <source>&Execute</source> @@ -1158,9 +1164,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>選擇時間間隔...</target> -<source>Default view</source> -<target>預設檢視</target> - <source>Show "%x"</source> <target>顯示 "%x"</target> @@ -1191,8 +1194,8 @@ This guarantees a consistent state even in case of a serious error. <source>Synchronization Settings</source> <target>同步設定</target> -<source>Reset filter</source> -<target>重置篩選器</target> +<source>Clear filter</source> +<target>清除篩選器</target> <source>Show files that exist on left side only</source> <target>顯示只存在於左邊的檔案</target> @@ -1313,7 +1316,7 @@ 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> </target> <source>Move</source> @@ -1348,8 +1351,11 @@ This guarantees a consistent state even in case of a serious error. <source>- Other side's counterpart to %item_folder%</source> <target>- 另一邊對應到 %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>還原所有隱藏的視窗和警告？</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>再次顯示隱藏對話框和警告訊息？</target> + +<source>&Show</source> +<target>顯示(&S)</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>識別和傳播兩邊的變更。自動檢測刪除、移動和衝突使用的資料庫。</target> @@ -1361,7 +1367,7 @@ This guarantees a consistent state even in case of a serious error. <target>將新的和已更新的檔案複製到右邊資料夾。</target> <source>Configure your own synchronization rules.</source> -<target>配置你自己的同步規則。</target> +<target>配置您自己的同步規則。</target> <source>Exclude</source> <target>排除</target> diff --git a/FreeFileSync/Build/Languages/croatian.lng b/FreeFileSync/Build/Languages/croatian.lng index 3af4d0bf..f6f8a476 100644 --- a/FreeFileSync/Build/Languages/croatian.lng +++ b/FreeFileSync/Build/Languages/croatian.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Odgovarajuća mapa će se smatrati kao prazna.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Sljedeće mape imaju zavisnu putanju. Budite pažljivi prilikom postavljanja pravila za sinkronizaciju:</target> +<source>The following folder paths are dependent from each other:</source> +<target>Slijedeće putanje mapa su ovisne jedne o drugima:</target> <source>File %x has an invalid date.</source> <target>Datoteka %x ima nevažeći datum.</target> @@ -199,6 +199,25 @@ <source>Update attributes on right</source> <target>Osvježi atribute desno</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>%x bajt</pluralform> +<pluralform>%x bajta</pluralform> +<pluralform>%x bajtova</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>Datoteka baze %x je nekompatibilna.</target> @@ -260,25 +279,6 @@ <source>Total time:</source> <target>Ukupno vrijeme:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>%x bajt</pluralform> -<pluralform>%x bajta</pluralform> -<pluralform>%x bajtova</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Greška u analizi datoteke %x, red %y, stupac %z.</target> @@ -346,8 +346,8 @@ <source>&Quit</source> <target>&Izlaz</target> -<source>&Program</source> -<target>&Program</target> +<source>&File</source> +<target>&Datoteka</target> <source>&View help</source> <target>&Pogledaj pomoć</target> @@ -438,9 +438,6 @@ Naredba će biti pokrenuta ako se: <source>&Show error</source> <target>&Prikaži grešku</target> -<source>&Exit</source> -<target>&Izlaz</target> - <source>Incorrect command line:</source> <target>Netočna naredbena linija:</target> @@ -504,8 +501,8 @@ Naredba će biti pokrenuta ako se: <source>Data verification error: %x and %y have different content.</source> <target>Greška prilikom provjere podataka: %x i %y imaju različit sadržaj.</target> -<source>Cannot find %x.</source> -<target>Ne mogu pronaći %x.</target> +<source>Cannot find folder %x.</source> +<target>Ne mogu pronaći mapu %x.</target> <source>Target folder %x already existing.</source> <target>Odredišna mapa %x već postoji.</target> @@ -534,8 +531,8 @@ Naredba će biti pokrenuta ako se: <source>Available:</source> <target>Dostupno:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Mapa, koja je dio višestrukih parova mapa, biti će promjenjena. Molimo provjerite sinkronizacijske postavke.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Višestruki parovi mapa zapisuju u zajedničku podmapu. Molimo provjerite vaše postavke.</target> <source>Synchronizing folder pair:</source> <target>Par sinkroniziranja mapa:</target> @@ -637,8 +634,8 @@ Naredba će biti pokrenuta ako se: <source>Name</source> <target>Naziv</target> -<source>Relative path</source> -<target>Relativna putanja</target> +<source>Relative folder</source> +<target>Relativna mapa</target> <source>Base folder</source> <target>Izvorna mapa</target> @@ -679,8 +676,8 @@ Naredba će biti pokrenuta ako se: <source>Remove local settings</source> <target>Ukloni lokalne postavke</target> -<source>Reset local filter</source> -<target>Resetiranje lokalnog filtera</target> +<source>Clear local filter</source> +<target>Očisti lokalni filter</target> <source>Copy</source> <target>Kopiraj</target> @@ -700,11 +697,11 @@ Naredba će biti pokrenuta ako se: <source>Save as &batch job...</source> <target>Spremi kao &Slijedni zadatak...</target> -<source>1. &Compare</source> -<target>1. &Usporedi</target> +<source>Start &comparison</source> +<target>Započni &usporedbu</target> -<source>2. &Synchronize</source> -<target>2. &Sinkroniziraj</target> +<source>Start &synchronization</source> +<target>Započni &sinkronizaciju</target> <source>&Options</source> <target>&Opcije</target> @@ -715,21 +712,24 @@ 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>&Tools</source> <target>&Alati</target> +<source>&Check for new version</source> +<target>&Provjeri za novu verziju</target> + <source>&Check now</source> <target>&Provjeri sada</target> <source>Check &automatically once a week</source> <target>Provjeri &automatski jednom tjedno</target> -<source>&Check for new version</source> -<target>&Provjeri za novu verziju</target> - <source>Cancel</source> <target>Odustani</target> @@ -757,18 +757,15 @@ Naredba će biti pokrenuta ako se: <source>Match case</source> <target>Identičan naziv</target> +<source>New</source> +<target>Novo</target> + <source>Open...</source> <target>Otvori...</target> <source>Save</source> <target>Spremi</target> -<source>Save as GUI job</source> -<target>Spremi kao GUI zadatak</target> - -<source>Save as batch job</source> -<target>Spremi kao slijedni zadatak</target> - <source>Save as...</source> <target>Spremi kao...</target> @@ -781,14 +778,14 @@ Naredba će biti pokrenuta ako se: <source>Statistics:</source> <target>Statistika:</target> -<source>Number of files and folders that will be created</source> -<target>Broj datoteka i foldera koje će biti izrađene</target> +<source>Number of files and folders that will be deleted</source> +<target>Broj datoteka i mapa koje će biti obrisane</target> <source>Number of files that will be overwritten</source> <target>Broj datoteka koje će biti prepisane</target> -<source>Number of files and folders that will be deleted</source> -<target>Broj datoteka i mapa koje će biti obrisane</target> +<source>Number of files and folders that will be created</source> +<target>Broj datoteka i foldera koje će biti izrađene</target> <source>Total bytes to copy</source> <target>Ukupno bajta za kopirati</target> @@ -805,6 +802,15 @@ Naredba će biti pokrenuta ako se: <source>Identify equal files by comparing the file content.</source> <target>Ustanovi jednake datoteke uspoređujući sadržaj datoteke.</target> +<source>Ignore time shift (in hours)</source> +<target>Ignoriraj vremensku razliku (u satima)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Smatraj vrijeme datoteke u ovom razmaku istima</target> + +<source>Handle daylight saving time</source> +<target>Upravljaj ljetnim računanjem vremena</target> + <source>Symbolic links:</source> <target>Simbolične poveznice:</target> @@ -835,8 +841,8 @@ Naredba će biti pokrenuta ako se: <source>Maximum:</source> <target>Maksimum:</target> -<source>&Reset</source> -<target>&Resetiraj</target> +<source>C&lear</source> +<target>O&čisti</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Odaberite filter pravila da biste isključili određene datoteke iz sinkronizacije. Unesite relativnu putanju datoteka prema njihovim odgovarajućim parovima mapa.</target> @@ -861,20 +867,20 @@ Naredba će biti pokrenuta ako se: <source>Delete files:</source> <target>Izbriši datoteke:</target> -<source>Permanent</source> -<target>Trajno</target> +<source>&Permanent</source> +<target>&Trajno</target> <source>Delete or overwrite files permanently</source> <target>Trajno izbriši ili prepiši datoteke</target> -<source>Recycle bin</source> -<target>Koš za smeće</target> +<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>Versioning</source> -<target>Odabir</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> @@ -885,14 +891,11 @@ Naredba će biti pokrenuta ako se: <source>Handle errors:</source> <target>Obradi pogreške:</target> -<source>Ignore</source> -<target>Ignoriraj</target> - <source>Hide all error and warning messages</source> <target>Sakrij sve poruke za greške i upozorenja</target> -<source>Pop-up</source> -<target>Pop-up</target> +<source>&Pop-up</source> +<target>&Pop-up</target> <source>Show pop-up on errors or warnings</source> <target>Prikaži skočni prozor pri greškama i upozorenjima</target> @@ -915,9 +918,6 @@ Naredba će biti pokrenuta ako se: <source>Items found:</source> <target>Pronađene stavke:</target> -<source>Speed:</source> -<target>Brzina:</target> - <source>Time remaining:</source> <target>Preostalo vremena:</target> @@ -930,6 +930,9 @@ Naredba će biti pokrenuta ako se: <source>Minimize to notification area</source> <target>Minimiziraj u područje obavjesti</target> +<source>Bytes copied:</source> +<target>Bajta kopirano:</target> + <source>Close</source> <target>Zatvori</target> @@ -942,6 +945,9 @@ 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>Stop synchronization at first error</source> <target>Zaustavi sinkronizaciju pri prvoj pogrešci</target> @@ -960,9 +966,6 @@ Naredba će biti pokrenuta ako se: <source>How can I schedule a batch job?</source> <target>Kako zakazati slijedni zadatak?</target> -<source>&Recycle bin</source> -<target>&Koš za smeće</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Ove postavke se koriste za sve sinkronizacijske zadatke</target> @@ -1011,8 +1014,11 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <source>Description</source> <target>Opis</target> -<source>Restore hidden windows</source> -<target>Prikaži skrivene prozore</target> +<source>Show hidden dialogs again</source> +<target>Prikazuj 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> <source>&Default</source> <target>&Zadano</target> @@ -1074,8 +1080,8 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <source>Main Bar</source> <target>Glavna traka</target> -<source>Compare both sides</source> -<target>Usporedi obje strane</target> +<source>Start comparison</source> +<target>Započni usporedbu</target> <source>Comparison settings</source> <target>Postavke usporedbe</target> @@ -1174,9 +1180,6 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <source>Select time span...</source> <target>Odaberite vremenski raspon...</target> -<source>Default view</source> -<target>Standardni prikaz</target> - <source>Show "%x"</source> <target>Prikaži "%x"</target> @@ -1207,8 +1210,8 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <source>Synchronization Settings</source> <target>Postavke Sinkronizacije</target> -<source>Reset filter</source> -<target>Resetiraj filter</target> +<source>Clear filter</source> +<target>Očisti filter</target> <source>Show files that exist on left side only</source> <target>Prikaži datoteke koje postoje samo na lijevoj strani</target> @@ -1368,8 +1371,11 @@ Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. <source>- Other side's counterpart to %item_folder%</source> <target>- Duplikat s druge strane u %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Prikaži sve skrivene prozore i upozorenja?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Prikazati skrivene prozore i poruke upozorenja ponovno?</target> + +<source>&Show</source> +<target>&Prikaži</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Pronađi i izvrši izmjene na obje strane. Izbrisano, premješteno te sukobi se otkriju automatski pomoću baze podataka.</target> diff --git a/FreeFileSync/Build/Languages/czech.lng b/FreeFileSync/Build/Languages/czech.lng index af32dbd8..2796d262 100644 --- a/FreeFileSync/Build/Languages/czech.lng +++ b/FreeFileSync/Build/Languages/czech.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Odpovídající složka bude považována za prázdnou.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Následující složky mají navzájem závislé cesty! Buďte opatrní s definicí synchronizačních pravidel:</target> +<source>The following folder paths are dependent from each other:</source> +<target>Následující složky mají navzájem závislé cesty:</target> <source>File %x has an invalid date.</source> <target>Soubor %x má chybné datum.</target> @@ -199,6 +199,25 @@ <source>Update attributes on right</source> <target>Nastavit vlastnosti vpravo</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>%x B</pluralform> +<pluralform>%x B</pluralform> +<pluralform>%x B</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>Chybný formát databáze %x.</target> @@ -260,25 +279,6 @@ <source>Total time:</source> <target>Celkový čas:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>%x B</pluralform> -<pluralform>%x B</pluralform> -<pluralform>%x B</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Chyba zpracování souboru %x: na řádku %y ve sloupci %z</target> @@ -346,8 +346,8 @@ <source>&Quit</source> <target>U&končit</target> -<source>&Program</source> -<target>&Nástroje</target> +<source>&File</source> +<target>&Soubor</target> <source>&View help</source> <target>&Nápověda (pouze anglicky)</target> @@ -438,9 +438,6 @@ Příkaz je spuštěn když: <source>&Show error</source> <target>&Zobrazit chybu</target> -<source>&Exit</source> -<target>&Konec</target> - <source>Incorrect command line:</source> <target>Neplatný příkaz:</target> @@ -504,8 +501,8 @@ Příkaz je spuštěn když: <source>Data verification error: %x and %y have different content.</source> <target>Chyba porovnání dat: %x má jiný obsah než %y</target> -<source>Cannot find %x.</source> -<target>Nelze najít %x.</target> +<source>Cannot find folder %x.</source> +<target>Nelze najít složku %x.</target> <source>Target folder %x already existing.</source> <target>Cílová složka %x již existuje.</target> @@ -523,7 +520,7 @@ Příkaz je spuštěn když: <target>Následující položky jsou nevyřešené konflikty a nebudou synchronizovány:</target> <source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source> -<target>Nsledující složky se významně liší. Zkontrolujte zda porovnáváte správnou dvojici složek pro synchronizaci.</target> +<target>Následující složky se významně liší. Zkontrolujte zda porovnáváte správnou dvojici složek pro synchronizaci.</target> <source>Not enough free disk space available in:</source> <target>Nedostatek místa na disku:</target> @@ -534,8 +531,8 @@ Příkaz je spuštěn když: <source>Available:</source> <target>K dispozici</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Bude změněna složka, která je součástí adresářového páru vícenásobného porovnání. Prosím zkontrolujte si nastavení synchronizace.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Více složek obsahuje společnou podsložku. Prosím zkontrolujte si nastavení synchronizace.</target> <source>Synchronizing folder pair:</source> <target>Zpracovávání páru složek:</target> @@ -637,8 +634,8 @@ Příkaz je spuštěn když: <source>Name</source> <target>Jméno</target> -<source>Relative path</source> -<target>Relativní cesta</target> +<source>Relative folder</source> +<target>Relativní složka</target> <source>Base folder</source> <target>Složka</target> @@ -679,8 +676,8 @@ Příkaz je spuštěn když: <source>Remove local settings</source> <target>Zrušit nastavení</target> -<source>Reset local filter</source> -<target>Zrušit nastavení filtru</target> +<source>Clear local filter</source> +<target>Vymazat nastavení filtru</target> <source>Copy</source> <target>Kopírovat</target> @@ -700,14 +697,14 @@ Příkaz je spuštěn když: <source>Save as &batch job...</source> <target>Uložit jako &dávku</target> -<source>1. &Compare</source> -<target>1. &Porovnat</target> +<source>Start &comparison</source> +<target>Začít &porovnání</target> -<source>2. &Synchronize</source> -<target>2. &Synchronizovat</target> +<source>Start &synchronization</source> +<target>Začít &synchronizaci</target> <source>&Options</source> -<target>&Nastavení programu</target> +<target>Nastavení &programu</target> <source>&Language</source> <target>&Jazyk</target> @@ -715,11 +712,17 @@ 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>&Tools</source> -<target>&Upřesnit</target> +<target>&Nastavení</target> + +<source>&Check for new version</source> +<target>&Zkontrolovat aktualizace</target> <source>&Check now</source> <target>Zkontrolovat &nyní</target> @@ -727,9 +730,6 @@ Příkaz je spuštěn když: <source>Check &automatically once a week</source> <target>Kontrolovat &automaticky jednou týdně</target> -<source>&Check for new version</source> -<target>&Zkontrolovat aktualizace</target> - <source>Cancel</source> <target>Zrušit</target> @@ -757,18 +757,15 @@ Příkaz je spuštěn když: <source>Match case</source> <target>Rozlišovat malá a velká písmena</target> +<source>New</source> +<target>Nový</target> + <source>Open...</source> <target>Otevřít...</target> <source>Save</source> <target>Uložit</target> -<source>Save as GUI job</source> -<target>Uložit jako úlohu</target> - -<source>Save as batch job</source> -<target>Uložit jako dávku</target> - <source>Save as...</source> <target>Uložit jako...</target> @@ -781,14 +778,14 @@ Příkaz je spuštěn když: <source>Statistics:</source> <target>Statistika</target> -<source>Number of files and folders that will be created</source> -<target>Počet souborů a složek k vytvoření</target> +<source>Number of files and folders that will be deleted</source> +<target>Počet souborů a složek ke smazání</target> <source>Number of files that will be overwritten</source> <target>Počet souborů a adresářů k přepsání</target> -<source>Number of files and folders that will be deleted</source> -<target>Počet souborů a složek ke smazání</target> +<source>Number of files and folders that will be created</source> +<target>Počet souborů a složek k vytvoření</target> <source>Total bytes to copy</source> <target>Celkový objem dat</target> @@ -805,8 +802,17 @@ Příkaz je spuštěn když: <source>Identify equal files by comparing the file content.</source> <target>Rozpoznat shodné soubory porovnáním jejich obsahu.</target> +<source>Ignore time shift (in hours)</source> +<target>Ignorovat časový posun (v hodinách)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Považovat časy souborů s daným posunem jako stejné</target> + +<source>Handle daylight saving time</source> +<target>Používat letní čas</target> + <source>Symbolic links:</source> -<target>Symbolickéh odkazy:</target> +<target>Symbolické odkazy:</target> <source>More information</source> <target>Více informací</target> @@ -835,11 +841,11 @@ Příkaz je spuštěn když: <source>Maximum:</source> <target>Do:</target> -<source>&Reset</source> -<target>&Smazat</target> +<source>C&lear</source> +<target>Vy&mazat</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> -<target>Nastavte pravidla filtru pro vynechání některých souborů ze synchronizace. Zadávajte cesty relativně k odpovídající složce.</target> +<target>Nastavte pravidla filtru pro vynechání některých souborů ze synchronizace. Zadávejte cesty relativně k odpovídající složce.</target> <source>Detect moved files</source> <target>Detekce přesunutých souborů</target> @@ -861,20 +867,20 @@ Příkaz je spuštěn když: <source>Delete files:</source> <target>Mazání souborů:</target> -<source>Permanent</source> -<target>Trvale</target> +<source>&Permanent</source> +<target>&Trvale</target> <source>Delete or overwrite files permanently</source> <target>Smazat nebo přepsat soubory trvale</target> -<source>Recycle bin</source> -<target>Koš</target> +<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>Versioning</source> -<target>Verzování</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> @@ -885,14 +891,11 @@ Příkaz je spuštěn když: <source>Handle errors:</source> <target>Zpracování chyb:</target> -<source>Ignore</source> -<target>Přeskočit</target> - <source>Hide all error and warning messages</source> <target>Skrýt všechny chyby a varování</target> -<source>Pop-up</source> -<target>Hlášení</target> +<source>&Pop-up</source> +<target>&Hlášení</target> <source>Show pop-up on errors or warnings</source> <target>Zobrazit hlášení při chybě nebo varování</target> @@ -915,9 +918,6 @@ Příkaz je spuštěn když: <source>Items found:</source> <target>Nalezeno položek:</target> -<source>Speed:</source> -<target>Rychlost:</target> - <source>Time remaining:</source> <target>Zbývající čas:</target> @@ -930,6 +930,9 @@ Příkaz je spuštěn když: <source>Minimize to notification area</source> <target>Minimalizovat do oznamovací oblasti</target> +<source>Bytes copied:</source> +<target>Zkopírováno dat:</target> + <source>Close</source> <target>Zavřít</target> @@ -942,6 +945,9 @@ 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>Stop synchronization at first error</source> <target>Ukončit synchronizaci při první chybě</target> @@ -960,9 +966,6 @@ Příkaz je spuštěn když: <source>How can I schedule a batch job?</source> <target>Jak nastavit spouštění dávky?</target> -<source>&Recycle bin</source> -<target>&Koš</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Toto nastavení je platné pro všechny synchronizační úlohy.</target> @@ -1008,8 +1011,11 @@ This guarantees a consistent state even in case of a serious error. <source>Description</source> <target>Popis</target> -<source>Restore hidden windows</source> -<target>Obnovit skryté dialogy</target> +<source>Show hidden dialogs again</source> +<target>Znovu zobrazit skryté dialogy</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Zobrazit znovu všechny trvale skryté dialogy a varovná hlášení</target> <source>&Default</source> <target>&Předdefinované</target> @@ -1071,8 +1077,8 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>Hlavní lišta</target> -<source>Compare both sides</source> -<target>Porovnat obě strany</target> +<source>Start comparison</source> +<target>Začít porovnání</target> <source>Comparison settings</source> <target>Nastavení porovnání</target> @@ -1171,9 +1177,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>Zadejte časové rozmezí...</target> -<source>Default view</source> -<target>Výchozí zobrazení</target> - <source>Show "%x"</source> <target>Zobrazit "%x"</target> @@ -1204,8 +1207,8 @@ This guarantees a consistent state even in case of a serious error. <source>Synchronization Settings</source> <target>Nastavení synchronizace</target> -<source>Reset filter</source> -<target>Zrušit filtr</target> +<source>Clear filter</source> +<target>Vymazat filtr</target> <source>Show files that exist on left side only</source> <target>Zobrazit soubory existující pouze vlevo</target> @@ -1365,8 +1368,11 @@ This guarantees a consistent state even in case of a serious error. <source>- Other side's counterpart to %item_folder%</source> <target>- pouze cesta z opačného panelu pro %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Obnovit všechny skryté dialogy a varování?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Zobrazit skryté dialogy a varovná hlášení?</target> + +<source>&Show</source> +<target>&Zobrazit</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Rozpoznat a provést změny na obou stranách. Odstraněné, přesunuté nebo přejmenované soubory a konflikty budou detekovány automaticky pomocí databáze.</target> diff --git a/FreeFileSync/Build/Languages/danish.lng b/FreeFileSync/Build/Languages/danish.lng index aac7e0a3..138a697b 100644 --- a/FreeFileSync/Build/Languages/danish.lng +++ b/FreeFileSync/Build/Languages/danish.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Den tilsvarende mappe betragtes som tom.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Følgende mapper har afhængige stier. Opsæt synkroniseringsreglerne med omhu:</target> +<source>The following folder paths are dependent from each other:</source> +<target>Følgende mappestier afhænger af hinanden:</target> <source>File %x has an invalid date.</source> <target>Filen %x har en ugyldig dato.</target> @@ -199,6 +199,24 @@ <source>Update attributes on right</source> <target>Opdater attributter mod højre</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>1 byte</pluralform> +<pluralform>%x byte</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>Databasefilen %x er inkompatibel.</target> @@ -259,24 +277,6 @@ <source>Total time:</source> <target>Samlet tid:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>1 byte</pluralform> -<pluralform>%x byte</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Behandlingsfejl i filen %x, række %y, kolonne %z.</target> @@ -343,8 +343,8 @@ <source>&Quit</source> <target>&Afslut</target> -<source>&Program</source> -<target>&Filer</target> +<source>&File</source> +<target>&Fil</target> <source>&View help</source> <target>&Åben hjælp</target> @@ -435,9 +435,6 @@ Kommandoen udføres hvis: <source>&Show error</source> <target>Vi&s fejl</target> -<source>&Exit</source> -<target>&Luk</target> - <source>Incorrect command line:</source> <target>Ugyldig kommando:</target> @@ -501,8 +498,8 @@ Kommandoen udføres hvis: <source>Data verification error: %x and %y have different content.</source> <target>Godkendelsesfejl: %x og %y har forskelligt indhold</target> -<source>Cannot find %x.</source> -<target>Kan ikke finde %x.</target> +<source>Cannot find folder %x.</source> +<target>Kan ikke finde mappen %x</target> <source>Target folder %x already existing.</source> <target>Destinationsmappen %x findes allerede.</target> @@ -531,8 +528,8 @@ Kommandoen udføres hvis: <source>Available:</source> <target>Tilgængeligt:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Der ændres en mappe der tilhører flere mappepar. Kontroller dine synkroniseringsindstillinger.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Flere mappepar skriver til en almen undermappe. Kontroller dine indstillinger</target> <source>Synchronizing folder pair:</source> <target>Synkroniserer mappepar:</target> @@ -633,8 +630,8 @@ Kommandoen udføres hvis: <source>Name</source> <target>Navn</target> -<source>Relative path</source> -<target>Relativ sti</target> +<source>Relative folder</source> +<target>Relativ mappe</target> <source>Base folder</source> <target>Hovedmappe</target> @@ -675,8 +672,8 @@ Kommandoen udføres hvis: <source>Remove local settings</source> <target>Fjern lokale indstillinger</target> -<source>Reset local filter</source> -<target>Nulstil lokalt filter</target> +<source>Clear local filter</source> +<target>Ryd lokale filtre</target> <source>Copy</source> <target>Kopiér</target> @@ -696,11 +693,11 @@ Kommandoen udføres hvis: <source>Save as &batch job...</source> <target>Gem som &batchfil</target> -<source>1. &Compare</source> -<target>1. &Analyser</target> +<source>Start &comparison</source> +<target>Start &analyse</target> -<source>2. &Synchronize</source> -<target>2. &Synkroniser</target> +<source>Start &synchronization</source> +<target>Start &synkronisering</target> <source>&Options</source> <target>&Indstillinger</target> @@ -711,21 +708,24 @@ 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>&Tools</source> <target>&Værktøj</target> +<source>&Check for new version</source> +<target>Søg &efter opdatering</target> + <source>&Check now</source> <target>Søg &nu</target> <source>Check &automatically once a week</source> <target>Søg &automatisk en gang om ugen</target> -<source>&Check for new version</source> -<target>Søg &efter opdatering</target> - <source>Cancel</source> <target>Annuller</target> @@ -753,18 +753,15 @@ Kommandoen udføres hvis: <source>Match case</source> <target>Versalfølsom (a/A)</target> +<source>New</source> +<target>Ny</target> + <source>Open...</source> <target>Åben...</target> <source>Save</source> <target>Gem</target> -<source>Save as GUI job</source> -<target>Gem som brugerfladejob</target> - -<source>Save as batch job</source> -<target>Gem som batchfil</target> - <source>Save as...</source> <target>Gem som...</target> @@ -777,14 +774,14 @@ Kommandoen udføres hvis: <source>Statistics:</source> <target>Statistik:</target> -<source>Number of files and folders that will be created</source> -<target>Antal filer og mapper der oprettes</target> +<source>Number of files and folders that will be deleted</source> +<target>Antal filer og mapper der slettes</target> <source>Number of files that will be overwritten</source> <target>Antal filer der overskrives</target> -<source>Number of files and folders that will be deleted</source> -<target>Antal filer og mapper der slettes</target> +<source>Number of files and folders that will be created</source> +<target>Antal filer og mapper der oprettes</target> <source>Total bytes to copy</source> <target>Antal bytes der kopieres</target> @@ -801,6 +798,15 @@ Kommandoen udføres hvis: <source>Identify equal files by comparing the file content.</source> <target>Genkend ens filer efter indhold.</target> +<source>Ignore time shift (in hours)</source> +<target>Ignorer tidsskift (i timer)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Betragt filer med defineret tidsskift som uændrede</target> + +<source>Handle daylight saving time</source> +<target>Tag hensyn til sommertid</target> + <source>Symbolic links:</source> <target>Symbolske link:</target> @@ -831,8 +837,8 @@ Kommandoen udføres hvis: <source>Maximum:</source> <target>Maksimum:</target> -<source>&Reset</source> -<target>&Nulstil</target> +<source>C&lear</source> +<target>R&yd</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Angiv filterregler til ekskludering af bestemte filer fra synkroniseringen. Filstier skal relatere til kildemapperne.</target> @@ -857,20 +863,20 @@ Kommandoen udføres hvis: <source>Delete files:</source> <target>Filsletning:</target> -<source>Permanent</source> -<target>Permanent</target> +<source>&Permanent</source> +<target>&Permanent</target> <source>Delete or overwrite files permanently</source> <target>Slet eller overskriv filer permanent</target> -<source>Recycle bin</source> -<target>Papirkurv</target> +<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>Versioning</source> -<target>Versionering</target> +<source>&Versioning</source> +<target>&Versionering</target> <source>Move files to a user-defined folder</source> <target>Flyt filer til brugerdefineret mappe</target> @@ -881,14 +887,11 @@ Kommandoen udføres hvis: <source>Handle errors:</source> <target>Fejlhåndtering:</target> -<source>Ignore</source> -<target>Ignorer</target> - <source>Hide all error and warning messages</source> <target>Skjul fejlbeskeder og advarsler</target> -<source>Pop-up</source> -<target>Besked</target> +<source>&Pop-up</source> +<target>&Besked</target> <source>Show pop-up on errors or warnings</source> <target>Vis fejlbeskeder og advarsler</target> @@ -911,9 +914,6 @@ Kommandoen udføres hvis: <source>Items found:</source> <target>Emner fundet:</target> -<source>Speed:</source> -<target>Hastighed:</target> - <source>Time remaining:</source> <target>Resterende tid:</target> @@ -926,6 +926,9 @@ Kommandoen udføres hvis: <source>Minimize to notification area</source> <target>Minimér til uret</target> +<source>Bytes copied:</source> +<target>Kopierede byte:</target> + <source>Close</source> <target>Luk</target> @@ -938,6 +941,9 @@ 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 ved at dobbeltklikke på filen eller planlæg via opgavestyring: %x</target> +<source>&Stop</source> +<target>&Stop</target> + <source>Stop synchronization at first error</source> <target>Stop synkronisering ved første fejl</target> @@ -956,9 +962,6 @@ Kommandoen udføres hvis: <source>How can I schedule a batch job?</source> <target>Hvordan oprettes en batchfil?</target> -<source>&Recycle bin</source> -<target>&Papirkurv</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Disse indstillinger gælder alle synkroniseringer.</target> @@ -1004,8 +1007,11 @@ This guarantees a consistent state even in case of a serious error. <source>Description</source> <target>Beskrivelse</target> -<source>Restore hidden windows</source> -<target>Gendan skjulte vinduer</target> +<source>Show hidden dialogs again</source> +<target>Gendan skjulte beskeder</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Vis skjulte advarsler og beskeder igen</target> <source>&Default</source> <target>S&tandard</target> @@ -1067,8 +1073,8 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>Hovedlinie</target> -<source>Compare both sides</source> -<target>Analyser begge sider</target> +<source>Start comparison</source> +<target>Start analyse</target> <source>Comparison settings</source> <target>Analyseindstillinger</target> @@ -1163,9 +1169,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>Vælg tidsinterval...</target> -<source>Default view</source> -<target>Standardvisning</target> - <source>Show "%x"</source> <target>Vis "%x"</target> @@ -1196,8 +1199,8 @@ This guarantees a consistent state even in case of a serious error. <source>Synchronization Settings</source> <target>Synkroniseringsindstillinger</target> -<source>Reset filter</source> -<target>Nulstil filter</target> +<source>Clear filter</source> +<target>Ryd filter</target> <source>Show files that exist on left side only</source> <target>Vis filer der kun findes på venstre side</target> @@ -1355,8 +1358,11 @@ This guarantees a consistent state even in case of a serious error. <source>- Other side's counterpart to %item_folder%</source> <target>Modsat sides pendant til %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Gendan skjulte vinduer og advarsler?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Vis skjulte advarsler og beskeder igen?</target> + +<source>&Show</source> +<target>&Vis</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Find og udbred ændringer på begge sider. Sletninger, omdøbninger og konflikter findes automatisk i en database.</target> diff --git a/FreeFileSync/Build/Languages/dutch.lng b/FreeFileSync/Build/Languages/dutch.lng index 01854052..8ef337e1 100644 --- a/FreeFileSync/Build/Languages/dutch.lng +++ b/FreeFileSync/Build/Languages/dutch.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>De overeenkomstige map zal als leeg worden beschouwd.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>De volgende mappen hebben afhankelijke paden. Wees voorzichtig bij het opzetten van synchronisatieregels:</target> +<source>The following folder paths are dependent from each other:</source> +<target></target> <source>File %x has an invalid date.</source> <target>Bestand %x heeft een ongeldige datum.</target> @@ -199,6 +199,24 @@ <source>Update attributes on right</source> <target>Update attributen aan de rechterkant</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>Databasebestand %x is niet compatibel.</target> @@ -259,24 +277,6 @@ <source>Total time:</source> <target>Totale tijd:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Fout bij het parsen van bestand %x, rij %y, kolom %z.</target> @@ -343,8 +343,8 @@ <source>&Quit</source> <target>&Afsluiten</target> -<source>&Program</source> -<target>&Programma</target> +<source>&File</source> +<target></target> <source>&View help</source> <target>Help &bekijken</target> @@ -435,9 +435,6 @@ De opdracht word geactiveerd als: <source>&Show error</source> <target>Laat &fouten zien</target> -<source>&Exit</source> -<target>&Afsluiten</target> - <source>Incorrect command line:</source> <target>Incorrectie command line:</target> @@ -501,8 +498,8 @@ De opdracht word geactiveerd als: <source>Data verification error: %x and %y have different content.</source> <target>Data verificatie fout: %x en %y hebben een verschillende inhoud.</target> -<source>Cannot find %x.</source> -<target>Kan %x niet vinden.</target> +<source>Cannot find folder %x.</source> +<target></target> <source>Target folder %x already existing.</source> <target>Doelmap %x bestaat al.</target> @@ -531,8 +528,8 @@ De opdracht word geactiveerd als: <source>Available:</source> <target>Beschikbaar:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Een map die onderdeel is van meerdere gekoppelde mappen word aangepast. Kijk alstublieft uw synchronisatie instellingen na.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target></target> <source>Synchronizing folder pair:</source> <target>Bezig met synchroniseren van folder paar:</target> @@ -633,8 +630,8 @@ De opdracht word geactiveerd als: <source>Name</source> <target>Naam</target> -<source>Relative path</source> -<target>Relatief pad</target> +<source>Relative folder</source> +<target></target> <source>Base folder</source> <target>Hoofdmap</target> @@ -675,8 +672,8 @@ De opdracht word geactiveerd als: <source>Remove local settings</source> <target>Verwijder lokale instellingen</target> -<source>Reset local filter</source> -<target>Reset lokale filter</target> +<source>Clear local filter</source> +<target></target> <source>Copy</source> <target>Kopiëren</target> @@ -696,11 +693,11 @@ De opdracht word geactiveerd als: <source>Save as &batch job...</source> <target>Opslaan als &batch opdracht...</target> -<source>1. &Compare</source> -<target>1. &Vergelijk</target> +<source>Start &comparison</source> +<target></target> -<source>2. &Synchronize</source> -<target>2. &Synchroniseer</target> +<source>Start &synchronization</source> +<target></target> <source>&Options</source> <target>&Opties</target> @@ -711,21 +708,24 @@ De opdracht word geactiveerd als: <source>&Find...</source> <target>&Zoek...</target> +<source>&Reset layout</source> +<target></target> + <source>&Export file list...</source> <target>&Exporteer bestandslijst...</target> <source>&Tools</source> <target>&Gereedschap</target> +<source>&Check for new version</source> +<target>&Controleer voor nieuwe versie</target> + <source>&Check now</source> <target>&Controleer nu</target> <source>Check &automatically once a week</source> <target>Controleer &automatisch eens per week</target> -<source>&Check for new version</source> -<target>&Controleer voor nieuwe versie</target> - <source>Cancel</source> <target>Annuleren</target> @@ -753,18 +753,15 @@ De opdracht word geactiveerd als: <source>Match case</source> <target>Hoofdlettergevoelig</target> +<source>New</source> +<target></target> + <source>Open...</source> <target>Open...</target> <source>Save</source> <target>Opslaan</target> -<source>Save as GUI job</source> -<target>Opslaan als GUI taak</target> - -<source>Save as batch job</source> -<target>Opslaan als batch opdracht</target> - <source>Save as...</source> <target>Opslaan als...</target> @@ -777,14 +774,14 @@ De opdracht word geactiveerd als: <source>Statistics:</source> <target>Statistieken:</target> -<source>Number of files and folders that will be created</source> -<target>Aantal bestanden en mappen die zullen worden aangemaakt</target> +<source>Number of files and folders that will be deleted</source> +<target>Aantal bestanden en mappen die verwijderd zullen worden</target> <source>Number of files that will be overwritten</source> <target>Aantal bestanden die overschreven zullen worden</target> -<source>Number of files and folders that will be deleted</source> -<target>Aantal bestanden en mappen die verwijderd zullen worden</target> +<source>Number of files and folders that will be created</source> +<target>Aantal bestanden en mappen die zullen worden aangemaakt</target> <source>Total bytes to copy</source> <target>Aantal bytes om te kopiëren</target> @@ -801,6 +798,15 @@ De opdracht word geactiveerd als: <source>Identify equal files by comparing the file content.</source> <target>Identificeer gelijke bestanden door de bestandsinhoud te vergelijken.</target> +<source>Ignore time shift (in hours)</source> +<target></target> + +<source>Consider file times with specified offset as equal</source> +<target></target> + +<source>Handle daylight saving time</source> +<target></target> + <source>Symbolic links:</source> <target>Snelkoppelingen:</target> @@ -831,8 +837,8 @@ De opdracht word geactiveerd als: <source>Maximum:</source> <target>Maximum:</target> -<source>&Reset</source> -<target>&Reset</target> +<source>C&lear</source> +<target></target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Selecteer filter regels om bepaalde bestanden uit te sluiten van synchronisatie. Geef bestandspaden in die relatief zijn aan hun corresponderende folderparen.</target> @@ -857,20 +863,20 @@ De opdracht word geactiveerd als: <source>Delete files:</source> <target>Verwijder bestanden:</target> -<source>Permanent</source> -<target>Permanent</target> +<source>&Permanent</source> +<target></target> <source>Delete or overwrite files permanently</source> <target>Bestanden definitief verwijderen of overschrijven</target> -<source>Recycle bin</source> -<target>Prullenbak</target> +<source>&Recycle bin</source> +<target>&Prullebak</target> <source>Back up deleted and overwritten files in the recycle bin</source> <target>Maak een backup van verwijderde en overschreven bestanden in de prullenbak</target> -<source>Versioning</source> -<target>Versiebeheer</target> +<source>&Versioning</source> +<target></target> <source>Move files to a user-defined folder</source> <target>Verplaats bestanden naar een gebruikers gedefineerde map</target> @@ -881,14 +887,11 @@ De opdracht word geactiveerd als: <source>Handle errors:</source> <target>Fouten afhandelen:</target> -<source>Ignore</source> -<target>Negeer</target> - <source>Hide all error and warning messages</source> <target>Verberg alle fout- en waarschuwingsberichten</target> -<source>Pop-up</source> -<target>Pop-up</target> +<source>&Pop-up</source> +<target></target> <source>Show pop-up on errors or warnings</source> <target>Laat pop-up zien bij foutmeldingen of waarschuwingen</target> @@ -911,9 +914,6 @@ De opdracht word geactiveerd als: <source>Items found:</source> <target>Onderdelen gevonden:</target> -<source>Speed:</source> -<target>Snelheid:</target> - <source>Time remaining:</source> <target>Resterende tijd:</target> @@ -926,6 +926,9 @@ De opdracht word geactiveerd als: <source>Minimize to notification area</source> <target>Minimaliseer naar systeemvak</target> +<source>Bytes copied:</source> +<target></target> + <source>Close</source> <target>Sluiten</target> @@ -938,6 +941,9 @@ De opdracht word 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 batchbestand voor onbeheerde synchronisatie. Om te starten dubbelklikt u dit bestand of rooster in een taakplanner: %x</target> +<source>&Stop</source> +<target></target> + <source>Stop synchronization at first error</source> <target>Stop synchronisatie bij eerste foutmelding</target> @@ -956,9 +962,6 @@ De opdracht word geactiveerd als: <source>How can I schedule a batch job?</source> <target>Hoe kan ik een batch opdracht inroosteren?</target> -<source>&Recycle bin</source> -<target>&Prullebak</target> - <source>The following settings are used for all synchronization jobs.</source> <target>De volgende instellingen worden gebruikt voor alle synchronisaties.</target> @@ -1007,8 +1010,11 @@ Dit garandeert een consistente staat, zelfs in het geval van een serieuze fout. <source>Description</source> <target>Omschrijving</target> -<source>Restore hidden windows</source> -<target>Herstel verborgen vensters</target> +<source>Show hidden dialogs again</source> +<target></target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target></target> <source>&Default</source> <target>&Standaard</target> @@ -1070,8 +1076,8 @@ Dit garandeert een consistente staat, zelfs in het geval van een serieuze fout. <source>Main Bar</source> <target>Hoofdbalk</target> -<source>Compare both sides</source> -<target>Vergelijk beide zijdes</target> +<source>Start comparison</source> +<target></target> <source>Comparison settings</source> <target>Vergelijksinstellingen</target> @@ -1166,9 +1172,6 @@ Dit garandeert een consistente staat, zelfs in het geval van een serieuze fout. <source>Select time span...</source> <target>Selecteer tijdsspanne...</target> -<source>Default view</source> -<target>Standaard weergave</target> - <source>Show "%x"</source> <target>Toon "%x"</target> @@ -1199,8 +1202,8 @@ Dit garandeert een consistente staat, zelfs in het geval van een serieuze fout. <source>Synchronization Settings</source> <target>Synchronisatie instellingen</target> -<source>Reset filter</source> -<target>Reset filter</target> +<source>Clear filter</source> +<target></target> <source>Show files that exist on left side only</source> <target>Toon bestanden die alleen aan de linkerzijde bestaan</target> @@ -1358,8 +1361,11 @@ Dit garandeert een consistente staat, zelfs in het geval van een serieuze fout. <source>- Other side's counterpart to %item_folder%</source> <target>- Tegenhanger van de andere kant naar %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Herstel alle verborgen vensters en waarschuwingen?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target></target> + +<source>&Show</source> +<target></target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Identificeer en pas veranderingen toe aan beide kanten. Verwijderingen, verplaatsingen en conflicten worden automatisch gevonden met behulp van een database.</target> diff --git a/FreeFileSync/Build/Languages/english_uk.lng b/FreeFileSync/Build/Languages/english_uk.lng index 741100a5..d80f6748 100644 --- a/FreeFileSync/Build/Languages/english_uk.lng +++ b/FreeFileSync/Build/Languages/english_uk.lng @@ -7,24 +7,6 @@ <plural_definition>n == 1 ? 0 : 1</plural_definition> </header> -<source>Start comparison</source> -<target></target> - -<source>New</source> -<target></target> - -<source>Start &comparison</source> -<target></target> - -<source>A folder will be modified that is part of multiple folder pairs. Please review synchronization settings.</source> -<target></target> - -<source>Cannot find folder %x.</source> -<target></target> - -<source>The following folder paths are dependent from each other:</source> -<target></target> - <source>Both sides have changed since last synchronization.</source> <target>Both sides have changed since last synchronisation.</target> @@ -124,6 +106,9 @@ <source>The corresponding folder will be considered as empty.</source> <target>The corresponding folder will be considered as empty.</target> +<source>The following folder paths are dependent from each other:</source> +<target>The following folder paths are dependent from each other:</target> + <source>File %x has an invalid date.</source> <target>File %x has an invalid date.</target> @@ -214,6 +199,24 @@ <source>Update attributes on right</source> <target>Update attributes on right</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>Database file %x is incompatible.</target> @@ -274,24 +277,6 @@ <source>Total time:</source> <target>Total time:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Error parsing file %x, row %y, column %z.</target> @@ -358,8 +343,8 @@ <source>&Quit</source> <target>&Quit</target> -<source>&Program</source> -<target>&Program</target> +<source>&File</source> +<target>&File</target> <source>&View help</source> <target>&View help</target> @@ -513,6 +498,9 @@ The command is triggered if: <source>Data verification error: %x and %y have different content.</source> <target>Data verification error: %x and %y have different content.</target> +<source>Cannot find folder %x.</source> +<target>Cannot find folder %x.</target> + <source>Target folder %x already existing.</source> <target>Target folder %x already existing.</target> @@ -540,6 +528,9 @@ The command is triggered if: <source>Available:</source> <target>Available:</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Multiple folder pairs write to a common subfolder. Please review your configuration.</target> + <source>Synchronizing folder pair:</source> <target>Synchronising folder pair:</target> @@ -639,8 +630,8 @@ The command is triggered if: <source>Name</source> <target>Name</target> -<source>Relative path</source> -<target>Relative path</target> +<source>Relative folder</source> +<target>Relative folder</target> <source>Base folder</source> <target>Base folder</target> @@ -681,8 +672,8 @@ The command is triggered if: <source>Remove local settings</source> <target>Remove local settings</target> -<source>Reset local filter</source> -<target>Reset local filter</target> +<source>Clear local filter</source> +<target>Clear local filter</target> <source>Copy</source> <target>Copy</target> @@ -702,11 +693,11 @@ The command is triggered if: <source>Save as &batch job...</source> <target>Save as &batch job...</target> -<source>Start synchronization</source> -<target>Start synchronisation</target> +<source>Start &comparison</source> +<target>Start &comparison</target> -<source>File</source> -<target>File</target> +<source>Start &synchronization</source> +<target>Start &synchronisation</target> <source>&Options</source> <target>&Options</target> @@ -717,6 +708,9 @@ The command is triggered if: <source>&Find...</source> <target>&Find...</target> +<source>&Reset layout</source> +<target>&Reset layout</target> + <source>&Export file list...</source> <target>&Export file list...</target> @@ -759,18 +753,15 @@ The command is triggered if: <source>Match case</source> <target>Match case</target> +<source>New</source> +<target>New</target> + <source>Open...</source> <target>Open...</target> <source>Save</source> <target>Save</target> -<source>Save as GUI job</source> -<target>Save as GUI job</target> - -<source>Save as batch job</source> -<target>Save as batch job</target> - <source>Save as...</source> <target>Save as...</target> @@ -783,14 +774,14 @@ The command is triggered if: <source>Statistics:</source> <target>Statistics:</target> -<source>Number of files and folders that will be created</source> -<target>Number of files and folders that will be created</target> +<source>Number of files and folders that will be deleted</source> +<target>Number of files and folders that will be deleted</target> <source>Number of files that will be overwritten</source> <target>Number of files that will be overwritten</target> -<source>Number of files and folders that will be deleted</source> -<target>Number of files and folders that will be deleted</target> +<source>Number of files and folders that will be created</source> +<target>Number of files and folders that will be created</target> <source>Total bytes to copy</source> <target>Total bytes to copy</target> @@ -807,6 +798,15 @@ The command is triggered if: <source>Identify equal files by comparing the file content.</source> <target>Identify equal files by comparing the file content.</target> +<source>Ignore time shift (in hours)</source> +<target>Ignore time shift (in hours)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Consider file times with specified offset as equal</target> + +<source>Handle daylight saving time</source> +<target>Handle daylight saving time</target> + <source>Symbolic links:</source> <target>Symbolic links:</target> @@ -837,8 +837,8 @@ The command is triggered if: <source>Maximum:</source> <target>Maximum:</target> -<source>&Reset</source> -<target>&Reset</target> +<source>C&lear</source> +<target>C&lear</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Select filter rules to exclude certain files from synchronisation. Enter file paths relative to their corresponding folder pair.</target> @@ -863,8 +863,8 @@ The command is triggered if: <source>Delete files:</source> <target>Delete files:</target> -<source>Permanent</source> -<target>Permanent</target> +<source>&Permanent</source> +<target>&Permanent</target> <source>Delete or overwrite files permanently</source> <target>Delete or overwrite files permanently</target> @@ -875,8 +875,8 @@ The command is triggered if: <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>Versioning</source> -<target>Versioning</target> +<source>&Versioning</source> +<target>&Versioning</target> <source>Move files to a user-defined folder</source> <target>Move files to a user-defined folder</target> @@ -890,8 +890,8 @@ The command is triggered if: <source>Hide all error and warning messages</source> <target>Hide all error and warning messages</target> -<source>Pop-up</source> -<target>Pop-up</target> +<source>&Pop-up</source> +<target>&Pop-up</target> <source>Show pop-up on errors or warnings</source> <target>Show pop-up on errors or warnings</target> @@ -926,6 +926,9 @@ The command is triggered if: <source>Minimize to notification area</source> <target>Minimise to notification area</target> +<source>Bytes copied:</source> +<target>Bytes copied:</target> + <source>Close</source> <target>Close</target> @@ -938,6 +941,9 @@ 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>&Stop</source> +<target>&Stop</target> + <source>Stop synchronization at first error</source> <target>Stop synchronisation at first error</target> @@ -1004,8 +1010,11 @@ This guarantees a consistent state even in case of a serious error. <source>Description</source> <target>Description</target> -<source>Restore hidden windows</source> -<target>Restore hidden windows</target> +<source>Show hidden dialogs again</source> +<target>Show hidden dialogues again</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Show all permanently hidden dialogues and warning messages again</target> <source>&Default</source> <target>&Default</target> @@ -1067,12 +1076,18 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>Main Bar</target> +<source>Start comparison</source> +<target>Start comparison</target> + <source>Comparison settings</source> <target>Comparison settings</target> <source>Synchronization settings</source> <target>Synchronisation settings</target> +<source>Start synchronization</source> +<target>Start synchronisation</target> + <source>Confirm</source> <target>Confirm</target> @@ -1157,9 +1172,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>Select time span...</target> -<source>Default view</source> -<target>Default view</target> - <source>Show "%x"</source> <target>Show "%x"</target> @@ -1190,8 +1202,8 @@ This guarantees a consistent state even in case of a serious error. <source>Synchronization Settings</source> <target>Synchronisation Settings</target> -<source>Reset filter</source> -<target>Reset filter</target> +<source>Clear filter</source> +<target>Clear filter</target> <source>Show files that exist on left side only</source> <target>Show files that exist on left side only</target> @@ -1349,8 +1361,11 @@ This guarantees a consistent state even in case of a serious error. <source>- Other side's counterpart to %item_folder%</source> <target>- Other side's counterpart to %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Restore all hidden windows and warnings?</target> +<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>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</target> @@ -1418,6 +1433,9 @@ This guarantees a consistent state even in case of a serious error. <source>Leave as unresolved conflict</source> <target>Leave as unresolved conflict</target> +<source>File</source> +<target>File</target> + <source>YYYY-MM-DD hhmmss</source> <target>YYYY-MM-DD hhmmss</target> diff --git a/FreeFileSync/Build/Languages/finnish.lng b/FreeFileSync/Build/Languages/finnish.lng index 335ed124..b63a903d 100644 --- a/FreeFileSync/Build/Languages/finnish.lng +++ b/FreeFileSync/Build/Languages/finnish.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Vastaava hakemisto tulkitaan tyhjäksi.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Hakemiston hakemistopolussa on alikansioita. Luo täsmäyksen vertailusäännöt huolella:</target> +<source>The following folder paths are dependent from each other:</source> +<target>Nämä polut ovat ovat riippuvaisia toisistaan:</target> <source>File %x has an invalid date.</source> <target>Tiedostolla %x on virheellinen päiväys.</target> @@ -199,6 +199,24 @@ <source>Update attributes on right</source> <target>Päivitä oikeudet oikealla</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>1 tavu</pluralform> +<pluralform>%x tavua</pluralform> +</target> + +<source>%x MB</source> +<target>%x Mt</target> + +<source>%x KB</source> +<target>%x kt</target> + +<source>%x GB</source> +<target>%x Gt</target> + <source>Database file %x is incompatible.</source> <target>Tietokanta %x ei ole yhteensopiva.</target> @@ -259,24 +277,6 @@ <source>Total time:</source> <target>Kokonaisaika:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>1 tavu</pluralform> -<pluralform>%x tavua</pluralform> -</target> - -<source>%x MB</source> -<target>%x Mt</target> - -<source>%x KB</source> -<target>%x kt</target> - -<source>%x GB</source> -<target>%x Gt</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Jäsennysvirhe - tiedosto: %x, rivi: %y, sarake: %z.</target> @@ -343,8 +343,8 @@ <source>&Quit</source> <target>&Lopeta</target> -<source>&Program</source> -<target>&Ohjelma</target> +<source>&File</source> +<target>&Tiedosto</target> <source>&View help</source> <target>&Näytä ohje</target> @@ -435,9 +435,6 @@ Käsky suoritetaan jos: <source>&Show error</source> <target>&Näytä virhe</target> -<source>&Exit</source> -<target>&Poistu</target> - <source>Incorrect command line:</source> <target>Virheellinen komento:</target> @@ -501,8 +498,8 @@ Käsky suoritetaan jos: <source>Data verification error: %x and %y have different content.</source> <target>Tiedon tarkistusvirhe: %x:n ja %y:n sisältö ovat erilaiset.</target> -<source>Cannot find %x.</source> -<target>%x ei löydy.</target> +<source>Cannot find folder %x.</source> +<target>Hakemistoa %x ei löydy.</target> <source>Target folder %x already existing.</source> <target>Kohdehakemisto %x on jo olemassa.</target> @@ -531,8 +528,8 @@ Käsky suoritetaan jos: <source>Available:</source> <target>Saatavilla:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Useampiin hakemistopareihin kuuluvaa hakemistoa muutetaan. Tarkista täsmäysasetukset.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Useat hakemistoparit tallentaa yhteen alikansioon. Tarkista asetukset.</target> <source>Synchronizing folder pair:</source> <target>Täsmäytetään hakemistoparia:</target> @@ -633,8 +630,8 @@ Käsky suoritetaan jos: <source>Name</source> <target>Nimi</target> -<source>Relative path</source> -<target>Suhteellinen polku</target> +<source>Relative folder</source> +<target>Suhteellinen hakemisto</target> <source>Base folder</source> <target>Juurihakemisto</target> @@ -675,8 +672,8 @@ Käsky suoritetaan jos: <source>Remove local settings</source> <target>Poista paikalliset asetukset</target> -<source>Reset local filter</source> -<target>Nollaa paikalliset suotimet</target> +<source>Clear local filter</source> +<target>Nollaa paikallinen suodin</target> <source>Copy</source> <target>Monista</target> @@ -696,11 +693,11 @@ Käsky suoritetaan jos: <source>Save as &batch job...</source> <target>Tallenna &eräajona...</target> -<source>1. &Compare</source> -<target>1. &Vertaa</target> +<source>Start &comparison</source> +<target>Aloita &vertailu</target> -<source>2. &Synchronize</source> -<target>2. &Täsmäytä</target> +<source>Start &synchronization</source> +<target>Aloita &täsmäytys</target> <source>&Options</source> <target>&Asetukset</target> @@ -711,21 +708,24 @@ 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>&Tools</source> <target>&Asetukset</target> +<source>&Check for new version</source> +<target>&Hae uusi versio</target> + <source>&Check now</source> <target>&Tarkista nyt</target> <source>Check &automatically once a week</source> <target>Tarkista &viikoittain</target> -<source>&Check for new version</source> -<target>&Hae uusi versio</target> - <source>Cancel</source> <target>Lopeta</target> @@ -753,18 +753,15 @@ Käsky suoritetaan jos: <source>Match case</source> <target>Täsmäytä kirjainkoko</target> +<source>New</source> +<target>Uusi</target> + <source>Open...</source> <target>Avaa...</target> <source>Save</source> <target>Tallenna</target> -<source>Save as GUI job</source> -<target>Tallenna GUI-työnä</target> - -<source>Save as batch job</source> -<target>Tallenna eräajona</target> - <source>Save as...</source> <target>Tallenna nimellä...</target> @@ -777,14 +774,14 @@ Käsky suoritetaan jos: <source>Statistics:</source> <target>Tilastot:</target> -<source>Number of files and folders that will be created</source> -<target>Luotavien tiedostojen ja hakemistojen määrä</target> +<source>Number of files and folders that will be deleted</source> +<target>Poistettavien tiedostojen ja hakemistojen määrä</target> <source>Number of files that will be overwritten</source> <target>Korvattavien tiedostojen ja hakemistojen määrä</target> -<source>Number of files and folders that will be deleted</source> -<target>Poistettavien tiedostojen ja hakemistojen määrä</target> +<source>Number of files and folders that will be created</source> +<target>Luotavien tiedostojen ja hakemistojen määrä</target> <source>Total bytes to copy</source> <target>Kopioitava määrä tavuja</target> @@ -801,6 +798,15 @@ Käsky suoritetaan jos: <source>Identify equal files by comparing the file content.</source> <target>Tunnista identtiset tiedostot sisältöä vertailemalla.</target> +<source>Ignore time shift (in hours)</source> +<target>Sivuta aikasiirtymä (tuntia)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Oleta tiedostoja tietyllä aikasiirtymällä olevan vastaavia</target> + +<source>Handle daylight saving time</source> +<target>Käsittele kesäaika</target> + <source>Symbolic links:</source> <target>Pikakuvike:</target> @@ -831,8 +837,8 @@ Käsky suoritetaan jos: <source>Maximum:</source> <target>Enintään:</target> -<source>&Reset</source> -<target>&Palauta</target> +<source>C&lear</source> +<target>&Nollaa</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Määrittele suodatussäännöt täsmäyksestä pois jätettäville tiedostoille. Anna hakemistopariin nähden suhteellinen osoite.</target> @@ -857,20 +863,20 @@ Käsky suoritetaan jos: <source>Delete files:</source> <target>Poista tiedosto:</target> -<source>Permanent</source> -<target>Pysyvä</target> +<source>&Permanent</source> +<target>&Pysyvä</target> <source>Delete or overwrite files permanently</source> <target>Poista tai korvaa tiedostoja pysyvästi</target> -<source>Recycle bin</source> -<target>Roskakori</target> +<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>Versioning</source> -<target>Versiointi</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> @@ -881,14 +887,11 @@ Käsky suoritetaan jos: <source>Handle errors:</source> <target>Hoida virheet:</target> -<source>Ignore</source> -<target>Ohita</target> - <source>Hide all error and warning messages</source> <target>Piilota kaikki virhe- ja varoitusviestit</target> -<source>Pop-up</source> -<target>Ponnahdusikkuna</target> +<source>&Pop-up</source> +<target>&Pop-up</target> <source>Show pop-up on errors or warnings</source> <target>Näytä ponnahdusikkuna virheiden tai varoituksien kohdalla</target> @@ -911,9 +914,6 @@ Käsky suoritetaan jos: <source>Items found:</source> <target>Osioita löytyi:</target> -<source>Speed:</source> -<target>Nopeus:</target> - <source>Time remaining:</source> <target>Aikaa jäljellä:</target> @@ -926,6 +926,9 @@ Käsky suoritetaan jos: <source>Minimize to notification area</source> <target>Pienennä ilmaisinalueelle</target> +<source>Bytes copied:</source> +<target>Kopioituja tavuja:</target> + <source>Close</source> <target>Sulje</target> @@ -933,13 +936,16 @@ Käsky suoritetaan jos: <target>&Keskeytä</target> <source>Stop</source> -<target>Keskeytä</target> +<target>Lopeta</target> <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äystä varten. Käynnistä kaksoisnapsauttamalla tai ajasta tehtävä: %x</target> +<source>&Stop</source> +<target>&Lopeta</target> + <source>Stop synchronization at first error</source> -<target>Keskeytä täsmäys ensimmäiseen virheeseen</target> +<target>Lopeta täsmäys ensimmäiseen virheeseen</target> <source>Run minimized</source> <target>Suorita pienennettynä</target> @@ -956,9 +962,6 @@ Käsky suoritetaan jos: <source>How can I schedule a batch job?</source> <target>Miten ajastan eräajon?</target> -<source>&Recycle bin</source> -<target>&Roskakori</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Näitä asetuksia käytetään kaikkiin täsmäyksiin.</target> @@ -1007,8 +1010,11 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Description</source> <target>Kuvaus</target> -<source>Restore hidden windows</source> -<target>Palauta piilotetut ikkunat</target> +<source>Show hidden dialogs again</source> +<target>Näytä piiloitetut dialogit uudestaan</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Näytä pysyvästi piiloitetut dialogit ja varoitukset uudestaan</target> <source>&Default</source> <target>&Oletus</target> @@ -1070,8 +1076,8 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Main Bar</source> <target>Pääpalkki</target> -<source>Compare both sides</source> -<target>Vertaile molempia puolia</target> +<source>Start comparison</source> +<target>Aloita vertailu</target> <source>Comparison settings</source> <target>Vertailun asetukset</target> @@ -1166,9 +1172,6 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Select time span...</source> <target>Valitse aikajana...</target> -<source>Default view</source> -<target>Oletusnäkymä</target> - <source>Show "%x"</source> <target>Näytä "%x"</target> @@ -1199,7 +1202,7 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Synchronization Settings</source> <target>Täsmäyksen asetukset</target> -<source>Reset filter</source> +<source>Clear filter</source> <target>Nollaa suodin</target> <source>Show files that exist on left side only</source> @@ -1358,8 +1361,11 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>- Other side's counterpart to %item_folder%</source> <target>- Toisen puolen osa liittyy %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Palauta kaikki piiloitetut ikkunat ja varoitukset?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Näytetäänkö piiloitetut dialogit ja varoitukset uudestaan?</target> + +<source>&Show</source> +<target>&Näytä</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Löydä ja monista muutokset molemmille puolille. Poistot, siirrot ja eroavuudet tunnistetaan tietokannan avulla.</target> diff --git a/FreeFileSync/Build/Languages/french.lng b/FreeFileSync/Build/Languages/french.lng index 3b1354e2..55d7fcdd 100644 --- a/FreeFileSync/Build/Languages/french.lng +++ b/FreeFileSync/Build/Languages/french.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Le dossier correspondant sera considéré comme vide.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Les fichiers suivants ont des chemins interdépendants. Attention à la mise à jour des règles de synchronisation :</target> +<source>The following folder paths are dependent from each other:</source> +<target>Les chemins des dossiers suivants dépendent les uns des autres</target> <source>File %x has an invalid date.</source> <target>Le fichier %x a une date invalide.</target> @@ -199,6 +199,24 @@ <source>Update attributes on right</source> <target>Mise à jour des attributs à droite</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>%x octet</pluralform> +<pluralform>%x octets</pluralform> +</target> + +<source>%x MB</source> +<target>%x Mo</target> + +<source>%x KB</source> +<target>%x Ko</target> + +<source>%x GB</source> +<target>%x Go</target> + <source>Database file %x is incompatible.</source> <target>La base de données %x n'est pas compatible.</target> @@ -259,24 +277,6 @@ <source>Total time:</source> <target>Durée totale :</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>%x octet</pluralform> -<pluralform>%x octets</pluralform> -</target> - -<source>%x MB</source> -<target>%x Mo</target> - -<source>%x KB</source> -<target>%x Ko</target> - -<source>%x GB</source> -<target>%x Go</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Erreur lors de l'analyse du fichier %x, ligne %y, colonne %z.</target> @@ -343,8 +343,8 @@ <source>&Quit</source> <target>&Quitter</target> -<source>&Program</source> -<target>&Programme</target> +<source>&File</source> +<target>&Fichiers</target> <source>&View help</source> <target>&Afficher l'aide</target> @@ -435,9 +435,6 @@ La commande est déclenchée si : <source>&Show error</source> <target>&Afficher l'erreur</target> -<source>&Exit</source> -<target>&Quitter</target> - <source>Incorrect command line:</source> <target>Ligne de commande incorrecte :</target> @@ -501,8 +498,8 @@ La commande est déclenchée si : <source>Data verification error: %x and %y have different content.</source> <target>Erreur lors de la vérification des données : %x et %y ont des contenus différents.</target> -<source>Cannot find %x.</source> -<target>Impossible de trouver %x</target> +<source>Cannot find folder %x.</source> +<target>Dossier %x introuvable.</target> <source>Target folder %x already existing.</source> <target>Le dossier destination %x existe déjà.</target> @@ -531,8 +528,8 @@ La commande est déclenchée si : <source>Available:</source> <target>Disponible :</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Un dossier faisant partie de paires multiples sera modifié. Veuillez vérifier les paramètres de synchronisation.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Plusieurs dossiers multiples écrivent dans un sous-dossier commun. Veuillez vérifier votre configuration.</target> <source>Synchronizing folder pair:</source> <target>Synchronisation de la paire de dossiers</target> @@ -633,8 +630,8 @@ La commande est déclenchée si : <source>Name</source> <target>Nom</target> -<source>Relative path</source> -<target>Chemin relatif</target> +<source>Relative folder</source> +<target>Dossier relatif</target> <source>Base folder</source> <target>Dossier de base</target> @@ -675,8 +672,8 @@ La commande est déclenchée si : <source>Remove local settings</source> <target>supprimer les paramètres locaux</target> -<source>Reset local filter</source> -<target>Réinitialiser le filtre local</target> +<source>Clear local filter</source> +<target>Effacer le filtre local</target> <source>Copy</source> <target>Copier</target> @@ -696,11 +693,11 @@ La commande est déclenchée si : <source>Save as &batch job...</source> <target>Enregistrer en temps que job &batch...</target> -<source>1. &Compare</source> -<target>1. &Comparer</target> +<source>Start &comparison</source> +<target>Démarrer la &comparaison</target> -<source>2. &Synchronize</source> -<target>2. &Synchroniser</target> +<source>Start &synchronization</source> +<target>Démarrer la &synchronisation</target> <source>&Options</source> <target>&Options</target> @@ -711,21 +708,24 @@ 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>&Tools</source> <target>Ou&tils</target> +<source>&Check for new version</source> +<target>&Vérifier les nouvelles versions</target> + <source>&Check now</source> <target>&Contrôler maintenant</target> <source>Check &automatically once a week</source> <target>Contrôler &automatiquement une fois par semaine</target> -<source>&Check for new version</source> -<target>&Vérifier les nouvelles versions</target> - <source>Cancel</source> <target>Annuler</target> @@ -753,18 +753,15 @@ La commande est déclenchée si : <source>Match case</source> <target>Respecter la casse</target> +<source>New</source> +<target>Nouveau</target> + <source>Open...</source> <target>Ouvrir ...</target> <source>Save</source> <target>Sauvegarder</target> -<source>Save as GUI job</source> -<target>Enregistrer en tant que job GUI</target> - -<source>Save as batch job</source> -<target>Enregistrer en tant que fichier batch</target> - <source>Save as...</source> <target>Enregistrer en tant que...</target> @@ -777,14 +774,14 @@ La commande est déclenchée si : <source>Statistics:</source> <target>Statistiques :</target> -<source>Number of files and folders that will be created</source> -<target>Nombre de fichiers et de dossiers qui seront créés</target> +<source>Number of files and folders that will be deleted</source> +<target>Nombre de fichiers et de dossiers qui seront supprimés</target> <source>Number of files that will be overwritten</source> <target>Nombre de fichiers qui seront remplacés</target> -<source>Number of files and folders that will be deleted</source> -<target>Nombre de fichiers et de dossiers qui seront supprimés</target> +<source>Number of files and folders that will be created</source> +<target>Nombre de fichiers et de dossiers qui seront créés</target> <source>Total bytes to copy</source> <target>Nombre total d'octets à copier</target> @@ -801,6 +798,15 @@ La commande est déclenchée si : <source>Identify equal files by comparing the file content.</source> <target>Reconnaître les fichiers identiques à l'aide de leur contenu.</target> +<source>Ignore time shift (in hours)</source> +<target>Ignorer les décalages temporels (en heures)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Considérer comme identiques les dates de fichiers avec un décalage spécifié</target> + +<source>Handle daylight saving time</source> +<target>Gérer l'heure d'été</target> + <source>Symbolic links:</source> <target>Liens symboliques</target> @@ -831,8 +837,8 @@ La commande est déclenchée si : <source>Maximum:</source> <target>Maximum :</target> -<source>&Reset</source> -<target>&Réinitialiser</target> +<source>C&lear</source> +<target>&Effacer</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Sélectionnez les règles de filtrage pour exclure certains fichiers de la synchronisation. Entrez les chemins des fichiers par rapport à leur paire de dossiers.</target> @@ -857,20 +863,20 @@ La commande est déclenchée si : <source>Delete files:</source> <target>Supprimer les fichiers :</target> -<source>Permanent</source> -<target>Permanent</target> +<source>&Permanent</source> +<target>&Permanent</target> <source>Delete or overwrite files permanently</source> <target>Supprimer ou écraser les fichiers définitivement</target> -<source>Recycle bin</source> -<target>Corbeille</target> +<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>Versioning</source> -<target>Gestion des versions</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> @@ -881,14 +887,11 @@ La commande est déclenchée si : <source>Handle errors:</source> <target>Gestion des erreurs :</target> -<source>Ignore</source> -<target>Ignorer</target> - <source>Hide all error and warning messages</source> <target>Masquer tous les messages d'erreurs et les avertissements</target> -<source>Pop-up</source> -<target>Pop-up</target> +<source>&Pop-up</source> +<target>&Pop-up</target> <source>Show pop-up on errors or warnings</source> <target>Montrer les messages d'avertissement ou d'erreur</target> @@ -911,9 +914,6 @@ La commande est déclenchée si : <source>Items found:</source> <target>Élements trouvés :</target> -<source>Speed:</source> -<target>Vitesse :</target> - <source>Time remaining:</source> <target>Temps restant :</target> @@ -926,6 +926,9 @@ La commande est déclenchée si : <source>Minimize to notification area</source> <target>Réduction à la zone de notification</target> +<source>Bytes copied:</source> +<target>Octets copiés :</target> + <source>Close</source> <target>Fermer</target> @@ -938,6 +941,9 @@ 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>Stop synchronization at first error</source> <target>Arrêter la synchronisation à la première erreur</target> @@ -956,9 +962,6 @@ La commande est déclenchée si : <source>How can I schedule a batch job?</source> <target>Comment plannifier un job batch ?</target> -<source>&Recycle bin</source> -<target>&Corbeille</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Les paramètres suivants sont utilisés lors de toutes les synchronisations.</target> @@ -1007,8 +1010,11 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>Description</source> <target>Description</target> -<source>Restore hidden windows</source> -<target>Restaurer les fenêtres masquées</target> +<source>Show hidden dialogs again</source> +<target>Réafficher les boîtes de dialogue masquées</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Réafficher en permanence les boîtes de dialogue et les avertissements</target> <source>&Default</source> <target>&Défaut</target> @@ -1070,8 +1076,8 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>Main Bar</source> <target>Barre Principale</target> -<source>Compare both sides</source> -<target>Comparer les deux listes</target> +<source>Start comparison</source> +<target>Démarrer la comparaison</target> <source>Comparison settings</source> <target>Paramètres de comparaison</target> @@ -1166,9 +1172,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>Default view</source> -<target>Vue par défaut</target> - <source>Show "%x"</source> <target>Afficher "%x"</target> @@ -1199,8 +1202,8 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>Synchronization Settings</source> <target>Configuration de la Synchronisation</target> -<source>Reset filter</source> -<target>Réinitialiser le filtre</target> +<source>Clear filter</source> +<target>Effacer les filtres</target> <source>Show files that exist on left side only</source> <target>Afficher les fichiers existant seulement à gauche</target> @@ -1358,8 +1361,11 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>- Other side's counterpart to %item_folder%</source> <target>- Duplication vers %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Reataurer toutes les fenêtres masquées et les avertissements ?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Voulez-vous réafficher les boîtes de dialogues et les avertissements ?</target> + +<source>&Show</source> +<target>&Afficher</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Identifier et propager les modifications des deux côtés. Suppressions, déplacements et conflits sont détectés automatiquement en utilisant une base de données.</target> diff --git a/FreeFileSync/Build/Languages/german.lng b/FreeFileSync/Build/Languages/german.lng index 1043a29e..bfcbaf8e 100644 --- a/FreeFileSync/Build/Languages/german.lng +++ b/FreeFileSync/Build/Languages/german.lng @@ -199,6 +199,24 @@ <source>Update attributes on right</source> <target>Aktualisiere Attribute des rechten Elements</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>1 Byte</pluralform> +<pluralform>%x Bytes</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>Die Datenbankdatei %x ist nicht kompatibel.</target> @@ -259,24 +277,6 @@ <source>Total time:</source> <target>Gesamtzeit:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>1 Byte</pluralform> -<pluralform>%x Bytes</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Fehler beim Auswerten der Datei %x, Zeile %y, Spalte %z.</target> @@ -343,8 +343,8 @@ <source>&Quit</source> <target>&Beenden</target> -<source>&Program</source> -<target>&Programm</target> +<source>&File</source> +<target>&Datei</target> <source>&View help</source> <target>&Hilfe anzeigen</target> @@ -528,8 +528,8 @@ Die Befehlszeile wird ausgelöst, wenn: <source>Available:</source> <target>Verfügbar:</target> -<source>A folder will be modified that is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Ein Ordner wird verändert werden, der Teil mehrerer Ordnerpaare ist. Bitte überprüfen Sie die Synchronisationseinstellungen.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Mehrere Ordnerpaare schreiben in einen gemeinsamen Unterordner. Bitte überprüfen Sie ihre Konfiguration.</target> <source>Synchronizing folder pair:</source> <target>Synchronisiere Ordnerpaar:</target> @@ -630,8 +630,8 @@ Die Befehlszeile wird ausgelöst, wenn: <source>Name</source> <target>Name</target> -<source>Relative path</source> -<target>Relativer Pfad</target> +<source>Relative folder</source> +<target>Relativer Ordner</target> <source>Base folder</source> <target>Basisordner</target> @@ -672,8 +672,8 @@ Die Befehlszeile wird ausgelöst, wenn: <source>Remove local settings</source> <target>Lokale Einstellungen entfernen</target> -<source>Reset local filter</source> -<target>Lokalen Filter zurücksetzen</target> +<source>Clear local filter</source> +<target>Lokalen Filter löschen</target> <source>Copy</source> <target>Kopieren</target> @@ -691,16 +691,13 @@ Die Befehlszeile wird ausgelöst, wenn: <target>&Speichern</target> <source>Save as &batch job...</source> -<target>Speichern als Batch-&Auftrag...</target> +<target>Speichern als Batch&auftrag...</target> <source>Start &comparison</source> <target>&Vergleich starten</target> -<source>Start synchronization</source> -<target>Synchronisation starten</target> - -<source>File</source> -<target>Datei</target> +<source>Start &synchronization</source> +<target>&Synchronisation starten</target> <source>&Options</source> <target>&Optionen</target> @@ -756,18 +753,15 @@ Die Befehlszeile wird ausgelöst, wenn: <source>Match case</source> <target>Groß-/Kleinschreibung</target> +<source>New</source> +<target>Neu</target> + <source>Open...</source> <target>Öffnen...</target> <source>Save</source> <target>Speichern</target> -<source>Save as GUI job</source> -<target>Als GUI-Auftrag speichern</target> - -<source>Save as batch job</source> -<target>Als Batch-Auftrag speichern</target> - <source>Save as...</source> <target>Speichern unter...</target> @@ -829,7 +823,7 @@ Die Befehlszeile wird ausgelöst, wenn: <target>Ausschließen:</target> <source>Show examples</source> -<target>Zeige Beispiele</target> +<target>Beispiele zeigen</target> <source>Time span:</source> <target>Zeitspanne:</target> @@ -843,8 +837,8 @@ Die Befehlszeile wird ausgelöst, wenn: <source>Maximum:</source> <target>Maximum:</target> -<source>&Reset</source> -<target>&Zurücksetzen</target> +<source>C&lear</source> +<target>&Löschen</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Wählen Sie Filterregeln aus, um einzelne Dateien von der Synchronisation auszuschließen. Geben Sie Dateipfade relativ zu ihrem zugehörigen Ordnerpaar an.</target> @@ -869,8 +863,8 @@ Die Befehlszeile wird ausgelöst, wenn: <source>Delete files:</source> <target>Dateien löschen:</target> -<source>Permanent</source> -<target>Permanent</target> +<source>&Permanent</source> +<target>&Permanent</target> <source>Delete or overwrite files permanently</source> <target>Dateien endgültig löschen oder überschreiben</target> @@ -881,8 +875,8 @@ Die Befehlszeile wird ausgelöst, wenn: <source>Back up deleted and overwritten files in the recycle bin</source> <target>Gelöschte und überschriebene Dateien im Papierkorb sichern</target> -<source>Versioning</source> -<target>Versionierung</target> +<source>&Versioning</source> +<target>&Versionierung</target> <source>Move files to a user-defined folder</source> <target>Dateien in einen benutzerdefinierten Ordner verschieben</target> @@ -896,8 +890,8 @@ Die Befehlszeile wird ausgelöst, wenn: <source>Hide all error and warning messages</source> <target>Alle Fehler- und Warnmeldungen unterdrücken</target> -<source>Pop-up</source> -<target>Nachfragen</target> +<source>&Pop-up</source> +<target>&Nachfragen</target> <source>Show pop-up on errors or warnings</source> <target>Ein Auswahlfenster bei Fehlern oder Warnungen anzeigen</target> @@ -932,6 +926,9 @@ Die Befehlszeile wird ausgelöst, wenn: <source>Minimize to notification area</source> <target>In das Benachrichtigungsfeld minimieren</target> +<source>Bytes copied:</source> +<target>Kopierte Datenmenge:</target> + <source>Close</source> <target>Schließen</target> @@ -944,6 +941,9 @@ Die Befehlszeile wird ausgelöst, wenn: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Erstellt eine Batchdatei für die unbeaufsichtigte Synchronisation. Zum Starten die Datei doppelklicken oder in einen Taskplaner eintragen: %x</target> +<source>&Stop</source> +<target>&Stop</target> + <source>Stop synchronization at first error</source> <target>Synchronisation beim ersten Fehler unterbrechen</target> @@ -960,7 +960,7 @@ Die Befehlszeile wird ausgelöst, wenn: <target>Maximale Anzahl der Protokolldateien begrenzen</target> <source>How can I schedule a batch job?</source> -<target>Wie können Batch-Aufträge in den Taskplaner eingetragen werden?</target> +<target>Wie können Batchaufträge in den Taskplaner eingetragen werden?</target> <source>The following settings are used for all synchronization jobs.</source> <target>Die folgenden Einstellungen werden für alle Synchronisationsaufgaben verwendet.</target> @@ -1010,8 +1010,11 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. <source>Description</source> <target>Beschreibung</target> -<source>Restore hidden windows</source> -<target>Versteckte Fenster wiederherstellen</target> +<source>Show hidden dialogs again</source> +<target>Versteckte Fenster wieder zeigen</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Alle dauerhaft versteckten Fenster und Warnmeldungen wieder anzeigen</target> <source>&Default</source> <target>&Standard</target> @@ -1041,7 +1044,7 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. <target>Vielen Dank für die Lokalisation:</target> <source>Save as Batch Job</source> -<target>Als Batch-Auftrag speichern</target> +<target>Als Batchauftrag speichern</target> <source>Delete Items</source> <target>Elemente löschen</target> @@ -1082,6 +1085,9 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. <source>Synchronization settings</source> <target>Synchronisationseinstellungen</target> +<source>Start synchronization</source> +<target>Synchronisation starten</target> + <source>Confirm</source> <target>Bestätigen</target> @@ -1196,8 +1202,8 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. <source>Synchronization Settings</source> <target>Synchronisationseinstellungen</target> -<source>Reset filter</source> -<target>Filter zurücksetzen</target> +<source>Clear filter</source> +<target>Filter löschen</target> <source>Show files that exist on left side only</source> <target>Nur links existierende Dateien anzeigen</target> @@ -1266,7 +1272,7 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. <target>Suche nach aktualisierten Programmversionen...</target> <source>Close progress dialog</source> -<target>Schließe Fortschrittsdialog</target> +<target>Schließe Verlaufsdialog</target> <source>Standby</source> <target>Energie sparen</target> @@ -1308,7 +1314,7 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. <target>&Fortfahren</target> <source>Progress</source> -<target>Fortschritt</target> +<target>Verlauf</target> <source>Log</source> <target>Protokoll</target> @@ -1355,8 +1361,11 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. <source>- Other side's counterpart to %item_folder%</source> <target>- Entsprechung der anderen Seite zu %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Sollen alle versteckten Fenster und Warnungen wiederhergestellt werden?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Sollen versteckte Fenster und Warnmeldungen wieder gezeigt werden?</target> + +<source>&Show</source> +<target>&Zeigen</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Identifiziere und propagiere Änderungen auf beiden Seiten. Löschungen, Verschiebungen und Konflikte werden automatisch mit Hilfe einer Datenbank erkannt.</target> @@ -1424,6 +1433,9 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. <source>Leave as unresolved conflict</source> <target>Als unbehandelten Konflikt belassen</target> +<source>File</source> +<target>Datei</target> + <source>YYYY-MM-DD hhmmss</source> <target>JJJJ-MM-TT hhmmss</target> @@ -1539,7 +1551,7 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. <target>Der Schlafmodus des Betriebssystems kann nicht ausgesetzt werden.</target> <source>Cannot change process I/O priorities.</source> -<target>Die Eingabe/Ausgabe Prioritäten für den Prozess kann nicht geändert werden.</target> +<target>Die Eingabe/Ausgabe Prioritäten für den Prozess können nicht geändert werden.</target> <source>Unable to move %x to the recycle bin.</source> <target>%x kann nicht in den Papierkorb verschoben werden.</target> diff --git a/FreeFileSync/Build/Languages/greek.lng b/FreeFileSync/Build/Languages/greek.lng index bd43c21c..1cf3b13c 100644 --- a/FreeFileSync/Build/Languages/greek.lng +++ b/FreeFileSync/Build/Languages/greek.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Ο αντίστοιχος υποκατάλογος θα θεωρηθεί κενός.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Οι παρακάτω υποκατάλογοι δεν έχουν σταθερή διαδρομή. Προσοχή όταν ορίσετε κανόνες συγχρονισμού:</target> +<source>The following folder paths are dependent from each other:</source> +<target>Οι ακόλουθες διαδρομές εξαρτώνται η μια από την άλλη:</target> <source>File %x has an invalid date.</source> <target>Το αρχείο %x δεν έχει έγκυρη ημερομηνία.</target> @@ -199,6 +199,24 @@ <source>Update attributes on right</source> <target>Ενημέρωση των στοιχείων στα δεξιά</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>Το αρχείο βάσης δεδομένων %x δεν είναι συμβατό</target> @@ -259,24 +277,6 @@ <source>Total time:</source> <target>Συνολική διάρκεια:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Σφάλμα κατά την ανάλυση του αρχείου %x, γραμμή %y, στήλη %z.</target> @@ -343,8 +343,8 @@ <source>&Quit</source> <target>Έ&ξοδος</target> -<source>&Program</source> -<target>&Πρόγραμμα</target> +<source>&File</source> +<target>&Αρχείο</target> <source>&View help</source> <target>&Προβολή βοήθειας</target> @@ -435,9 +435,6 @@ The command is triggered if: <source>&Show error</source> <target>&Εμφάνιση σφάλματος</target> -<source>&Exit</source> -<target>Έ&ξοδος</target> - <source>Incorrect command line:</source> <target>Εσφαλμένη γραμμή εντολών:</target> @@ -501,8 +498,8 @@ The command is triggered if: <source>Data verification error: %x and %y have different content.</source> <target>Σφάλμα επαλήθευσης δεδομένων: το %x και το %y έχουν διαφορετικό περιεχόμενο.</target> -<source>Cannot find %x.</source> -<target>Το %x δεν μπορεί να βρεθεί.</target> +<source>Cannot find folder %x.</source> +<target>Ο υποκατάλογος %x δεν μπορεί να βρεθεί.</target> <source>Target folder %x already existing.</source> <target>Ο υποκατάλογος-στόχος %x υπάρχει ήδη.</target> @@ -531,8 +528,8 @@ The command is triggered if: <source>Available:</source> <target>Διαθέσιμος:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Θα τροποποιηθεί ένας υποκατάλογος που είναι μέρος από πολλαπλά ζεύγη υποκαταλόγων. Παρακαλούμε επανελέγξτε τις ρυθμίσεις συγχρονισμού.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Πολλά ζεύγη υποκαταλόγων γράφουν σε έναν κοινό υποκατάλογο. Παρακαλούμε ελέγξτε ξανά τις ρυθμίσεις.</target> <source>Synchronizing folder pair:</source> <target>Συγχρονίζεται το ζευγάρι υποκαταλόγων:</target> @@ -633,8 +630,8 @@ The command is triggered if: <source>Name</source> <target>Όνομα</target> -<source>Relative path</source> -<target>Σχετική διαδρομή</target> +<source>Relative folder</source> +<target>Σχετικός υποκατάλογος</target> <source>Base folder</source> <target>Βασικός υποκατάλογος</target> @@ -675,8 +672,8 @@ The command is triggered if: <source>Remove local settings</source> <target>Αφαίρεση τοπικών ρυθμίσεων</target> -<source>Reset local filter</source> -<target>Αφαίρεση τοπικού φίλτρου</target> +<source>Clear local filter</source> +<target>Καθαρισμός τοπικού φίλτρου</target> <source>Copy</source> <target>Αντιγραφή</target> @@ -696,11 +693,11 @@ The command is triggered if: <source>Save as &batch job...</source> <target>Αποθήκευση ως δέσ&μη ενεργειών...</target> -<source>1. &Compare</source> -<target>1. &Σύγκριση</target> +<source>Start &comparison</source> +<target>Έναρξη &σύγκρισης</target> -<source>2. &Synchronize</source> -<target>2. Συ&γχρονισμός</target> +<source>Start &synchronization</source> +<target>Έναρξη συγχρο&νισμού</target> <source>&Options</source> <target>&Επιλογές</target> @@ -711,21 +708,24 @@ The command is triggered if: <source>&Find...</source> <target>Εύ&ρεση</target> +<source>&Reset layout</source> +<target>&Αρχικοποίηση εμφάνισης</target> + <source>&Export file list...</source> <target>Ε&ξαγωγή καταλόγου αρχείων...</target> <source>&Tools</source> <target>&Εργαλεία</target> +<source>&Check for new version</source> +<target>Έλεγχος για &νέα έκδοση</target> + <source>&Check now</source> <target>Έλεγχος &τώρα</target> <source>Check &automatically once a week</source> <target>&Aυτόματος έλεγχος μια φορά την εβδομάδα</target> -<source>&Check for new version</source> -<target>Έλεγχος για &νέα έκδοση</target> - <source>Cancel</source> <target>Άκυρο</target> @@ -753,18 +753,15 @@ The command is triggered if: <source>Match case</source> <target>Αντιστοίχιση πεζών-κεφαλαίων</target> +<source>New</source> +<target>Δημιουργία</target> + <source>Open...</source> <target>Άνοιγμα...</target> <source>Save</source> <target>Αποθήκευση</target> -<source>Save as GUI job</source> -<target>Αποθήκευση ως εργασία του GUI</target> - -<source>Save as batch job</source> -<target>Αποθήκευση ως δέσμη ενεργειών</target> - <source>Save as...</source> <target>Αποθήκευση ως...</target> @@ -777,14 +774,14 @@ The command is triggered if: <source>Statistics:</source> <target>Στατιστικά:</target> -<source>Number of files and folders that will be created</source> -<target>Αριθμός αρχείων και υποκαταλόγων που θα δημιουργηθούν</target> +<source>Number of files and folders that will be deleted</source> +<target>Αριθμός αρχείων και υποκαταλόγων που θα διαγραφούν</target> <source>Number of files that will be overwritten</source> <target>Αριθμός αρχείων και υποκαταλόγων που θα αντικατασταθούν</target> -<source>Number of files and folders that will be deleted</source> -<target>Αριθμός αρχείων και υποκαταλόγων που θα διαγραφούν</target> +<source>Number of files and folders that will be created</source> +<target>Αριθμός αρχείων και υποκαταλόγων που θα δημιουργηθούν</target> <source>Total bytes to copy</source> <target>Συνολικός αριθμός bytes προς αντιγραφή</target> @@ -801,6 +798,15 @@ The command is triggered if: <source>Identify equal files by comparing the file content.</source> <target>Αναγνώριση των ταυτόσημων αρχείων με σύγκριση του περιεχομένου τους.</target> +<source>Ignore time shift (in hours)</source> +<target>Αγνόηση χρονικής μετατόπισης (σε ώρες)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Αρχεία με τη συγκεκριμένη χρονική διαφορά θα θεωρούνται ίδια</target> + +<source>Handle daylight saving time</source> +<target>Διαχείριση θερινής ώρας</target> + <source>Symbolic links:</source> <target>Συμβολικοί δεσμοί:</target> @@ -831,8 +837,8 @@ The command is triggered if: <source>Maximum:</source> <target>Μέγιστο</target> -<source>&Reset</source> -<target>&Επαναφορά</target> +<source>C&lear</source> +<target>&Καθαρισμός</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Επιλογή κανόνων φιλτραρίσματος, ώστε να αποκλειστούν ορισμένα αρχεία από το συγχρονισμό. Εισάγετε τις διαδρομές των αρχείων σχετικά με το αντίστοιχο ζεύγος υποκαταλόγων.</target> @@ -857,20 +863,20 @@ The command is triggered if: <source>Delete files:</source> <target>Διαγραφή αρχείων:</target> -<source>Permanent</source> -<target>Μόνιμα</target> +<source>&Permanent</source> +<target>&Μόνιμη</target> <source>Delete or overwrite files permanently</source> <target>Μόνιμη διαγραφή ή αντικατάσταση των αρχείων</target> -<source>Recycle bin</source> -<target>Κάδος ανακύκλωσης</target> +<source>&Recycle bin</source> +<target>&Κάδος ανακύκλωσης</target> <source>Back up deleted and overwritten files in the recycle bin</source> <target>Μεταφορά όλων των διαγραμμένων και αντικατεστημένων αρχείων στον κάδο ανακύκλωσης.</target> -<source>Versioning</source> -<target>Διατήρηση παλιών εκδόσεων</target> +<source>&Versioning</source> +<target>&Διατήρηση παλιών εκδόσεων</target> <source>Move files to a user-defined folder</source> <target>Μεταφορά αρχείων σε έναν υποκατάλογο που ορίζεται από το χρήστη</target> @@ -881,14 +887,11 @@ The command is triggered if: <source>Handle errors:</source> <target>Χειρισμός σφαλμάτων:</target> -<source>Ignore</source> -<target>Παράβλεψη</target> - <source>Hide all error and warning messages</source> <target>Απόκρυψη όλων των σφαλμάτων και προειδοποιήσεων</target> -<source>Pop-up</source> -<target>Αναδυόμενο μήνυμα</target> +<source>&Pop-up</source> +<target>&Αναδυόμενο</target> <source>Show pop-up on errors or warnings</source> <target>Εμφάνιση αναδυόμενου παράθυρου σε σφάλματα ή προειδοποιήσεις</target> @@ -911,9 +914,6 @@ The command is triggered if: <source>Items found:</source> <target>Βρέθηκαν στοιχεία:</target> -<source>Speed:</source> -<target>Ταχύτητα:</target> - <source>Time remaining:</source> <target>Απομένει χρόνος:</target> @@ -926,6 +926,9 @@ The command is triggered if: <source>Minimize to notification area</source> <target>Ελαχιστοποίηση στην περιοχή ειδοποιήσεων</target> +<source>Bytes copied:</source> +<target>Bytes που αντιγράφτηκαν:</target> + <source>Close</source> <target>Κλείσιμο</target> @@ -938,6 +941,9 @@ 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>Stop synchronization at first error</source> <target>Διακοπή του συγχρονισμού με το πρώτο σφάλμα</target> @@ -956,9 +962,6 @@ The command is triggered if: <source>How can I schedule a batch job?</source> <target>Πώς μπορώ να προγραμματίσω μια εργασία με δέσμη ενεργειών;</target> -<source>&Recycle bin</source> -<target>&Κάδος ανακύκλωσης</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Οι ακόλουθες ρυθμίσεις χρησιμοποιούνται για όλες τις εργασίες συγχρονισμού.</target> @@ -1007,8 +1010,11 @@ This guarantees a consistent state even in case of a serious error. <source>Description</source> <target>Περιγραφή</target> -<source>Restore hidden windows</source> -<target>Επαναφορά των κρυμμένων διαλόγων</target> +<source>Show hidden dialogs again</source> +<target>Επανεμφάνιση των κρυμμένων ειδοποιήσεων</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Επανεμφάνιση όλων των μόνιμα κρυμμένων ειδοποιήσεων και προειδοποιητικών μηνυμάτων</target> <source>&Default</source> <target>&Προεπιλογή</target> @@ -1070,8 +1076,8 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>Κύρια Γραμμή</target> -<source>Compare both sides</source> -<target>Σύγκριση των δύο πλευρών</target> +<source>Start comparison</source> +<target>Έναρξη σύγκρισης</target> <source>Comparison settings</source> <target>Ρυθμίσεις σύγκρισης</target> @@ -1166,9 +1172,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>Επιλέξτε το χρονικό εύρος...</target> -<source>Default view</source> -<target>Προεπιλεγμένη εμφάνιση</target> - <source>Show "%x"</source> <target>Εμφάνιση της γραμμής "%x"</target> @@ -1199,8 +1202,8 @@ This guarantees a consistent state even in case of a serious error. <source>Synchronization Settings</source> <target>Ρυθμίσεις συγχρονισμού</target> -<source>Reset filter</source> -<target>Επαναφορά φίλτρου</target> +<source>Clear filter</source> +<target>Καθαρισμός φίλτρου</target> <source>Show files that exist on left side only</source> <target>Εμφάνιση των αρχείων που υπάρχουν μόνο στα αριστερά</target> @@ -1358,8 +1361,11 @@ This guarantees a consistent state even in case of a serious error. <source>- Other side's counterpart to %item_folder%</source> <target>- Το αντίστοιχο του %item_folder% της άλλης πλευράς</target> -<source>Restore all hidden windows and warnings?</source> -<target>Να γίνει επαναφορά όλων των κρυμμένων μηνυμάτων και προειδοποιήσεων;</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Να εμφανίζονται οι κρυμμένες ειδοποιήσεις και προειδοποιητικά μηνύματα;</target> + +<source>&Show</source> +<target>&Εμφάνιση</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Αναγνώριση και εφαρμογή αλλαγών και στις δυο πλευρές. Οι διαγραφές, οι μεταφορές και οι διενέξεις αναγνωρίζονται αυτόματα με τη βοήθεια μιας βάσης δεδομένων.</target> diff --git a/FreeFileSync/Build/Languages/hebrew.lng b/FreeFileSync/Build/Languages/hebrew.lng index 5fe7bfe9..df907e40 100644 --- a/FreeFileSync/Build/Languages/hebrew.lng +++ b/FreeFileSync/Build/Languages/hebrew.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>המחיצה המתאימה תחשב כריקה.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>מסלול המחיצות הבאות מותנה. שים לב כאשר חוקי הסינכרון מוגדרים:</target> +<source>The following folder paths are dependent from each other:</source> +<target>נתיבי התיקיות הבאים תלויים זה בזה:</target> <source>File %x has an invalid date.</source> <target>קובץ %x מכיל תאריך שגוי.</target> @@ -199,6 +199,24 @@ <source>Update attributes on right</source> <target>עדכן תכונות בצד שמאל</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>בית 1</pluralform> +<pluralform>%x בתים</pluralform> +</target> + +<source>%x MB</source> +<target>%x מגה בייט</target> + +<source>%x KB</source> +<target>%x קילו בייט</target> + +<source>%x GB</source> +<target>%x גיגה בייט</target> + <source>Database file %x is incompatible.</source> <target>קובץ מסד נתונים %x אינו במבנה מתאים.</target> @@ -259,24 +277,6 @@ <source>Total time:</source> <target>זמן כולל:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>בית 1</pluralform> -<pluralform>%x בתים</pluralform> -</target> - -<source>%x MB</source> -<target>%x מגה בייט</target> - -<source>%x KB</source> -<target>%x קילו בייט</target> - -<source>%x GB</source> -<target>%x גיגה בייט</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>שגיאה בפענוח קובץ %x, שורה %y, טור %z.</target> @@ -343,8 +343,8 @@ <source>&Quit</source> <target>&יציאה</target> -<source>&Program</source> -<target>&תוכנה</target> +<source>&File</source> +<target>&קובץ</target> <source>&View help</source> <target>&הראה עזרה</target> @@ -435,9 +435,6 @@ The command is triggered if: <source>&Show error</source> <target>&הראה שגיאה</target> -<source>&Exit</source> -<target>&יציאה</target> - <source>Incorrect command line:</source> <target>שורת פקודה לא תקינה:</target> @@ -501,8 +498,8 @@ The command is triggered if: <source>Data verification error: %x and %y have different content.</source> <target>שגיאת אימות נתונים. ל %x ו %y יש תוכן שונה.</target> -<source>Cannot find %x.</source> -<target>לא מוצא %x.</target> +<source>Cannot find folder %x.</source> +<target>לא מוצא תיקייה %x.</target> <source>Target folder %x already existing.</source> <target>תיקיית מטרה %x כבר קיימת.</target> @@ -531,8 +528,8 @@ The command is triggered if: <source>Available:</source> <target>זמין:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>התיקייה שתשתנה היא חלק מריבוי זוגות תיקיות. אנא סקור מחדש הגדרות סינכרון.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>ריבוי זוגות תיקיות נכתבים לתת תיקייה משותפת. בדוק את הקונפיגורציה שלך.</target> <source>Synchronizing folder pair:</source> <target>מסנכרן זוג תיקיות:</target> @@ -633,8 +630,8 @@ The command is triggered if: <source>Name</source> <target>שם</target> -<source>Relative path</source> -<target>נתיב יחסי</target> +<source>Relative folder</source> +<target>תיקייה יחסית</target> <source>Base folder</source> <target>תיקיית בסיס</target> @@ -655,7 +652,7 @@ The command is triggered if: <target>פעולה</target> <source>Drag && drop</source> -<target></target> +<target>גרור ושחרר</target> <source>Local comparison settings</source> <target>הגדרות השוואה מקומיות</target> @@ -675,8 +672,8 @@ The command is triggered if: <source>Remove local settings</source> <target>הסר הגדרות מקומיות</target> -<source>Reset local filter</source> -<target>אפס מסנן מקומי</target> +<source>Clear local filter</source> +<target>נקה מסנן מקומי</target> <source>Copy</source> <target>העתק</target> @@ -696,11 +693,11 @@ The command is triggered if: <source>Save as &batch job...</source> <target>שמור כעבודת &אצווה</target> -<source>1. &Compare</source> -<target>1. &השווה</target> +<source>Start &comparison</source> +<target>התחל &והשווה</target> -<source>2. &Synchronize</source> -<target>2. &סנכרן</target> +<source>Start &synchronization</source> +<target>התחל &וסנכרן</target> <source>&Options</source> <target>&אפשרויות</target> @@ -711,21 +708,24 @@ The command is triggered if: <source>&Find...</source> <target>&מצא</target> +<source>&Reset layout</source> +<target>&אפס פריסה</target> + <source>&Export file list...</source> <target>&יצא רשימת קבצים...</target> <source>&Tools</source> <target>&כלים</target> +<source>&Check for new version</source> +<target>&בדוק קיום גירסה חדשה</target> + <source>&Check now</source> <target>&בדוק עכשיו</target> <source>Check &automatically once a week</source> <target>בדוק &אוטומטית אחת לשבוע</target> -<source>&Check for new version</source> -<target>&בדוק קיום גירסה חדשה</target> - <source>Cancel</source> <target>בטל</target> @@ -753,18 +753,15 @@ The command is triggered if: <source>Match case</source> <target>התאם רישיות</target> +<source>New</source> +<target>חדש</target> + <source>Open...</source> <target>פתח...</target> <source>Save</source> <target>שמור</target> -<source>Save as GUI job</source> -<target>שמור כמשימת GUI</target> - -<source>Save as batch job</source> -<target>שמור כעבודת אצווה</target> - <source>Save as...</source> <target>שמור כ...</target> @@ -777,14 +774,14 @@ The command is triggered if: <source>Statistics:</source> <target>סטטיסטיקה:</target> -<source>Number of files and folders that will be created</source> -<target>מספר הקבצים והתיקיות שייוצרו</target> +<source>Number of files and folders that will be deleted</source> +<target>מספר הקבצים והתיקיות שימחקו</target> <source>Number of files that will be overwritten</source> <target>מספר הקבצים העומדים להיכתב מחדש</target> -<source>Number of files and folders that will be deleted</source> -<target>מספר הקבצים והתיקיות שימחקו</target> +<source>Number of files and folders that will be created</source> +<target>מספר הקבצים והתיקיות שייוצרו</target> <source>Total bytes to copy</source> <target>סה"כ בתים להעתיק</target> @@ -801,6 +798,15 @@ The command is triggered if: <source>Identify equal files by comparing the file content.</source> <target>זהה קבצים זהים באמצעות השוואת תוכן.</target> +<source>Ignore time shift (in hours)</source> +<target>התעלם מהפרש זמן (שעות)</target> + +<source>Consider file times with specified offset as equal</source> +<target>החשב זמני קובץ עם תזוזת זמן שנקבעה כשווים</target> + +<source>Handle daylight saving time</source> +<target>התמודד עם שעון קיץ</target> + <source>Symbolic links:</source> <target>קישורים סימבוליים:</target> @@ -831,8 +837,8 @@ The command is triggered if: <source>Maximum:</source> <target>מקסימום:</target> -<source>&Reset</source> -<target>&אפס</target> +<source>C&lear</source> +<target>א&פס</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>בחר כללי סינון כדי לא לכלול קבצים מסוימים בסנכרון. הזן את נתיבי הקבצים ביחס לזוג התיקיות בהתאמה.</target> @@ -857,20 +863,20 @@ The command is triggered if: <source>Delete files:</source> <target>מחק קבצים:</target> -<source>Permanent</source> -<target>קבוע</target> +<source>&Permanent</source> +<target>&קבוע</target> <source>Delete or overwrite files permanently</source> <target>מחק או דרוס קבצים לצמיתות</target> -<source>Recycle bin</source> -<target>סל מיחזור</target> +<source>&Recycle bin</source> +<target>&סל מחזור</target> <source>Back up deleted and overwritten files in the recycle bin</source> <target>גבה קבצים שנמחקו או שנדרסו בסל המיחזור</target> -<source>Versioning</source> -<target>עדכון גרסאות</target> +<source>&Versioning</source> +<target>&גרסאות</target> <source>Move files to a user-defined folder</source> <target>העבר קבצים לתיקייה המוגדרת ע"י המפעיל</target> @@ -881,14 +887,11 @@ The command is triggered if: <source>Handle errors:</source> <target>טפל בשגיאות:</target> -<source>Ignore</source> -<target>התעלם</target> - <source>Hide all error and warning messages</source> <target>הסתר את כל הודעות ההזהרה והשגיאה</target> -<source>Pop-up</source> -<target>מוקפץ</target> +<source>&Pop-up</source> +<target>&מוקפץ</target> <source>Show pop-up on errors or warnings</source> <target>הראה חלונות מוקפצים עבור שגיאות או אזהרות</target> @@ -911,9 +914,6 @@ The command is triggered if: <source>Items found:</source> <target>אלמנטים נמצאו:</target> -<source>Speed:</source> -<target>מהירות:</target> - <source>Time remaining:</source> <target>זמן שנשאר:</target> @@ -926,6 +926,9 @@ The command is triggered if: <source>Minimize to notification area</source> <target>הקטן לאיזור ההתרעות</target> +<source>Bytes copied:</source> +<target>בתים שהועתקו:</target> + <source>Close</source> <target>סגור</target> @@ -938,6 +941,9 @@ 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>Stop synchronization at first error</source> <target>עצור סנכרון עם הופעת שגיאה ראשונה</target> @@ -956,9 +962,6 @@ The command is triggered if: <source>How can I schedule a batch job?</source> <target>כיצד לתזמן משימת אצווה?</target> -<source>&Recycle bin</source> -<target>&סל מחזור</target> - <source>The following settings are used for all synchronization jobs.</source> <target>ההגדרות הבאות משמשות לכל משימות הסנכרון.</target> @@ -1007,8 +1010,11 @@ This guarantees a consistent state even in case of a serious error. <source>Description</source> <target>תאור</target> -<source>Restore hidden windows</source> -<target>שחזר חלונות ניסתרים</target> +<source>Show hidden dialogs again</source> +<target>הראה שוב דיאלוגים נסתרים</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>הראה שוב את כל הדיאלוגים והודאות האזהרה המוסתרים באופן קבוע</target> <source>&Default</source> <target>&ברירת מחדל</target> @@ -1070,8 +1076,8 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>סרגל ראשי</target> -<source>Compare both sides</source> -<target>השווה בין שני הצדדים</target> +<source>Start comparison</source> +<target>התחל השוואה</target> <source>Comparison settings</source> <target>הגדרות השוואה</target> @@ -1166,9 +1172,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>בחר תחום זמן...</target> -<source>Default view</source> -<target>תצוגה בתצורת ברירת מחדל</target> - <source>Show "%x"</source> <target>הראה "%x"</target> @@ -1199,8 +1202,8 @@ This guarantees a consistent state even in case of a serious error. <source>Synchronization Settings</source> <target>הגדרות סנכרון</target> -<source>Reset filter</source> -<target>אפס מסנן</target> +<source>Clear filter</source> +<target>נקה מסנן</target> <source>Show files that exist on left side only</source> <target>הראה קבצים הנמצאים אך ורק בצד ימין</target> @@ -1358,8 +1361,11 @@ This guarantees a consistent state even in case of a serious error. <source>- Other side's counterpart to %item_folder%</source> <target>הצד השני המקביל ל %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>האם לשחזר את כל החלונות וההודעות הנסתרות?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>להראות שוב את הדיאלוגים והודעות האזהרה המוסתרים?</target> + +<source>&Show</source> +<target>&הראה</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>זהה והפץ שינויים בשני הצדדים. מחיקות העברות וסתירות מתגלים באופן אוטומטי באמצעות מסד נתונים.</target> diff --git a/FreeFileSync/Build/Languages/hungarian.lng b/FreeFileSync/Build/Languages/hungarian.lng index 9be6e899..2572e61f 100644 --- a/FreeFileSync/Build/Languages/hungarian.lng +++ b/FreeFileSync/Build/Languages/hungarian.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>A kapcsolódó könyvtárat üresként kezeli.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>A következő könyvtárak egymástól függő útvonalat tartalmaznak. Légy óvatos a szinkronizálás szabályainak meghatározásánál!</target> +<source>The following folder paths are dependent from each other:</source> +<target>A következő könyvtárak elérési útvonalai függenek egymástól:</target> <source>File %x has an invalid date.</source> <target>%x fájl dátuma érvénytelen.</target> @@ -199,6 +199,24 @@ <source>Update attributes on right</source> <target>Attribútumok frissítése a jobb oldalon</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>1 bájt</pluralform> +<pluralform>%x bájt</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x kB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>%x adatbázisfájl inkompatibilis: .</target> @@ -259,24 +277,6 @@ <source>Total time:</source> <target>Összes időszükségelet:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>1 bájt</pluralform> -<pluralform>%x bájt</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x kB</target> - -<source>%x GB</source> -<target>%x GB</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> @@ -343,8 +343,8 @@ <source>&Quit</source> <target>&Kilépés</target> -<source>&Program</source> -<target>&Program</target> +<source>&File</source> +<target>&Fájl</target> <source>&View help</source> <target>&Nézd meg a súgót</target> @@ -435,9 +435,6 @@ A parancs végrehajtódik, ha: <source>&Show error</source> <target>&Mutassa a hibákat</target> -<source>&Exit</source> -<target>&Kilép</target> - <source>Incorrect command line:</source> <target>Hibás parancssor:</target> @@ -501,8 +498,8 @@ A parancs végrehajtódik, ha: <source>Data verification error: %x and %y have different content.</source> <target>Adat-ellenőrzési hiba: %x és %y tartalma különböző.</target> -<source>Cannot find %x.</source> -<target>%x nem található.</target> +<source>Cannot find folder %x.</source> +<target>%x könyvtárat nem találom.</target> <source>Target folder %x already existing.</source> <target>%x célkönyvtár már létezik.</target> @@ -531,8 +528,8 @@ A parancs végrehajtódik, ha: <source>Available:</source> <target>Szabad:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Egy olyan könyvtár kerül módosításra, amely több könyvtár-pár része. Kérjük, ellenőrizze a szinkronizálási beállításokat.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Több könyvtár-pár írna egy közös alkönyvtárba. Ellenőrizze a konfigurációját.</target> <source>Synchronizing folder pair:</source> <target>A szinkronizált könyvtár-pár:</target> @@ -633,8 +630,8 @@ A parancs végrehajtódik, ha: <source>Name</source> <target>Név</target> -<source>Relative path</source> -<target>Relatív útvonal</target> +<source>Relative folder</source> +<target>Relatív könyvtár</target> <source>Base folder</source> <target>Alapkönyvtár</target> @@ -675,8 +672,8 @@ A parancs végrehajtódik, ha: <source>Remove local settings</source> <target>Törli a helyi beállításokat</target> -<source>Reset local filter</source> -<target>Visszaállítja a helyi szűrőt</target> +<source>Clear local filter</source> +<target>Törli a helyi szűrőt</target> <source>Copy</source> <target>Másol</target> @@ -696,11 +693,11 @@ A parancs végrehajtódik, ha: <source>Save as &batch job...</source> <target>Mentse &kötegelt feladatként...</target> -<source>1. &Compare</source> -<target>1. &Összehasonlít</target> +<source>Start &comparison</source> +<target>Kezdje az &összehasonlítást</target> -<source>2. &Synchronize</source> -<target>2. &Szinkronizál</target> +<source>Start &synchronization</source> +<target>Kezdje a &szinkronizálást</target> <source>&Options</source> <target>&Beállítások</target> @@ -711,21 +708,24 @@ A parancs végrehajtódik, ha: <source>&Find...</source> <target>Ke&res...</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> +<source>&Check for new version</source> +<target>&Új verzió keresése</target> + <source>&Check now</source> <target>&Ellenőrizze most</target> <source>Check &automatically once a week</source> <target>&Automatikus ellenőrzés hetente</target> -<source>&Check for new version</source> -<target>&Új verzió keresése</target> - <source>Cancel</source> <target>Mégsem</target> @@ -753,18 +753,15 @@ A parancs végrehajtódik, ha: <source>Match case</source> <target>Kis-/nagybetű megkülönböztetése</target> +<source>New</source> +<target>Új</target> + <source>Open...</source> <target>Megnyit...</target> <source>Save</source> <target>Ment</target> -<source>Save as GUI job</source> -<target>Mentse GUI feladatként</target> - -<source>Save as batch job</source> -<target>Mentse kötegelt feladatként</target> - <source>Save as...</source> <target>Mentse mint...</target> @@ -777,14 +774,14 @@ A parancs végrehajtódik, ha: <source>Statistics:</source> <target>Statisztika:</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> +<source>Number of files and folders that will be deleted</source> +<target>A törlendő fájlok és könyvtárak száma</target> <source>Number of files that will be overwritten</source> <target>A felülírandó fájlok száma</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> +<source>Number of files and folders that will be created</source> +<target>A létrehozandó fájlok és könyvtárak száma</target> <source>Total bytes to copy</source> <target>Összesen másolandó bájtok</target> @@ -801,6 +798,15 @@ A parancs végrehajtódik, ha: <source>Identify equal files by comparing the file content.</source> <target>Tartalom összehasonlítása alapján azonosítsa az azonos fájlokat.</target> +<source>Ignore time shift (in hours)</source> +<target>(óra) időkülönbséget figyelmen kívül hagy</target> + +<source>Consider file times with specified offset as equal</source> +<target>A meghatározott eltolású fájlidőket egyenlőnek tekinti</target> + +<source>Handle daylight saving time</source> +<target>Kezelje a nyári időszámítás különbségét</target> + <source>Symbolic links:</source> <target>Szimbolikus linkek:</target> @@ -831,8 +837,8 @@ A parancs végrehajtódik, ha: <source>Maximum:</source> <target>Maximum:</target> -<source>&Reset</source> -<target>&Visszaállít</target> +<source>C&lear</source> +<target>&Töröl</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> @@ -857,20 +863,20 @@ A parancs végrehajtódik, ha: <source>Delete files:</source> <target>Törölje a következő fájlokat:</target> -<source>Permanent</source> -<target>Állandó</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>Recycle bin</source> -<target>Lomtár</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>Versioning</source> -<target>Verziókövetés</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> @@ -881,14 +887,11 @@ A parancs végrehajtódik, ha: <source>Handle errors:</source> <target>A következő hibák kezelése:</target> -<source>Ignore</source> -<target>Figyelmen kívül hagy</target> - <source>Hide all error and warning messages</source> <target>Rejtse el az összes hibaüzenetet és figyelmeztetést</target> -<source>Pop-up</source> -<target>Párbeszédablak</target> +<source>&Pop-up</source> +<target>&Párbeszédablak</target> <source>Show pop-up on errors or warnings</source> <target>Hiba vagy figyelmeztetés esetén mutasson párbeszédablakot</target> @@ -911,9 +914,6 @@ A parancs végrehajtódik, ha: <source>Items found:</source> <target>Talált elemek száma:</target> -<source>Speed:</source> -<target>Sebesség:</target> - <source>Time remaining:</source> <target>Hátralévő idő:</target> @@ -926,6 +926,9 @@ A parancs végrehajtódik, ha: <source>Minimize to notification area</source> <target>Minimalizálja a figyelmeztetési területre</target> +<source>Bytes copied:</source> +<target>Másolt bitek száma:</target> + <source>Close</source> <target>Bezár</target> @@ -938,6 +941,9 @@ A parancs végrehajtódik, ha: <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> +<source>&Stop</source> +<target>&Stop</target> + <source>Stop synchronization at first error</source> <target>Állítsa le a szinkronizálást az első hibánál</target> @@ -956,9 +962,6 @@ A parancs végrehajtódik, ha: <source>How can I schedule a batch job?</source> <target>Hogyan tudok kötegelt feldolgozást ütemezni?</target> -<source>&Recycle bin</source> -<target>Lomtá&r</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> @@ -1007,8 +1010,11 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Description</source> <target>Leírás</target> -<source>Restore hidden windows</source> -<target>Állítsa vissza a rejtett ablakokat</target> +<source>Show hidden dialogs again</source> +<target>Mutassa ismét a rejtett párbeszédablakokat?</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Mutassa újra az összes ideiglenesen rejtett párbeszédablakot és figyelmeztetést</target> <source>&Default</source> <target>&Alapértelmezett</target> @@ -1070,8 +1076,8 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Main Bar</source> <target>Fő sáv</target> -<source>Compare both sides</source> -<target>Vesse össze mindkét oldalt</target> +<source>Start comparison</source> +<target>Kezdje az összehasonlítást</target> <source>Comparison settings</source> <target>Összehasonlítási beállítások</target> @@ -1166,9 +1172,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>Default view</source> -<target>Alapértelmezett nézet</target> - <source>Show "%x"</source> <target>"%x" mutatása</target> @@ -1199,8 +1202,8 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Synchronization Settings</source> <target>Szinkronizálási beállítások</target> -<source>Reset filter</source> -<target>Szűrő visszaállítása</target> +<source>Clear filter</source> +<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> @@ -1358,8 +1361,11 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>- Other side's counterpart to %item_folder%</source> <target>- A másik oldali megfelelőjét a következő könyvtárba: %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Visszaállítsa az összes rejtett ablakot és figyelmeztetést?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Mutassa újra a rejtett párbeszédablakokat és figyelmeztetéseket</target> + +<source>&Show</source> +<target>&Mutat</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> diff --git a/FreeFileSync/Build/Languages/italian.lng b/FreeFileSync/Build/Languages/italian.lng index be2b3b2b..a3c08e19 100644 --- a/FreeFileSync/Build/Languages/italian.lng +++ b/FreeFileSync/Build/Languages/italian.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>La cartella corrispondente sarà considerata come vuota.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Le seguenti cartelle hanno percorsi dipendenti. Fare attenzione quando si imposta le regole di sincronizzazione:</target> +<source>The following folder paths are dependent from each other:</source> +<target>I seguenti percorsi delle cartelle sono dipendenti gli uni dagli altri:</target> <source>File %x has an invalid date.</source> <target>Il file %x ha una data non valida.</target> @@ -199,6 +199,24 @@ <source>Update attributes on right</source> <target>Aggiorna attributi a destra</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>1 byte</pluralform> +<pluralform>%x byte</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>Il file del database %x non è compatibile.</target> @@ -259,24 +277,6 @@ <source>Total time:</source> <target>Tempo totale:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>1 byte</pluralform> -<pluralform>%x byte</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Errore nel parsing del file %x, riga %y, colonna %z.</target> @@ -343,8 +343,8 @@ <source>&Quit</source> <target>&Esci</target> -<source>&Program</source> -<target>&Programma</target> +<source>&File</source> +<target>&File</target> <source>&View help</source> <target>&Vedere aiuto</target> @@ -435,9 +435,6 @@ Il comando è attivato se: <source>&Show error</source> <target>&Mostra errore</target> -<source>&Exit</source> -<target>&Esci</target> - <source>Incorrect command line:</source> <target>Linea di comando non corretta:</target> @@ -501,8 +498,8 @@ Il comando è attivato se: <source>Data verification error: %x and %y have different content.</source> <target>Dati di verifica errore: %x e %y hanno un contenuto diverso.</target> -<source>Cannot find %x.</source> -<target>Impossibile trovare %x.</target> +<source>Cannot find folder %x.</source> +<target>Impossibile trovare la cartella %x.</target> <source>Target folder %x already existing.</source> <target>La cartella di destinazione %x è già esistente.</target> @@ -531,8 +528,8 @@ Il comando è attivato se: <source>Available:</source> <target>Disponibile:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Verrà modificata una cartella che è parte di molte coppie di cartelle. Controlla le impostazioni di sincronizzazione.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Diverse coppie di cartelle scrivono in una sottocartella comune. Si prega di rivedere la configurazione.</target> <source>Synchronizing folder pair:</source> <target>Sincronizzazione della coppia di cartelle:</target> @@ -633,8 +630,8 @@ Il comando è attivato se: <source>Name</source> <target>Nome</target> -<source>Relative path</source> -<target>Percorso relativo</target> +<source>Relative folder</source> +<target>Cartella relativa</target> <source>Base folder</source> <target>Cartella di partenza</target> @@ -675,8 +672,8 @@ Il comando è attivato se: <source>Remove local settings</source> <target>Rimuovere le impostazioni locali</target> -<source>Reset local filter</source> -<target>Azzera filtro locale</target> +<source>Clear local filter</source> +<target>Cancella Filtro locale</target> <source>Copy</source> <target>Copia</target> @@ -696,11 +693,11 @@ Il comando è attivato se: <source>Save as &batch job...</source> <target>Salva come &processo batch...</target> -<source>1. &Compare</source> -<target>1. &Compara</target> +<source>Start &comparison</source> +<target>Avvio &confronto</target> -<source>2. &Synchronize</source> -<target>2. &Sincronizza</target> +<source>Start &synchronization</source> +<target>Avvio &sincronizzazione</target> <source>&Options</source> <target>&Opzioni</target> @@ -711,6 +708,9 @@ 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> @@ -753,18 +753,15 @@ Il comando è attivato se: <source>Match case</source> <target>Corrispondenza</target> +<source>New</source> +<target>Nuovo</target> + <source>Open...</source> <target>Apri...</target> <source>Save</source> <target>Salva</target> -<source>Save as GUI job</source> -<target>Salva come lavoro GUI</target> - -<source>Save as batch job</source> -<target>Salva come processo batch</target> - <source>Save as...</source> <target>Salva come ...</target> @@ -777,14 +774,14 @@ Il comando è attivato se: <source>Statistics:</source> <target>Statistiche:</target> -<source>Number of files and folders that will be created</source> -<target>Numero di file e cartelle che verranno creati</target> +<source>Number of files and folders that will be deleted</source> +<target>Numero di file e cartelle che verranno eliminati</target> <source>Number of files that will be overwritten</source> <target>Numero di file che verranno sovrascritti</target> -<source>Number of files and folders that will be deleted</source> -<target>Numero di file e cartelle che verranno eliminati</target> +<source>Number of files and folders that will be created</source> +<target>Numero di file e cartelle che verranno creati</target> <source>Total bytes to copy</source> <target>Bytes totali da copiare</target> @@ -801,6 +798,15 @@ Il comando è attivato se: <source>Identify equal files by comparing the file content.</source> <target>Identificare i file uguali confrontando il contenuto del file.</target> +<source>Ignore time shift (in hours)</source> +<target>Ignora tempo spostamento (in ore)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Considerare i tempi dei file con specifico offset o uguale</target> + +<source>Handle daylight saving time</source> +<target>Maneggiare l'ora legale</target> + <source>Symbolic links:</source> <target>Link simbolici:</target> @@ -831,8 +837,8 @@ Il comando è attivato se: <source>Maximum:</source> <target>Massimo:</target> -<source>&Reset</source> -<target>&Ripristina</target> +<source>C&lear</source> +<target>Cance&lla</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Selezionare le regole del filtro per escludere alcuni file dalla sincronizzazione. Immettere i percorsi dei file relativi alla loro corrispondente coppia di cartelle.</target> @@ -857,20 +863,20 @@ Il comando è attivato se: <source>Delete files:</source> <target>Eliminare i file:</target> -<source>Permanent</source> -<target>Permanente</target> +<source>&Permanent</source> +<target>&Permanente</target> <source>Delete or overwrite files permanently</source> <target>Elimina o sovrascrivi i file definitivamente</target> -<source>Recycle bin</source> -<target>Cestino</target> +<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>Versioning</source> -<target>Versione</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> @@ -881,14 +887,11 @@ Il comando è attivato se: <source>Handle errors:</source> <target>Gestire gli errori:</target> -<source>Ignore</source> -<target>Ignora</target> - <source>Hide all error and warning messages</source> <target>Nascondi tutti gli errori e i messaggi d'avviso</target> -<source>Pop-up</source> -<target>Pop-up</target> +<source>&Pop-up</source> +<target>&Pop-up</target> <source>Show pop-up on errors or warnings</source> <target>Mostra pop-up di errore o avviso</target> @@ -923,6 +926,9 @@ Il comando è attivato se: <source>Minimize to notification area</source> <target>Ridurre al minimo l'area di notifica</target> +<source>Bytes copied:</source> +<target>Byte copiati:</target> + <source>Close</source> <target>Chiudi</target> @@ -935,6 +941,9 @@ 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>Stop synchronization at first error</source> <target>Interrompere la sincronizzazione al primo errore</target> @@ -953,9 +962,6 @@ Il comando è attivato se: <source>How can I schedule a batch job?</source> <target>Come posso programmare un lavoro batch?</target> -<source>&Recycle bin</source> -<target>&Cestino</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Le seguenti impostazioni vengono utilizzate per tutti i processi di sincronizzazione.</target> @@ -1004,8 +1010,11 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Description</source> <target>Descrizione</target> -<source>Restore hidden windows</source> -<target>Ripristina le finestre nascoste</target> +<source>Show hidden dialogs again</source> +<target>Mostra di nuovo le finestre di dialogo nascoste</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Mostra di nuovo tutti i dialoghi nascosti in modo permanente e i messaggi di allarme</target> <source>&Default</source> <target>&Predefinito</target> @@ -1067,8 +1076,8 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Main Bar</source> <target>Barra Principale</target> -<source>Compare both sides</source> -<target>Confronta entrambi i lati</target> +<source>Start comparison</source> +<target>Avviare confronto</target> <source>Comparison settings</source> <target>Impostazioni di comparazione</target> @@ -1163,9 +1172,6 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Select time span...</source> <target>Seleziona intervallo di tempo...</target> -<source>Default view</source> -<target>Vista predefinita</target> - <source>Show "%x"</source> <target>Mostra "%x"</target> @@ -1196,8 +1202,8 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Synchronization Settings</source> <target>Impostazioni di Sincronizzazione</target> -<source>Reset filter</source> -<target>Azzera il filtro</target> +<source>Clear filter</source> +<target>Eliminare filtro</target> <source>Show files that exist on left side only</source> <target>Mostra file esistenti solo a sinistra</target> @@ -1355,8 +1361,11 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>- Other side's counterpart to %item_folder%</source> <target>- Omologo dell'altro lato a %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Ripristina tutte le finestre nascoste e gli avvisi?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Mostra di nuovo dialoghi nascosti e messaggi di avviso?</target> + +<source>&Show</source> +<target>&Mostra</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Identifica e propaga cambiamenti su entrambi i lati. Cancellazioni, spostamenti e conflitti sono identificati automaticamente usando un database.</target> diff --git a/FreeFileSync/Build/Languages/japanese.lng b/FreeFileSync/Build/Languages/japanese.lng index 70012102..dd8c6a0e 100644 --- a/FreeFileSync/Build/Languages/japanese.lng +++ b/FreeFileSync/Build/Languages/japanese.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>対応するフォルダは空であるとみなされます</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>以下のフォルダには、依存関係にあるパスが存在します。同期規則を設定する時は慎重に行ってください:</target> +<source>The following folder paths are dependent from each other:</source> +<target>以下のフォルダパスは互いに依存関係にあります。</target> <source>File %x has an invalid date.</source> <target>ファイル %x の日付は無効なものです.</target> @@ -199,6 +199,23 @@ <source>Update attributes on right</source> <target>右の属性を更新</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>%x バイト</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>データベース %x とは互換性がありません.</target> @@ -258,23 +275,6 @@ <source>Total time:</source> <target>合計時間:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>%x バイト</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>ファイル %x の構文解析エラー, 行 %y, 列 %z.</target> @@ -340,8 +340,8 @@ <source>&Quit</source> <target>終了(&Q)</target> -<source>&Program</source> -<target>プログラム(&P)</target> +<source>&File</source> +<target>ファイル(&F)</target> <source>&View help</source> <target>ヘルプを表示(&V)</target> @@ -432,9 +432,6 @@ The command is triggered if: <source>&Show error</source> <target>エラー表示(&S)</target> -<source>&Exit</source> -<target>終了(&E)</target> - <source>Incorrect command line:</source> <target>不正なコマンドライン:</target> @@ -498,8 +495,8 @@ The command is triggered if: <source>Data verification error: %x and %y have different content.</source> <target>データ検証エラー: %x と %y には異なる内容が含まれています.</target> -<source>Cannot find %x.</source> -<target>%x が見つかりません</target> +<source>Cannot find folder %x.</source> +<target>%x フォルダがみつかりません</target> <source>Target folder %x already existing.</source> <target>対象フォルダ %x は既に存在します.</target> @@ -528,8 +525,8 @@ The command is triggered if: <source>Available:</source> <target>利用可能:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>複数フォルダペアの一部であるフォルダが変更されています. 同期設定を確認してください.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>共通サブフォルダに複数フォルダペアの書き込みがあります。構成を確認してください。</target> <source>Synchronizing folder pair:</source> <target>フォルダペアを同期処理:</target> @@ -629,8 +626,8 @@ The command is triggered if: <source>Name</source> <target>名前</target> -<source>Relative path</source> -<target>相対パス</target> +<source>Relative folder</source> +<target>相対フォルダ</target> <source>Base folder</source> <target>基準フォルダ</target> @@ -671,8 +668,8 @@ The command is triggered if: <source>Remove local settings</source> <target>ローカルの設定を除去</target> -<source>Reset local filter</source> -<target>ローカルフィルターをリセット</target> +<source>Clear local filter</source> +<target>ローカルフィルタをクリア</target> <source>Copy</source> <target>コピー</target> @@ -692,11 +689,11 @@ The command is triggered if: <source>Save as &batch job...</source> <target>一括ジョブで保存(&B)...</target> -<source>1. &Compare</source> -<target>1. 比較(&C)</target> +<source>Start &comparison</source> +<target>比較を開始(&C)</target> -<source>2. &Synchronize</source> -<target>2. 同期処理(&S)</target> +<source>Start &synchronization</source> +<target>同期を開始(&S)</target> <source>&Options</source> <target>設定(&O)</target> @@ -707,21 +704,24 @@ 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>&Tools</source> <target>ツール(&T)</target> +<source>&Check for new version</source> +<target>新バージョンの確認(&C)</target> + <source>&Check now</source> <target>今すぐ確認(&C)</target> <source>Check &automatically once a week</source> <target>週に一回、自動的に確認する(&A)</target> -<source>&Check for new version</source> -<target>新バージョンの確認(&C)</target> - <source>Cancel</source> <target>キャンセル</target> @@ -749,18 +749,15 @@ The command is triggered if: <source>Match case</source> <target>文字種を区別</target> +<source>New</source> +<target>新規</target> + <source>Open...</source> <target>開く...</target> <source>Save</source> <target>保存</target> -<source>Save as GUI job</source> -<target>GUI ジョブで保存</target> - -<source>Save as batch job</source> -<target>一括ジョブで保存</target> - <source>Save as...</source> <target>別名保存...</target> @@ -773,14 +770,14 @@ The command is triggered if: <source>Statistics:</source> <target>統計情報:</target> -<source>Number of files and folders that will be created</source> -<target>作成されたファイル、およびフォルダの数</target> +<source>Number of files and folders that will be deleted</source> +<target>削除されたファイル、およびフォルダの数</target> <source>Number of files that will be overwritten</source> <target>上書きされたファイルの数</target> -<source>Number of files and folders that will be deleted</source> -<target>削除されたファイル、およびフォルダの数</target> +<source>Number of files and folders that will be created</source> +<target>作成されたファイル、およびフォルダの数</target> <source>Total bytes to copy</source> <target>コピーの合計バイト</target> @@ -797,6 +794,15 @@ The command is triggered if: <source>Identify equal files by comparing the file content.</source> <target>ファイルの内容を比較して、同一ファイルを識別します</target> +<source>Ignore time shift (in hours)</source> +<target>指定時間内のズレは無視</target> + +<source>Consider file times with specified offset as equal</source> +<target>指定されたオフセット値でファイル時刻を考慮</target> + +<source>Handle daylight saving time</source> +<target>夏時間の取り扱い</target> + <source>Symbolic links:</source> <target>シンボリック リンク:</target> @@ -827,8 +833,8 @@ The command is triggered if: <source>Maximum:</source> <target>最大:</target> -<source>&Reset</source> -<target>リセット(&R)</target> +<source>C&lear</source> +<target>クリア(&L)</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>同期処理から特定のファイルを除外するためのフィルター規則を選択、対応するそれらフォルダ ペアからの相対ファイルパスを入力します.</target> @@ -853,20 +859,20 @@ The command is triggered if: <source>Delete files:</source> <target>ファイルの削除:</target> -<source>Permanent</source> -<target>完全消去</target> +<source>&Permanent</source> +<target>完全消去(&P)</target> <source>Delete or overwrite files permanently</source> -<target>ファイルを上書き/または完全に削除します</target> +<target>ファイルを上書き/または完全に消去します</target> -<source>Recycle bin</source> -<target>ゴミ箱</target> +<source>&Recycle bin</source> +<target>ゴミ箱(&R)</target> <source>Back up deleted and overwritten files in the recycle bin</source> <target>ファイルを削除/上書きする時に、ゴミ箱にバックアップをとる</target> -<source>Versioning</source> -<target>バージョン管理</target> +<source>&Versioning</source> +<target>バージョン管理(&V)</target> <source>Move files to a user-defined folder</source> <target>ユーザ定義のフォルダにファイルを移動</target> @@ -877,14 +883,11 @@ The command is triggered if: <source>Handle errors:</source> <target>エラーの取り扱い:</target> -<source>Ignore</source> -<target>無視</target> - <source>Hide all error and warning messages</source> <target>すべてのエラーと警告メッセージを非表示</target> -<source>Pop-up</source> -<target>ポップアップ</target> +<source>&Pop-up</source> +<target>ポップアップ(&P)</target> <source>Show pop-up on errors or warnings</source> <target>エラーと警告をポップアップで表示</target> @@ -907,9 +910,6 @@ The command is triggered if: <source>Items found:</source> <target>見つかった要素:</target> -<source>Speed:</source> -<target>速度:</target> - <source>Time remaining:</source> <target>残り時間:</target> @@ -922,6 +922,9 @@ The command is triggered if: <source>Minimize to notification area</source> <target>通知領域に最小化</target> +<source>Bytes copied:</source> +<target>バイトをコピー済:</target> + <source>Close</source> <target>閉じる</target> @@ -934,6 +937,9 @@ 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>Stop synchronization at first error</source> <target>最初のエラーで同期処理を停止</target> @@ -952,9 +958,6 @@ The command is triggered if: <source>How can I schedule a batch job?</source> <target>一括ジョブ スケジュールの作成方法</target> -<source>&Recycle bin</source> -<target>ゴミ箱(&R)</target> - <source>The following settings are used for all synchronization jobs.</source> <target>以下の設定は、すべての同期ジョブで使用されます</target> @@ -1003,8 +1006,11 @@ This guarantees a consistent state even in case of a serious error. <source>Description</source> <target>説明</target> -<source>Restore hidden windows</source> -<target>非表示ウィンドウを復帰</target> +<source>Show hidden dialogs again</source> +<target>非表示のダイアログを再表示</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>非表示にしたすべてのダイアログと警告メッセージを再表示</target> <source>&Default</source> <target>デフォルト(&D)</target> @@ -1066,8 +1072,8 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>メインバー</target> -<source>Compare both sides</source> -<target>両方を比較</target> +<source>Start comparison</source> +<target>比較を開始</target> <source>Comparison settings</source> <target>比較設定</target> @@ -1158,9 +1164,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>タイムスパンを選択...</target> -<source>Default view</source> -<target>デフォルト表示</target> - <source>Show "%x"</source> <target>"%x" で表示</target> @@ -1191,8 +1194,8 @@ This guarantees a consistent state even in case of a serious error. <source>Synchronization Settings</source> <target>同期の設定</target> -<source>Reset filter</source> -<target>フィルターをリセット</target> +<source>Clear filter</source> +<target>フィルタをクリア</target> <source>Show files that exist on left side only</source> <target>左側のみに存在するファイルを表示</target> @@ -1264,7 +1267,7 @@ This guarantees a consistent state even in case of a serious error. <target>進捗ダイアログを閉じる</target> <source>Standby</source> -<target>スタンバイ</target> +<target>スリープ</target> <source>Log off</source> <target>ログオフ</target> @@ -1348,8 +1351,11 @@ This guarantees a consistent state even in case of a serious error. <source>- Other side's counterpart to %item_folder%</source> <target>- %item_folder% の反対側の対象</target> -<source>Restore all hidden windows and warnings?</source> -<target>すべての非表示ウィンドウと警告を元に戻しますか?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>非表示のダイアログと警告を再表示しますか?</target> + +<source>&Show</source> +<target>表示(&S)</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>変更箇所を識別して両側に変更を反映します。データベースを使用することで、削除/移動/競合などは自動的に検出されます。</target> @@ -1376,13 +1382,13 @@ This guarantees a consistent state even in case of a serious error. <target>今日</target> <source>This week</source> -<target>この週</target> +<target>今週</target> <source>This month</source> -<target>この月</target> +<target>今月</target> <source>This year</source> -<target>この年</target> +<target>今年</target> <source>Last x days</source> <target>最後の x 日</target> diff --git a/FreeFileSync/Build/Languages/korean.lng b/FreeFileSync/Build/Languages/korean.lng index e4d92ed2..08385610 100644 --- a/FreeFileSync/Build/Languages/korean.lng +++ b/FreeFileSync/Build/Languages/korean.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>해당 폴더를 비어 있는 상태로 간주합니다.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>다음 폴더들에는 종속 경로가 있습니다. 동기화 규칙을 설정 시 주의하시기 바랍니다:</target> +<source>The following folder paths are dependent from each other:</source> +<target>다음 폴더 경로들은 상호 의존 관계에 있습니다:</target> <source>File %x has an invalid date.</source> <target>파일 %x 의 날짜가 유효하지 않습니다.</target> @@ -199,6 +199,23 @@ <source>Update attributes on right</source> <target>우측 속성 업데이트</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>%x 바이트</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>데이터베이스 파일 %x 은(는) 호환 불가능합니다.</target> @@ -258,23 +275,6 @@ <source>Total time:</source> <target>전체 시간:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>%x 바이트</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>분석 오류 - 파일: %x; 행: %y; 열: %z</target> @@ -340,8 +340,8 @@ <source>&Quit</source> <target>종료(&Q)</target> -<source>&Program</source> -<target>프로그램(&P)</target> +<source>&File</source> +<target>파일(&F)</target> <source>&View help</source> <target>도움말 보기(&V)</target> @@ -432,9 +432,6 @@ The command is triggered if: <source>&Show error</source> <target>오류 표시(&S)</target> -<source>&Exit</source> -<target>나가기(&E)</target> - <source>Incorrect command line:</source> <target>부정확한 명령줄:</target> @@ -498,8 +495,8 @@ The command is triggered if: <source>Data verification error: %x and %y have different content.</source> <target>데이터 확인 오류: %x 및 %y 의 내용이 서로 다릅니다.</target> -<source>Cannot find %x.</source> -<target>%x을(를) 찾을 수 없습니다.</target> +<source>Cannot find folder %x.</source> +<target>%x 폴더를 찾을 수 없습니다.</target> <source>Target folder %x already existing.</source> <target>대상 폴더 %x이(가) 이미 존재함.</target> @@ -528,8 +525,8 @@ The command is triggered if: <source>Available:</source> <target>여유 공간(크기):</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>다중 폴더 페어의 일부인 폴더가 변경됩니다. 동기화 설정을 재검토하세요.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>공통 하위 폴더에 다중 폴더 페어를 기록합니다. 구성을 재검토 하시기 바랍니다.</target> <source>Synchronizing folder pair:</source> <target>폴더 페어 동기화 진행 중</target> @@ -629,8 +626,8 @@ The command is triggered if: <source>Name</source> <target>이름</target> -<source>Relative path</source> -<target>대상 경로</target> +<source>Relative folder</source> +<target>대상 폴더</target> <source>Base folder</source> <target>기본 폴더</target> @@ -671,8 +668,8 @@ The command is triggered if: <source>Remove local settings</source> <target>로컬 설정 제거</target> -<source>Reset local filter</source> -<target>로컬 필터 재설정(리셋)</target> +<source>Clear local filter</source> +<target>로컬 필터 제거</target> <source>Copy</source> <target>복사</target> @@ -684,7 +681,7 @@ The command is triggered if: <target>로컬 동기화 설정</target> <source>&New</source> -<target>신규 작업(&N)</target> +<target>새로 만들기(&N)</target> <source>&Save</source> <target>저장(&S)</target> @@ -692,11 +689,11 @@ The command is triggered if: <source>Save as &batch job...</source> <target>일괄 작업으로 저장(&b)</target> -<source>1. &Compare</source> -<target>1. 비교(&C)</target> +<source>Start &comparison</source> +<target>비교 시작(&C)</target> -<source>2. &Synchronize</source> -<target>2. 동기화(&S)</target> +<source>Start &synchronization</source> +<target>동기화 시작(&S)</target> <source>&Options</source> <target>옵션(&O)</target> @@ -707,21 +704,24 @@ 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>&Tools</source> <target>도구(&T)</target> +<source>&Check for new version</source> +<target>신규 버전 확인(&C)</target> + <source>&Check now</source> <target>지금 확인(&C)</target> <source>Check &automatically once a week</source> <target>자동으로 주당 1회 확인(&a)</target> -<source>&Check for new version</source> -<target>신규 버전 확인(&C)</target> - <source>Cancel</source> <target>취소</target> @@ -749,18 +749,15 @@ The command is triggered if: <source>Match case</source> <target>대문자/소문자 구분</target> +<source>New</source> +<target>새로 만들기</target> + <source>Open...</source> <target>열기</target> <source>Save</source> <target>저장</target> -<source>Save as GUI job</source> -<target>GUI 작업으로 저장</target> - -<source>Save as batch job</source> -<target>일괄 작업으로 저장</target> - <source>Save as...</source> <target>다른 이름으로 저장</target> @@ -773,14 +770,14 @@ The command is triggered if: <source>Statistics:</source> <target>통계:</target> -<source>Number of files and folders that will be created</source> -<target>생성될 파일 및 폴더 개수</target> +<source>Number of files and folders that will be deleted</source> +<target>삭제될 파일 및 폴더 개수</target> <source>Number of files that will be overwritten</source> <target>덮어 씌어질 파일 개수</target> -<source>Number of files and folders that will be deleted</source> -<target>삭제될 파일 및 폴더 개수</target> +<source>Number of files and folders that will be created</source> +<target>생성될 파일 및 폴더 개수</target> <source>Total bytes to copy</source> <target>복사할 전체 바이트 크기</target> @@ -797,6 +794,15 @@ The command is triggered if: <source>Identify equal files by comparing the file content.</source> <target>파일 내용을 비교하여 동일한 파일을 식별</target> +<source>Ignore time shift (in hours)</source> +<target>타임 쉬프트 무시 (시간 단위)</target> + +<source>Consider file times with specified offset as equal</source> +<target>특정 오프셋 파일 시간은 동일한 것으로 간주</target> + +<source>Handle daylight saving time</source> +<target>서머타임 설정</target> + <source>Symbolic links:</source> <target>심볼링 링크:</target> @@ -827,8 +833,8 @@ The command is triggered if: <source>Maximum:</source> <target>최대:</target> -<source>&Reset</source> -<target>리셋(&R)</target> +<source>C&lear</source> +<target>제거(&l)</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>동기화에서 특정 파일을 제외시키는 필터 규칙을 선택합니다. 해당 폴더 페어에 대한 상대 파일 경로를 입력하세요.</target> @@ -853,20 +859,20 @@ The command is triggered if: <source>Delete files:</source> <target>파일 삭제:</target> -<source>Permanent</source> -<target>영구</target> +<source>&Permanent</source> +<target>영구(&P)</target> <source>Delete or overwrite files permanently</source> <target>파일 영구 삭제 또는 덮어쓰기</target> -<source>Recycle bin</source> -<target>휴지통</target> +<source>&Recycle bin</source> +<target>휴지통(&R)</target> <source>Back up deleted and overwritten files in the recycle bin</source> <target>휴지통에 삭제되고 덮어 씌어진 파일 백업</target> -<source>Versioning</source> -<target>버저닝</target> +<source>&Versioning</source> +<target>버저닝(&V)</target> <source>Move files to a user-defined folder</source> <target>사용자 정의 폴더로 파일 이동</target> @@ -877,14 +883,11 @@ The command is triggered if: <source>Handle errors:</source> <target>오류 발생시:</target> -<source>Ignore</source> -<target>무시</target> - <source>Hide all error and warning messages</source> <target>모든 오류/경고 메세지 숨기기</target> -<source>Pop-up</source> -<target>팝업</target> +<source>&Pop-up</source> +<target>팝업(&P)</target> <source>Show pop-up on errors or warnings</source> <target>오류 또는 경고에 대한 팝업 보이기</target> @@ -907,9 +910,6 @@ The command is triggered if: <source>Items found:</source> <target>발견된 항목:</target> -<source>Speed:</source> -<target>속도:</target> - <source>Time remaining:</source> <target>남은 시간:</target> @@ -922,6 +922,9 @@ The command is triggered if: <source>Minimize to notification area</source> <target>알림 영역으로 최소화</target> +<source>Bytes copied:</source> +<target>복사된 바이트:</target> + <source>Close</source> <target>닫기</target> @@ -934,6 +937,9 @@ 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>Stop synchronization at first error</source> <target>첫 오류 발생 시 동기화 중지</target> @@ -952,9 +958,6 @@ The command is triggered if: <source>How can I schedule a batch job?</source> <target>일괄 작업 예약 방법은?</target> -<source>&Recycle bin</source> -<target>휴지통(&R)</target> - <source>The following settings are used for all synchronization jobs.</source> <target>다음 설정은 모든 동기화 작업에 사용됩니다.</target> @@ -1003,8 +1006,11 @@ This guarantees a consistent state even in case of a serious error. <source>Description</source> <target>설명</target> -<source>Restore hidden windows</source> -<target>숨겨진 창 복원</target> +<source>Show hidden dialogs again</source> +<target>숨겨진 대화창 다시 보이기</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>영구적으로 숨겨진 모든 대화창 및 경고 메세지 다시 보이기</target> <source>&Default</source> <target>기본 설정/값(&D)</target> @@ -1066,8 +1072,8 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>메인 바</target> -<source>Compare both sides</source> -<target>양측 비교</target> +<source>Start comparison</source> +<target>비교 시작</target> <source>Comparison settings</source> <target>비교 설정</target> @@ -1158,9 +1164,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>시간간격(타임스팬) 선택...</target> -<source>Default view</source> -<target>기본 보기</target> - <source>Show "%x"</source> <target>"%x" 표시</target> @@ -1191,8 +1194,8 @@ This guarantees a consistent state even in case of a serious error. <source>Synchronization Settings</source> <target>동기화 설정</target> -<source>Reset filter</source> -<target>필터 재설정(리셋)</target> +<source>Clear filter</source> +<target>필터 제거</target> <source>Show files that exist on left side only</source> <target>좌측에만 존재하는 파일 표시</target> @@ -1348,8 +1351,11 @@ This guarantees a consistent state even in case of a serious error. <source>- Other side's counterpart to %item_folder%</source> <target>% 항목_폴더 %의 반대편 대응부(카운터파트)</target> -<source>Restore all hidden windows and warnings?</source> -<target>모든 숨겨진 창 및 경고를 복원하시겠습니까?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>숨겨진 모든 대화창 및 경고 메세지를 다시 보시겠습니까?</target> + +<source>&Show</source> +<target>표시/보이기(&S)</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>양측 변경사항을 확인하고 전달. 삭제, 이동 및 충돌은 데이터베이스를 통해 자동으로 감지됩니다.</target> diff --git a/FreeFileSync/Build/Languages/lithuanian.lng b/FreeFileSync/Build/Languages/lithuanian.lng index 178a8b96..69ac63f8 100644 --- a/FreeFileSync/Build/Languages/lithuanian.lng +++ b/FreeFileSync/Build/Languages/lithuanian.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Atitinkamas aplankas bus laikomas tuščiu.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Šie katalogai turi tarpusavyje susijusių kelių. Būkite atsargūs nustatydami sinchronizacijos taisykles:</target> +<source>The following folder paths are dependent from each other:</source> +<target></target> <source>File %x has an invalid date.</source> <target>Failas %x turi netinkamą datą.</target> @@ -199,6 +199,25 @@ <source>Update attributes on right</source> <target>Atnaujinti atributus dešinėje</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>%x baitas</pluralform> +<pluralform>%x baitai</pluralform> +<pluralform>%x baitų</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>Duomenų bazė %x yra netinkama.</target> @@ -260,25 +279,6 @@ <source>Total time:</source> <target>Visas laikas:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>%x baitas</pluralform> -<pluralform>%x baitai</pluralform> -<pluralform>%x baitų</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Klaida trinant failą %x, eilė %y, stulpelis %z.</target> @@ -346,8 +346,8 @@ <source>&Quit</source> <target>&Išeiti</target> -<source>&Program</source> -<target>&Programa</target> +<source>&File</source> +<target></target> <source>&View help</source> <target>&Rodyti pagalbą</target> @@ -438,9 +438,6 @@ Komanda inicijuojama jei: <source>&Show error</source> <target>&Parodyti klaidą</target> -<source>&Exit</source> -<target>&Išeiti</target> - <source>Incorrect command line:</source> <target>Netaisyklinga Komandinė eilutė:</target> @@ -504,8 +501,8 @@ Komanda inicijuojama jei: <source>Data verification error: %x and %y have different content.</source> <target>Duomenų patikros klaida: %x ir %y turinys yra skirtingas.</target> -<source>Cannot find %x.</source> -<target>Nepavyko rasti %x.</target> +<source>Cannot find folder %x.</source> +<target></target> <source>Target folder %x already existing.</source> <target>Tikslo aplankas %x jau yra.</target> @@ -534,8 +531,8 @@ Komanda inicijuojama jei: <source>Available:</source> <target>Pasiekiama:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Aplankas, kuris yra dalis keletos aplankų porų, bus pakeistas. Prašome peržiūrėti sinchronizavimo nustatymus.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target></target> <source>Synchronizing folder pair:</source> <target>Suvienodinama aplankų pora:</target> @@ -637,8 +634,8 @@ Komanda inicijuojama jei: <source>Name</source> <target>Pavadinimas</target> -<source>Relative path</source> -<target>Elemento kelias</target> +<source>Relative folder</source> +<target></target> <source>Base folder</source> <target>Bazinis aplankas</target> @@ -679,8 +676,8 @@ Komanda inicijuojama jei: <source>Remove local settings</source> <target>Pašalinti vietinius parametrus</target> -<source>Reset local filter</source> -<target>Iš naujo nustatyti vietinį filtrą</target> +<source>Clear local filter</source> +<target></target> <source>Copy</source> <target>Kopijuoti</target> @@ -700,11 +697,11 @@ Komanda inicijuojama jei: <source>Save as &batch job...</source> <target>Išsaugoti kaip &užduočių paketą...</target> -<source>1. &Compare</source> -<target>1. &Palyginti</target> +<source>Start &comparison</source> +<target></target> -<source>2. &Synchronize</source> -<target>2. &Suvienodinti</target> +<source>Start &synchronization</source> +<target></target> <source>&Options</source> <target>&Parinktys</target> @@ -715,21 +712,24 @@ Komanda inicijuojama jei: <source>&Find...</source> <target>&Ieškoti...</target> +<source>&Reset layout</source> +<target></target> + <source>&Export file list...</source> <target>&Eksportuoti failų sąrašą...</target> <source>&Tools</source> <target>&Įrankiai</target> +<source>&Check for new version</source> +<target>&Naujasnės versijos tikrinimas</target> + <source>&Check now</source> <target>&Tikrinti dabar</target> <source>Check &automatically once a week</source> <target>Tikrinti &automatiškai kartą per savaitę</target> -<source>&Check for new version</source> -<target>&Naujasnės versijos tikrinimas</target> - <source>Cancel</source> <target>Atšaukti</target> @@ -757,18 +757,15 @@ Komanda inicijuojama jei: <source>Match case</source> <target>Atitikti atveją</target> +<source>New</source> +<target></target> + <source>Open...</source> <target>Atversti...</target> <source>Save</source> <target>Išsaugoti</target> -<source>Save as GUI job</source> -<target>Išsaugotu kaip GUI paketą</target> - -<source>Save as batch job</source> -<target>Išsaugoti kaip užduočių paketą</target> - <source>Save as...</source> <target>Išsaugoti kaip...</target> @@ -781,14 +778,14 @@ Komanda inicijuojama jei: <source>Statistics:</source> <target>Statistika:</target> -<source>Number of files and folders that will be created</source> -<target>Failų ir aplankų, kurie bus sukurti, skaičius</target> +<source>Number of files and folders that will be deleted</source> +<target>Failų ir aplankų, kurie bus ištrinti, skaičius</target> <source>Number of files that will be overwritten</source> <target>Skaičius failų, kurie bus perrašyti</target> -<source>Number of files and folders that will be deleted</source> -<target>Failų ir aplankų, kurie bus ištrinti, skaičius</target> +<source>Number of files and folders that will be created</source> +<target>Failų ir aplankų, kurie bus sukurti, skaičius</target> <source>Total bytes to copy</source> <target>Viso baitų kopijuoti</target> @@ -805,6 +802,15 @@ Komanda inicijuojama jei: <source>Identify equal files by comparing the file content.</source> <target>Sutapatinti vienodus failus lyginant failų turinį.</target> +<source>Ignore time shift (in hours)</source> +<target></target> + +<source>Consider file times with specified offset as equal</source> +<target></target> + +<source>Handle daylight saving time</source> +<target></target> + <source>Symbolic links:</source> <target>Simbolinės nuorodos:</target> @@ -835,8 +841,8 @@ Komanda inicijuojama jei: <source>Maximum:</source> <target>Didžiausias:</target> -<source>&Reset</source> -<target>&Perkrauti</target> +<source>C&lear</source> +<target></target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Pasirinkti filtro taisykles norint išskirti pasirinktus failus iš Suvienodinimo. Įveskite failo kelią, kuris atitinka aplanką.</target> @@ -861,20 +867,20 @@ Komanda inicijuojama jei: <source>Delete files:</source> <target>Ištrinti failus:</target> -<source>Permanent</source> -<target>Visiškai</target> +<source>&Permanent</source> +<target></target> <source>Delete or overwrite files permanently</source> <target>Trinti ar perrašyti failus visam laikui</target> -<source>Recycle bin</source> -<target>Šiukšliadėžė</target> +<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>Versioning</source> -<target>Versijavimas</target> +<source>&Versioning</source> +<target></target> <source>Move files to a user-defined folder</source> <target>Perkelti failus į vartotojo nustatytą katalogą</target> @@ -885,14 +891,11 @@ Komanda inicijuojama jei: <source>Handle errors:</source> <target>Klaidų taisymas:</target> -<source>Ignore</source> -<target>Ignoruoti</target> - <source>Hide all error and warning messages</source> <target>Slėpti visus klaidų ir perspėjimų pranešimus</target> -<source>Pop-up</source> -<target>Pranešimas</target> +<source>&Pop-up</source> +<target></target> <source>Show pop-up on errors or warnings</source> <target>Rodyti pranešimą esant klaidoms ar perspėjimams</target> @@ -915,9 +918,6 @@ Komanda inicijuojama jei: <source>Items found:</source> <target>Rasta elementų:</target> -<source>Speed:</source> -<target>Greitis:</target> - <source>Time remaining:</source> <target>Likęs laikas:</target> @@ -930,6 +930,9 @@ Komanda inicijuojama jei: <source>Minimize to notification area</source> <target>Nuleisti į apačią dešinėje</target> +<source>Bytes copied:</source> +<target></target> + <source>Close</source> <target>Uždaryti</target> @@ -942,6 +945,9 @@ 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></target> + <source>Stop synchronization at first error</source> <target>Stabdyti suvienodinimą, pirmai klaidai įvykus</target> @@ -960,9 +966,6 @@ Komanda inicijuojama jei: <source>How can I schedule a batch job?</source> <target>Kaip aš galiu užduočių paketą įtraukti į tvarkaraštį ?</target> -<source>&Recycle bin</source> -<target>&Šiukšliadėžė</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Sekantys parametrai yra naudojami visiems suvienodinimo darbams.</target> @@ -1011,8 +1014,11 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>Description</source> <target>Apibūdinimas</target> -<source>Restore hidden windows</source> -<target>Atstatyti paslėptus langus</target> +<source>Show hidden dialogs again</source> +<target></target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target></target> <source>&Default</source> <target>&Numatyta</target> @@ -1074,8 +1080,8 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>Main Bar</source> <target>Pagrindinė įrankinė</target> -<source>Compare both sides</source> -<target>Sulyginti abi puses</target> +<source>Start comparison</source> +<target></target> <source>Comparison settings</source> <target>Sulyginimo nustatymai</target> @@ -1174,9 +1180,6 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>Select time span...</source> <target>Pasirinkti laiko tarpą...</target> -<source>Default view</source> -<target>Numatytas rodmuo</target> - <source>Show "%x"</source> <target>Rodyti "%x"</target> @@ -1207,8 +1210,8 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>Synchronization Settings</source> <target>Suvienodinimo parametrai</target> -<source>Reset filter</source> -<target>Iš naujo nustatyti filtrą</target> +<source>Clear filter</source> +<target></target> <source>Show files that exist on left side only</source> <target>Rodyti failus, kurie egzistuoja tik kairėje pusėje</target> @@ -1368,8 +1371,11 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>- Other side's counterpart to %item_folder%</source> <target>- Kitos pusės atitikmuo %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Atstatyti visus nematomus ir perspėjamuosius langus?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target></target> + +<source>&Show</source> +<target></target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Nustatyti ir skatinti pokyčius apbiejose pusėse. Trinimai, perkėlimai ir konfliktai yra aptinkami automatiškai naudojant duomenų bazę.</target> diff --git a/FreeFileSync/Build/Languages/norwegian.lng b/FreeFileSync/Build/Languages/norwegian.lng index 0d439d89..e8fd452b 100644 --- a/FreeFileSync/Build/Languages/norwegian.lng +++ b/FreeFileSync/Build/Languages/norwegian.lng @@ -7,6 +7,12 @@ <plural_definition>n == 1 ? 0 : 1</plural_definition> </header> +<source>C&lear</source> +<target></target> + +<source>Consider file times with specified offset as equal</source> +<target></target> + <source>Both sides have changed since last synchronization.</source> <target>Begge sider er endret siden siste synkronisering.</target> @@ -106,8 +112,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Den tilsvarende mappe betraktes som tom.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Følgende mapper har avhengige stier. Vær forsiktig med synkroniseringsreglene:</target> +<source>The following folder paths are dependent from each other:</source> +<target>De følgende mappebaner er avhengige av hverandre</target> <source>File %x has an invalid date.</source> <target>Filen %x har en ugyldig dato.</target> @@ -146,10 +152,10 @@ <target>Ikke nok minne.</target> <source>Item exists on left side only</source> -<target>Emnet finnes kun på venstre side</target> +<target>Mappen finnes kun på venstre side</target> <source>Item exists on right side only</source> -<target>Emnet finnes kun på høyre side</target> +<target>Mappen finnes kun på høyre side</target> <source>Left side is newer</source> <target>Venstre er nyest</target> @@ -164,19 +170,19 @@ <target>Begge sider er like</target> <source>Conflict/item cannot be categorized</source> -<target>Konflikt/ukjent emne</target> +<target>Konflikt/ukjent mappe</target> <source>Copy new item to left</source> -<target>Kopier nytt emne mot venstre</target> +<target>Kopier ny mappe mot venstre</target> <source>Copy new item to right</source> -<target>Kopier nytt emne mot høyre</target> +<target>Kopier ny mappe mot høyre</target> <source>Delete left item</source> -<target>Slett venstre emne</target> +<target>Slett venstre mappe</target> <source>Delete right item</source> -<target>Slett høyre emne</target> +<target>Slett høyre mappe</target> <source>Move file on left</source> <target>Flytt filen til venstre</target> @@ -185,10 +191,10 @@ <target>Flytt filen til høyre</target> <source>Overwrite left item</source> -<target>Overskriv venstre emne</target> +<target>Overskriv venstre mappe</target> <source>Overwrite right item</source> -<target>Overskriv høyre emne</target> +<target>Overskriv høyre mappe</target> <source>Do nothing</source> <target>Ikke gjør noe</target> @@ -199,6 +205,24 @@ <source>Update attributes on right</source> <target>Oppdater attributter til høyre</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>1 byte</pluralform> +<pluralform>%x byte</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>Databasefilen %x er inkompatibel.</target> @@ -251,32 +275,14 @@ <target>Oppretter filen %x</target> <source>Items processed:</source> -<target>Emner behandlet:</target> +<target>Mapper behandlet:</target> <source>Items remaining:</source> -<target>Gjenstående emner:</target> +<target>Gjenstående mapper:</target> <source>Total time:</source> <target>Samlet tid:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>1 byte</pluralform> -<pluralform>%x byte</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Behandlingsfeil i filen %x, rekke %y, kolonne %z.</target> @@ -302,7 +308,7 @@ <target>/sek</target> <source>%x items/sec</source> -<target>%x emner/sek</target> +<target>%x mapper/sek</target> <source>Show in Explorer</source> <target>Åpne filplassering</target> @@ -317,7 +323,7 @@ <target>VSS tjenesten er ikke tilgjengelig</target> <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source> -<target>Bruk FreeFileSync 64-bit til at lage VSS kopier på dette system.</target> +<target>Bruk FreeFileSync 64-bit til å lage VSS kopier på dette system.</target> <source>Cannot load file %x.</source> <target>Kan ikke lese filen %x.</target> @@ -329,7 +335,7 @@ <target>Volumnavnet %x er ikke en del av filstien %y.</target> <source>Stop requested: Waiting for current operation to finish...</source> -<target>Avbrytelse: Venter til aktuell oppgave avsluttes...</target> +<target>Avbryter: Venter til aktuell oppgave avsluttes...</target> <source>Unable to create time stamp for versioning:</source> <target>Kan ikke opprette tidsstempel til versionering:</target> @@ -343,8 +349,8 @@ <source>&Quit</source> <target>&Avslutt</target> -<source>&Program</source> -<target>&Filer</target> +<source>&File</source> +<target>&Fil</target> <source>&View help</source> <target>&Åpne hjelp</target> @@ -400,7 +406,7 @@ The command is triggered if: - new folders arrive (e.g. USB stick insert) </source> <target> -Kommandoen udføres hvis: +Kommandoen utføres hvis: - filer eller undermapper endres - nye mapper finnes (f.eks USB nøkkel) </target> @@ -435,9 +441,6 @@ Kommandoen udføres hvis: <source>&Show error</source> <target>&Vis feil</target> -<source>&Exit</source> -<target>&Lukk</target> - <source>Incorrect command line:</source> <target>Ugyldig kommando:</target> @@ -501,8 +504,8 @@ Kommandoen udføres hvis: <source>Data verification error: %x and %y have different content.</source> <target>Godkjennelsesfeil: %x og %y har forskellig innhold</target> -<source>Cannot find %x.</source> -<target>Kan ikke finne %x.</target> +<source>Cannot find folder %x.</source> +<target>Finner ikke mappen %x.</target> <source>Target folder %x already existing.</source> <target>Destinasjonsmappen %x finnes allerede.</target> @@ -517,7 +520,7 @@ Kommandoen udføres hvis: <target>Kildemappen %x ble ikke funnet.</target> <source>The following items have unresolved conflicts and will not be synchronized:</source> -<target>Følgende emner har uløste konflikter og synkroniseres ikke:</target> +<target>Følgende mapper har uløste konflikter og synkroniseres ikke:</target> <source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source> <target>Følgende mapper har markante forskeller. Kontroller at du synkroniserer de rigtige mapper</target> @@ -531,8 +534,8 @@ Kommandoen udføres hvis: <source>Available:</source> <target>Tilgjengelig:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Der endres en mappe som tilhører flere mappepar. Kontroller dine synkroniseringsinnstillinger.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Flere mappepar til er skrevet til en felles undermappe. Se konfigureringen.</target> <source>Synchronizing folder pair:</source> <target>Synkroniserer mappepar:</target> @@ -562,7 +565,7 @@ Kommandoen udføres hvis: <target>Lagrer rapport %x...</target> <source>Stopped</source> -<target>Avbrudt</target> +<target>Avbrutt</target> <source>You can switch to FreeFileSync's main window to resolve this issue.</source> <target>Skift til FreeFileSyncs hovedvindu for at løse problemet.</target> @@ -633,8 +636,8 @@ Kommandoen udføres hvis: <source>Name</source> <target>Navn</target> -<source>Relative path</source> -<target>Relativ sti</target> +<source>Relative folder</source> +<target>Relativ mappe</target> <source>Base folder</source> <target>Hovedmappe</target> @@ -655,7 +658,7 @@ Kommandoen udføres hvis: <target>Handling</target> <source>Drag && drop</source> -<target>Trekk emner hit</target> +<target>Trekk mapper hit</target> <source>Local comparison settings</source> <target>Lokale sammenlignings-instillinger</target> @@ -675,8 +678,8 @@ Kommandoen udføres hvis: <source>Remove local settings</source> <target>Fjern lokale instillinger</target> -<source>Reset local filter</source> -<target>Tilbakestill lokalt filter</target> +<source>Clear local filter</source> +<target>Slett lokalt filter</target> <source>Copy</source> <target>Kopiér</target> @@ -696,11 +699,11 @@ Kommandoen udføres hvis: <source>Save as &batch job...</source> <target>Lagre som &batchfil</target> -<source>1. &Compare</source> -<target>1. &Analyser</target> +<source>Start &comparison</source> +<target>Start &sammenligning</target> -<source>2. &Synchronize</source> -<target>2. &Synkroniser</target> +<source>Start &synchronization</source> +<target>Start &synkronisering</target> <source>&Options</source> <target>&Valg</target> @@ -711,21 +714,24 @@ Kommandoen udføres hvis: <source>&Find...</source> <target>&Søk</target> +<source>&Reset layout</source> +<target>&Reset layout</target> + <source>&Export file list...</source> <target>&Eksporter filliste...</target> <source>&Tools</source> <target>&Verktøy</target> +<source>&Check for new version</source> +<target>&Søk etter oppdatering</target> + <source>&Check now</source> <target>&Søk nå</target> <source>Check &automatically once a week</source> <target>Søk &automatisk en gang i uken</target> -<source>&Check for new version</source> -<target>&Søk etter oppdatering</target> - <source>Cancel</source> <target>Avbryt</target> @@ -753,18 +759,15 @@ Kommandoen udføres hvis: <source>Match case</source> <target>Treffølsomhet (a/A)</target> +<source>New</source> +<target>Ny</target> + <source>Open...</source> <target>Åpne...</target> <source>Save</source> <target>Lagre</target> -<source>Save as GUI job</source> -<target>Lagre som GUI arbeid</target> - -<source>Save as batch job</source> -<target>Lagre som batchfil</target> - <source>Save as...</source> <target>Lagre som</target> @@ -777,14 +780,14 @@ Kommandoen udføres hvis: <source>Statistics:</source> <target>Statistikk:</target> -<source>Number of files and folders that will be created</source> -<target>Antall filer og mapper som vil bli opprettet</target> +<source>Number of files and folders that will be deleted</source> +<target>Antall filer og mapper som slettes</target> <source>Number of files that will be overwritten</source> <target>Antall filer som overskrives</target> -<source>Number of files and folders that will be deleted</source> -<target>Antall filer og mapper som slettes</target> +<source>Number of files and folders that will be created</source> +<target>Antall filer og mapper som vil bli opprettet</target> <source>Total bytes to copy</source> <target>Antal bytes som kopieres</target> @@ -801,6 +804,12 @@ Kommandoen udføres hvis: <source>Identify equal files by comparing the file content.</source> <target>Gjennkjenn like filer etter innhold.</target> +<source>Ignore time shift (in hours)</source> +<target>Ignorer tidsbytte (i timer)</target> + +<source>Handle daylight saving time</source> +<target>Behandle sommertid</target> + <source>Symbolic links:</source> <target>Symbolsk link:</target> @@ -831,9 +840,6 @@ Kommandoen udføres hvis: <source>Maximum:</source> <target>Maksimum:</target> -<source>&Reset</source> -<target>&Nullstill</target> - <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Angi filterregler til ekskludering av bestemte filer fra synkroniseringen. Filstier skal relatere til kildemappene.</target> @@ -857,20 +863,20 @@ Kommandoen udføres hvis: <source>Delete files:</source> <target>Slett filer:</target> -<source>Permanent</source> -<target>Permanent</target> +<source>&Permanent</source> +<target>&Permanent</target> <source>Delete or overwrite files permanently</source> <target>Slett eller overskriv filer permanent</target> -<source>Recycle bin</source> -<target>Papirkurv</target> +<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>Versioning</source> -<target>Versionering</target> +<source>&Versioning</source> +<target>&Versjonering</target> <source>Move files to a user-defined folder</source> <target>Flytt filer til brukerdefinert mappe</target> @@ -881,14 +887,11 @@ Kommandoen udføres hvis: <source>Handle errors:</source> <target>Feilhåndtering:</target> -<source>Ignore</source> -<target>Ignorer</target> - <source>Hide all error and warning messages</source> <target>Skjul feilmeldinger og advarsler</target> -<source>Pop-up</source> -<target>Melding</target> +<source>&Pop-up</source> +<target>&Pop-up</target> <source>Show pop-up on errors or warnings</source> <target>Vis feilmeldinger og advarsler</target> @@ -909,10 +912,7 @@ Kommandoen udføres hvis: <target>&Ikke vis igjen</target> <source>Items found:</source> -<target>Emner funnet:</target> - -<source>Speed:</source> -<target>Hastighet:</target> +<target>Mapper funnet:</target> <source>Time remaining:</source> <target>Resterende tid:</target> @@ -926,6 +926,9 @@ Kommandoen udføres hvis: <source>Minimize to notification area</source> <target>Minimér til systemfeltet</target> +<source>Bytes copied:</source> +<target>Byte kopiert</target> + <source>Close</source> <target>Lukk</target> @@ -938,6 +941,9 @@ 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>Oppret batchfil til automatisk synkronisering. Start ved aå dobbeltklikke på filen eller planlegg via oppgaveplanlegger: %x</target> +<source>&Stop</source> +<target>&Stopp</target> + <source>Stop synchronization at first error</source> <target>Stopp synkronisering ved første feil</target> @@ -956,9 +962,6 @@ Kommandoen udføres hvis: <source>How can I schedule a batch job?</source> <target>Hvordan opprettes en batchfil?</target> -<source>&Recycle bin</source> -<target>&Papirkurv</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Disse innstillinger gjelder alle synkroniseringer.</target> @@ -1004,8 +1007,11 @@ This guarantees a consistent state even in case of a serious error. <source>Description</source> <target>Beskrivelse</target> -<source>Restore hidden windows</source> -<target>Åpne skjulte vinduer</target> +<source>Show hidden dialogs again</source> +<target>Vis skjulte vinduer</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Vis alle vinduer og advarsler igjen</target> <source>&Default</source> <target>&Standard</target> @@ -1038,7 +1044,7 @@ This guarantees a consistent state even in case of a serious error. <target>Lagre som batchfil</target> <source>Delete Items</source> -<target>Slett emner</target> +<target>Slett mapperr</target> <source>Options</source> <target>Valg</target> @@ -1067,8 +1073,8 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>Hovedlinje</target> -<source>Compare both sides</source> -<target>Analyser begge sider</target> +<source>Start comparison</source> +<target>Start sammenligning</target> <source>Comparison settings</source> <target>Analyseinnstillinger</target> @@ -1087,8 +1093,8 @@ This guarantees a consistent state even in case of a serious error. <pluralform>Do you really want to execute the command %y for %x items?</pluralform> </source> <target> -<pluralform>Vil du kjøre kommandoen %y for 1 emne?</pluralform> -<pluralform>Vil du kjøre kommandoen %y for %x emner?</pluralform> +<pluralform>Vil du kjøre kommandoen %y for 1 mappe?</pluralform> +<pluralform>Vil du kjøre kommandoen %y for %x mapper?</pluralform> </target> <source>&Execute</source> @@ -1163,9 +1169,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>Velg tidsinterval...</target> -<source>Default view</source> -<target>Standardvisning</target> - <source>Show "%x"</source> <target>Vis "%x"</target> @@ -1196,8 +1199,8 @@ This guarantees a consistent state even in case of a serious error. <source>Synchronization Settings</source> <target>Synkroniseringsinnstillinger</target> -<source>Reset filter</source> -<target>Tilbakestill filter</target> +<source>Clear filter</source> +<target>Slett filter</target> <source>Show files that exist on left side only</source> <target>Vis filer som kun finnes på venstre side</target> @@ -1318,8 +1321,8 @@ 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>Vil du flytte følgende emne til papirkurven?</pluralform> -<pluralform>Vil du flytte følgende %x emner til papirkurven?</pluralform> +<pluralform>Vil du flytte følgende mappe til papirkurven?</pluralform> +<pluralform>Vil du flytte følgende %x mapper til papirkurven?</pluralform> </target> <source>Move</source> @@ -1330,8 +1333,8 @@ This guarantees a consistent state even in case of a serious error. <pluralform>Do you really want to delete the following %x items?</pluralform> </source> <target> -<pluralform>Vil du slette følgende emne?</pluralform> -<pluralform>Vil du slette følgende %x emner?</pluralform> +<pluralform>Vil du slette følgende mappe?</pluralform> +<pluralform>Vil du slette følgende %x mapper?</pluralform> </target> <source>Preferences</source> @@ -1355,8 +1358,11 @@ This guarantees a consistent state even in case of a serious error. <source>- Other side's counterpart to %item_folder%</source> <target>Motsatt sides motstykke til %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Åpne alle skjulte vinduer og advarsler?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Vis gjemte vinduer og advarsler igjen?</target> + +<source>&Show</source> +<target>&Vis</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Finn og fordel endringer på begge sider. Slettede filer, omdøpninger og konflikter finnes automatisk i en database.</target> @@ -1434,7 +1440,7 @@ This guarantees a consistent state even in case of a serious error. <target>Filer</target> <source>Items</source> -<target>Emner</target> +<target>Mapper</target> <source>Percentage</source> <target>Prosent</target> @@ -1557,8 +1563,8 @@ This guarantees a consistent state even in case of a serious error. <target>Feilkode %x:</target> <source>Cannot read the following XML elements:</source> -<target>Kan ikke lese følgende XML emner:</target> +<target>Kan ikke lese følgende XML mapper:</target> <source>Configuration file %x loaded partially only.</source> -<target>Configureringsfilen %x er delvis innlastet</target> +<target>Konfigureringsfilen %x er delvis innlastet</target> diff --git a/FreeFileSync/Build/Languages/polish.lng b/FreeFileSync/Build/Languages/polish.lng index e6a46560..306d3f05 100644 --- a/FreeFileSync/Build/Languages/polish.lng +++ b/FreeFileSync/Build/Languages/polish.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Katalog będzie oznaczony jako pusty.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Podane katalogi mają zależne ścieżki. Bądź ostrożny podczas ustawiania reguł synchronizacji:</target> +<source>The following folder paths are dependent from each other:</source> +<target></target> <source>File %x has an invalid date.</source> <target>Plik %x ma nieprawidłową datę.</target> @@ -199,6 +199,25 @@ <source>Update attributes on right</source> <target>Aktualizuj atrybuty po prawej stronie</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>1 bajt</pluralform> +<pluralform>%x bajty</pluralform> +<pluralform>%x bajtów</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>Plik bazy danych %x nie jest kompatybilny.</target> @@ -260,25 +279,6 @@ <source>Total time:</source> <target>Całkowity czas:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>1 bajt</pluralform> -<pluralform>%x bajty</pluralform> -<pluralform>%x bajtów</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Błąd podczas parsowania pliku %x, rząd %y, kolumna %z.</target> @@ -346,8 +346,8 @@ <source>&Quit</source> <target>Zam&knij</target> -<source>&Program</source> -<target>&Program</target> +<source>&File</source> +<target></target> <source>&View help</source> <target>&Pomoc</target> @@ -438,9 +438,6 @@ Komenda jest wykonywana gdy: <source>&Show error</source> <target>Pokaż &błędy</target> -<source>&Exit</source> -<target>&Wyjście</target> - <source>Incorrect command line:</source> <target>Niepoprawne polecenie:</target> @@ -504,8 +501,8 @@ Komenda jest wykonywana gdy: <source>Data verification error: %x and %y have different content.</source> <target>Nastąpił błąd weryfikacji: %x oraz %y różnią się zawartością.</target> -<source>Cannot find %x.</source> -<target>Nie można znaleźć %x.</target> +<source>Cannot find folder %x.</source> +<target></target> <source>Target folder %x already existing.</source> <target>Katalog docelowy %x już istnieje.</target> @@ -534,8 +531,8 @@ Komenda jest wykonywana gdy: <source>Available:</source> <target>Dostępne:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Katalog zostanie zmodyfikowany w związku z synchronizacją wielu katalogów. Zweryfikuj ustawienia synchronizacji.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target></target> <source>Synchronizing folder pair:</source> <target>Synchronizacja katalgów:</target> @@ -637,8 +634,8 @@ Komenda jest wykonywana gdy: <source>Name</source> <target>Nazwa</target> -<source>Relative path</source> -<target>Relatywna ścieżka</target> +<source>Relative folder</source> +<target></target> <source>Base folder</source> <target>Katalog bazowy</target> @@ -679,8 +676,8 @@ Komenda jest wykonywana gdy: <source>Remove local settings</source> <target>Usuń lokalne ustawienia</target> -<source>Reset local filter</source> -<target>Resetuj lokalny filtr</target> +<source>Clear local filter</source> +<target></target> <source>Copy</source> <target>Kopiuj</target> @@ -700,11 +697,11 @@ Komenda jest wykonywana gdy: <source>Save as &batch job...</source> <target>Zapisz w trybie &wsadowym...</target> -<source>1. &Compare</source> -<target>1. &Porównaj</target> +<source>Start &comparison</source> +<target></target> -<source>2. &Synchronize</source> -<target>2. &Synchronizuj</target> +<source>Start &synchronization</source> +<target></target> <source>&Options</source> <target>&Opcje</target> @@ -715,21 +712,24 @@ Komenda jest wykonywana gdy: <source>&Find...</source> <target>&Szukaj...</target> +<source>&Reset layout</source> +<target></target> + <source>&Export file list...</source> <target>&Eksportuj listę plików...</target> <source>&Tools</source> <target>&Narzędzia</target> +<source>&Check for new version</source> +<target>Sprawdź &nową wersję</target> + <source>&Check now</source> <target>Spra&wdź teraz</target> <source>Check &automatically once a week</source> <target>Sprawdzaj &automatycznie raz w tygodniu</target> -<source>&Check for new version</source> -<target>Sprawdź &nową wersję</target> - <source>Cancel</source> <target>Anuluj</target> @@ -757,18 +757,15 @@ Komenda jest wykonywana gdy: <source>Match case</source> <target>Uwzględnij wielkość liter</target> +<source>New</source> +<target></target> + <source>Open...</source> <target>Otwórz...</target> <source>Save</source> <target>Zapisz</target> -<source>Save as GUI job</source> -<target>Zapisz zadanie</target> - -<source>Save as batch job</source> -<target>Zapisz w trybie wsadowym</target> - <source>Save as...</source> <target>Zapisz jako...</target> @@ -781,14 +778,14 @@ Komenda jest wykonywana gdy: <source>Statistics:</source> <target>Statystyki:</target> -<source>Number of files and folders that will be created</source> -<target>Liczba plików i katalogów, które zostaną utworzone</target> +<source>Number of files and folders that will be deleted</source> +<target>Liczba plików i katalogów, które zostaną usunięte</target> <source>Number of files that will be overwritten</source> <target>Liczba plików, które zostaną nadpisane</target> -<source>Number of files and folders that will be deleted</source> -<target>Liczba plików i katalogów, które zostaną usunięte</target> +<source>Number of files and folders that will be created</source> +<target>Liczba plików i katalogów, które zostaną utworzone</target> <source>Total bytes to copy</source> <target>Całkowity rozmiar do skopiowania</target> @@ -805,6 +802,15 @@ Komenda jest wykonywana gdy: <source>Identify equal files by comparing the file content.</source> <target>Określ różnice w plikach na podstawie ich zawartości.</target> +<source>Ignore time shift (in hours)</source> +<target></target> + +<source>Consider file times with specified offset as equal</source> +<target></target> + +<source>Handle daylight saving time</source> +<target></target> + <source>Symbolic links:</source> <target>Dowiązania symboliczne:</target> @@ -835,8 +841,8 @@ Komenda jest wykonywana gdy: <source>Maximum:</source> <target>Maksymalny:</target> -<source>&Reset</source> -<target>&Resetuj</target> +<source>C&lear</source> +<target></target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Określ reguły filtrowania w celu wykluczenia niektórych plików z synchronizacji. Ścieżki plików muszą być relatywne do podanych par katalogów.</target> @@ -861,20 +867,20 @@ Komenda jest wykonywana gdy: <source>Delete files:</source> <target>Usuwanie plików:</target> -<source>Permanent</source> -<target>Trwale</target> +<source>&Permanent</source> +<target></target> <source>Delete or overwrite files permanently</source> <target>Usuń lub nadpisz pliki na stałe</target> -<source>Recycle bin</source> -<target>Kosz</target> +<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>Versioning</source> -<target>Wersjonowanie</target> +<source>&Versioning</source> +<target></target> <source>Move files to a user-defined folder</source> <target>Przenieś pliki do katalogu zdefiniowanego przez użytkownika</target> @@ -885,14 +891,11 @@ Komenda jest wykonywana gdy: <source>Handle errors:</source> <target>Obsługa błędów:</target> -<source>Ignore</source> -<target>Ignoruj</target> - <source>Hide all error and warning messages</source> <target>Ukryj wszystkie informacje błędach i ostrzeżeniach</target> -<source>Pop-up</source> -<target>Pop-up</target> +<source>&Pop-up</source> +<target></target> <source>Show pop-up on errors or warnings</source> <target>Pokazuj okna pop-up dla błędów i ostrzeżeń</target> @@ -915,9 +918,6 @@ Komenda jest wykonywana gdy: <source>Items found:</source> <target>Znalezione elementy:</target> -<source>Speed:</source> -<target>Prędkość:</target> - <source>Time remaining:</source> <target>Do ukończenia:</target> @@ -930,6 +930,9 @@ Komenda jest wykonywana gdy: <source>Minimize to notification area</source> <target>Minimalizuj do obszaru powiadomień</target> +<source>Bytes copied:</source> +<target></target> + <source>Close</source> <target>Zamknij</target> @@ -942,6 +945,9 @@ 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></target> + <source>Stop synchronization at first error</source> <target>Przerwij synchronizację przy pierwszym błędzie</target> @@ -960,9 +966,6 @@ Komenda jest wykonywana gdy: <source>How can I schedule a batch job?</source> <target>Jak zaplanować zadanie w trybie wsadowym?</target> -<source>&Recycle bin</source> -<target>&Kosz systemowy</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Następujące ustawienia stosowane są do wszystkich zadań synchronizacji.</target> @@ -1011,8 +1014,11 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Description</source> <target>Opis</target> -<source>Restore hidden windows</source> -<target>Przywróć ukryte dialogi</target> +<source>Show hidden dialogs again</source> +<target></target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target></target> <source>&Default</source> <target>&Domyślne</target> @@ -1074,8 +1080,8 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Main Bar</source> <target>Główny pasek</target> -<source>Compare both sides</source> -<target>Porównaj foldery</target> +<source>Start comparison</source> +<target></target> <source>Comparison settings</source> <target>Ustawienia porównywania</target> @@ -1174,9 +1180,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>Default view</source> -<target>Widok domyślny</target> - <source>Show "%x"</source> <target>Pokaż "%x"</target> @@ -1207,8 +1210,8 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Synchronization Settings</source> <target>Ustawienia synchronizacji</target> -<source>Reset filter</source> -<target>Resetuj filtr</target> +<source>Clear filter</source> +<target></target> <source>Show files that exist on left side only</source> <target>Pokaż pliki istniejące tylko po lewej stronie</target> @@ -1368,8 +1371,11 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>- Other side's counterpart to %item_folder%</source> <target>- Odpowiednik %item_folder% po drugiej stronie</target> -<source>Restore all hidden windows and warnings?</source> -<target>Przywrócić wszystkie ukryte dialogi?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target></target> + +<source>&Show</source> +<target></target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Wyszukaj oraz zastosuj zmiany po obu stronach. Wszystkie operacje na plikach takie jak usunięcia, zmiany oraz konflikty wykrywane są automatycznie przy użyciu bazy danych.</target> diff --git a/FreeFileSync/Build/Languages/portuguese.lng b/FreeFileSync/Build/Languages/portuguese.lng index 5636a968..662c1cdf 100644 --- a/FreeFileSync/Build/Languages/portuguese.lng +++ b/FreeFileSync/Build/Languages/portuguese.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>A pasta correspondente será considerada como vazia.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>As seguintes pastas têm caminhos dependentes. Tenha atenção ao definir as regras de sincronizaçção:</target> +<source>The following folder paths are dependent from each other:</source> +<target>Os seguintes pares de pastas são dependentes:</target> <source>File %x has an invalid date.</source> <target>Ficheiro %x tem data inválida.</target> @@ -199,6 +199,24 @@ <source>Update attributes on right</source> <target>Actualizar atributos à direita</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>Base de dados %x não é compatível.</target> @@ -259,24 +277,6 @@ <source>Total time:</source> <target>Tempo total:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Erro ao analisar ficheiro %x, linha %y, coluna %z.</target> @@ -332,7 +332,7 @@ <target>Paragem solicitada: À espera que termine a operação actual...</target> <source>Unable to create time stamp for versioning:</source> -<target>Não é possível criar data/hora para versionamento:</target> +<target>Não é possível criar data/hora para controlo de versões:</target> <source>&Open...</source> <target>&Abrir...</target> @@ -343,8 +343,8 @@ <source>&Quit</source> <target>&Sair</target> -<source>&Program</source> -<target>&Programa</target> +<source>&File</source> +<target>&Ficheiro</target> <source>&View help</source> <target>&Ver ajuda</target> @@ -435,9 +435,6 @@ O comando é executado se: <source>&Show error</source> <target>Mostrar &erro</target> -<source>&Exit</source> -<target>&Sair</target> - <source>Incorrect command line:</source> <target>Linha de comandos incorrecta:</target> @@ -501,8 +498,8 @@ O comando é executado se: <source>Data verification error: %x and %y have different content.</source> <target>Erro de verificação de dados: %x e %y têm conteúdo diferente.</target> -<source>Cannot find %x.</source> -<target>Não é possível encontrar %x.</target> +<source>Cannot find folder %x.</source> +<target>Não é possível encontrar a pasta %x.</target> <source>Target folder %x already existing.</source> <target>Directório de destino %x já existe.</target> @@ -531,8 +528,8 @@ O comando é executado se: <source>Available:</source> <target>Disponível:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Uma pasta que faz parte de vários pares vai ser modificada. Por favor, reveja os parametros de sincronização.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Vários pares de pastas escrevem para uma subpasta comum. Por favor, revise a sua configuração.</target> <source>Synchronizing folder pair:</source> <target>Sincronizar o par de pastas:</target> @@ -633,8 +630,8 @@ O comando é executado se: <source>Name</source> <target>Nome</target> -<source>Relative path</source> -<target>Caminho</target> +<source>Relative folder</source> +<target>Pasta relativa</target> <source>Base folder</source> <target>Pasta principal</target> @@ -675,7 +672,7 @@ O comando é executado se: <source>Remove local settings</source> <target>Apagar opções locais</target> -<source>Reset local filter</source> +<source>Clear local filter</source> <target>Limpar filtro local</target> <source>Copy</source> @@ -696,11 +693,11 @@ O comando é executado se: <source>Save as &batch job...</source> <target>Guardar como &batch...</target> -<source>1. &Compare</source> -<target>1. &Comparar</target> +<source>Start &comparison</source> +<target>Iniciar &comparaçao</target> -<source>2. &Synchronize</source> -<target>2. &Sincronizar</target> +<source>Start &synchronization</source> +<target>Iniciar &sincronização</target> <source>&Options</source> <target>&Opções</target> @@ -711,21 +708,24 @@ 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>&Tools</source> <target>&Ferramentas</target> +<source>&Check for new version</source> +<target>&Procurar por actualizações</target> + <source>&Check now</source> <target>&Verificar agora</target> <source>Check &automatically once a week</source> <target>Verificar &automaticamente uma vez por semana</target> -<source>&Check for new version</source> -<target>&Procurar por actualizações</target> - <source>Cancel</source> <target>Cancelar</target> @@ -753,18 +753,15 @@ O comando é executado se: <source>Match case</source> <target>Correspondência</target> +<source>New</source> +<target>Novo</target> + <source>Open...</source> <target>Abrir...</target> <source>Save</source> <target>Guardar</target> -<source>Save as GUI job</source> -<target>Guardar como sincronização GUI</target> - -<source>Save as batch job</source> -<target>Guardar como sincronização batch</target> - <source>Save as...</source> <target>Guardar como...</target> @@ -777,14 +774,14 @@ O comando é executado se: <source>Statistics:</source> <target>Estatísticas:</target> -<source>Number of files and folders that will be created</source> -<target>Número de ficheiros e pastas a ser criados</target> +<source>Number of files and folders that will be deleted</source> +<target>Número de ficheiros e pastas a ser eliminados</target> <source>Number of files that will be overwritten</source> <target>Número de ficheiros substituidos</target> -<source>Number of files and folders that will be deleted</source> -<target>Número de ficheiros e pastas a ser eliminados</target> +<source>Number of files and folders that will be created</source> +<target>Número de ficheiros e pastas a ser criados</target> <source>Total bytes to copy</source> <target>Total em bytes a copiar</target> @@ -801,6 +798,15 @@ O comando é executado se: <source>Identify equal files by comparing the file content.</source> <target>Identificar ficheiros iguais ao comparar o conteúdo.</target> +<source>Ignore time shift (in hours)</source> +<target>Ignorar mudança de tempo (em horas)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Considerar ficheiros com o desvio de tempo especificado como iguais</target> + +<source>Handle daylight saving time</source> +<target>Lidar com horário de verão</target> + <source>Symbolic links:</source> <target>Links simbólicos:</target> @@ -831,8 +837,8 @@ O comando é executado se: <source>Maximum:</source> <target>Máximo</target> -<source>&Reset</source> -<target>&Reiniciar</target> +<source>C&lear</source> +<target>&Limpar</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Seleccionar regras de filtro para excluir certos ficheiros da sincronização. Insira os caminhos relativos ao par de directórios correspondente.</target> @@ -857,20 +863,20 @@ O comando é executado se: <source>Delete files:</source> <target>Eliminar ficheiros:</target> -<source>Permanent</source> -<target>Permanente</target> +<source>&Permanent</source> +<target>&Permanente</target> <source>Delete or overwrite files permanently</source> <target>Apagar ou substituir ficheiros permanentemente</target> -<source>Recycle bin</source> -<target>Reciclagem</target> +<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 substituidos na reciclagem</target> -<source>Versioning</source> -<target>Manter versões anteriores</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> @@ -881,14 +887,11 @@ O comando é executado se: <source>Handle errors:</source> <target>Tratar erros:</target> -<source>Ignore</source> -<target>Ignorar</target> - <source>Hide all error and warning messages</source> <target>Ocultar todas as mensagens de erro/aviso</target> -<source>Pop-up</source> -<target>Pop-up</target> +<source>&Pop-up</source> +<target>&Popup</target> <source>Show pop-up on errors or warnings</source> <target>Mostrar popup em caso de erros ou avisos</target> @@ -911,9 +914,6 @@ O comando é executado se: <source>Items found:</source> <target>Elementos encontrados:</target> -<source>Speed:</source> -<target>Velocidade:</target> - <source>Time remaining:</source> <target>Tempo restante:</target> @@ -926,6 +926,9 @@ O comando é executado se: <source>Minimize to notification area</source> <target>Minimizar para a área de notificação</target> +<source>Bytes copied:</source> +<target>Bytes copiados:</target> + <source>Close</source> <target>Fechar</target> @@ -938,6 +941,9 @@ 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>Stop synchronization at first error</source> <target>Para sincronização ao primeiro erro</target> @@ -956,9 +962,6 @@ O comando é executado se: <source>How can I schedule a batch job?</source> <target>Como posso agendar um trabalho batch?</target> -<source>&Recycle bin</source> -<target>&Reciclagem</target> - <source>The following settings are used for all synchronization jobs.</source> <target>As seguintes definições são usadas para todas as sincronizações.</target> @@ -1007,8 +1010,11 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Description</source> <target>Descrição</target> -<source>Restore hidden windows</source> -<target>Restaurar janelas escondidas</target> +<source>Show hidden dialogs again</source> +<target>Mostrar diálogos ocultos novamente</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Mostrar todos os diálogos escondidos permanentemente e mensagens de aviso novamente</target> <source>&Default</source> <target>&Config. Iniciais</target> @@ -1070,8 +1076,8 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Main Bar</source> <target>Barra principal</target> -<source>Compare both sides</source> -<target>Comparar listas</target> +<source>Start comparison</source> +<target>Iniciar comparação</target> <source>Comparison settings</source> <target>Opções de comparação</target> @@ -1166,9 +1172,6 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Select time span...</source> <target>Selecione intervalo de tempo...</target> -<source>Default view</source> -<target>Vista normal</target> - <source>Show "%x"</source> <target>Mostrar "%x"</target> @@ -1199,7 +1202,7 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Synchronization Settings</source> <target>Definições de Sincronização</target> -<source>Reset filter</source> +<source>Clear filter</source> <target>Limpar filtro</target> <source>Show files that exist on left side only</source> @@ -1358,8 +1361,11 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>- Other side's counterpart to %item_folder%</source> <target>- Contrapartida de %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Restaurar todas as janelas e avisos escondidos?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Mostrar diálogos ocultos e mensagens de erro novamente?</target> + +<source>&Show</source> +<target>&Mostrar</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Identificar e propagar mudanças nos dois lados. Eliminações, cópias e conflitos são detectados automaticamente usando base de dados.</target> diff --git a/FreeFileSync/Build/Languages/portuguese_br.lng b/FreeFileSync/Build/Languages/portuguese_br.lng index 5febf0a3..31d03fba 100644 --- a/FreeFileSync/Build/Languages/portuguese_br.lng +++ b/FreeFileSync/Build/Languages/portuguese_br.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>A pasta correspondente será considerada como vazia.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>As seguintes pastas tem caminhos dependentes. Cuidado na hora de estabelecer as regras de sincronização:</target> +<source>The following folder paths are dependent from each other:</source> +<target>Os seguintes caminhos de pastas são dependentes um do outro:</target> <source>File %x has an invalid date.</source> <target>O arquivo %x tem uma data inválida.</target> @@ -199,6 +199,24 @@ <source>Update attributes on right</source> <target>Atualizar atributos à direita</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x kB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>O arquivo de banco de dados %x é incompatível.</target> @@ -259,24 +277,6 @@ <source>Total time:</source> <target>Tempo total:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x kB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Erro analisando o arquivo %x, linha %y, coluna %z.</target> @@ -343,11 +343,11 @@ <source>&Quit</source> <target>Sai&r</target> -<source>&Program</source> -<target>&Programa</target> +<source>&File</source> +<target>&Arquivo</target> <source>&View help</source> -<target>&Ver ajuda</target> +<target>Ver &ajuda</target> <source>&About</source> <target>&Sobre</target> @@ -435,9 +435,6 @@ O comando é disparado se: <source>&Show error</source> <target>&Mostrar erro</target> -<source>&Exit</source> -<target>&Sair</target> - <source>Incorrect command line:</source> <target>Linha de comando incorreta:</target> @@ -501,8 +498,8 @@ O comando é disparado se: <source>Data verification error: %x and %y have different content.</source> <target>Erro na verificação dos dados: %x e %y têm conteúdo diferente.</target> -<source>Cannot find %x.</source> -<target>Não foi possível localizar %x.</target> +<source>Cannot find folder %x.</source> +<target>Não foi possível encontrar a pasta %x.</target> <source>Target folder %x already existing.</source> <target>Pasta de destino %x já existe.</target> @@ -531,8 +528,8 @@ O comando é disparado se: <source>Available:</source> <target>Disponível:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Uma pasta que é parte de múltiplos pares de pasta será modificada. Por favor, revise as configurações de sincronização.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Múltiplos pares de pastas estão escrevendo em uma mesma subpasta. Favor rever sua configuração.</target> <source>Synchronizing folder pair:</source> <target>Sincronizando par de pastas:</target> @@ -633,8 +630,8 @@ O comando é disparado se: <source>Name</source> <target>Nome</target> -<source>Relative path</source> -<target>Caminho relativo</target> +<source>Relative folder</source> +<target>Pasta relativa</target> <source>Base folder</source> <target>Pasta base</target> @@ -675,7 +672,7 @@ O comando é disparado se: <source>Remove local settings</source> <target>Remover configurações locais</target> -<source>Reset local filter</source> +<source>Clear local filter</source> <target>Limpar filtro local</target> <source>Copy</source> @@ -696,11 +693,11 @@ O comando é disparado se: <source>Save as &batch job...</source> <target>Salvar como &tarefa em lote...</target> -<source>1. &Compare</source> -<target>1. C&omparar</target> +<source>Start &comparison</source> +<target>Iniciar c&omparação</target> -<source>2. &Synchronize</source> -<target>2. S&incronizar</target> +<source>Start &synchronization</source> +<target>Iniciar s&incronização</target> <source>&Options</source> <target>&Opções</target> @@ -711,21 +708,24 @@ 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>&Tools</source> <target>&Ferramentas</target> +<source>&Check for new version</source> +<target>&Verificar se existe nova versão</target> + <source>&Check now</source> <target>&Verificar agora</target> <source>Check &automatically once a week</source> <target>Verificar &automaticamente uma vez por semana</target> -<source>&Check for new version</source> -<target>&Verificar se existe nova versão</target> - <source>Cancel</source> <target>Cancelar</target> @@ -753,18 +753,15 @@ O comando é disparado se: <source>Match case</source> <target>Diferenciar maiúsculas e minúsculas</target> +<source>New</source> +<target>Novo</target> + <source>Open...</source> <target>Abrir...</target> <source>Save</source> <target>Salvar</target> -<source>Save as GUI job</source> -<target>Salvar como tarefa GUI</target> - -<source>Save as batch job</source> -<target>Salvar como tarefa em lote</target> - <source>Save as...</source> <target>Salvar como...</target> @@ -777,14 +774,14 @@ O comando é disparado se: <source>Statistics:</source> <target>Estatísticas:</target> -<source>Number of files and folders that will be created</source> -<target>Número de arquivos e pastas que serão criados</target> +<source>Number of files and folders that will be deleted</source> +<target>Número de arquivos e pastas que serão apagados</target> <source>Number of files that will be overwritten</source> <target>Número de arquivos que serão substituídos</target> -<source>Number of files and folders that will be deleted</source> -<target>Número de arquivos e pastas que serão apagados</target> +<source>Number of files and folders that will be created</source> +<target>Número de arquivos e pastas que serão criados</target> <source>Total bytes to copy</source> <target>Bytes totais a serem copiados</target> @@ -801,6 +798,15 @@ O comando é disparado se: <source>Identify equal files by comparing the file content.</source> <target>Identifica arquivos iguais comparando o conteúdo do arquivo.</target> +<source>Ignore time shift (in hours)</source> +<target>Ignora mudança de horário (em horas)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Considera horário de arquivos com uma diferença especificada como iguais</target> + +<source>Handle daylight saving time</source> +<target>Como lidar com horário de verão</target> + <source>Symbolic links:</source> <target>Links simbólicos:</target> @@ -831,8 +837,8 @@ O comando é disparado se: <source>Maximum:</source> <target>Máximo:</target> -<source>&Reset</source> -<target>&Limpar tudo</target> +<source>C&lear</source> +<target>&Limpar</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Selecione regras de filtro para exlcuir certos arquivos da sincronização. Entre com os caminhos relativos dos pares de pastas correspondentes.</target> @@ -857,20 +863,20 @@ O comando é disparado se: <source>Delete files:</source> <target>Apagar arquivos:</target> -<source>Permanent</source> -<target>Permanente</target> +<source>&Permanent</source> +<target>&Permanente</target> <source>Delete or overwrite files permanently</source> <target>Apaga ou substitui os arquivos permanentemente</target> -<source>Recycle bin</source> -<target>Lixeira</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>Versioning</source> -<target>Controle de versões</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> @@ -881,14 +887,11 @@ O comando é disparado se: <source>Handle errors:</source> <target>Tratamento de erros:</target> -<source>Ignore</source> -<target>Ignorar</target> - <source>Hide all error and warning messages</source> <target>Oculta todas as mensagens de erros e avisos</target> -<source>Pop-up</source> -<target>Pop-up</target> +<source>&Pop-up</source> +<target>&Pop-up</target> <source>Show pop-up on errors or warnings</source> <target>Mostra pop-up em caso de erros ou avisos</target> @@ -911,9 +914,6 @@ O comando é disparado se: <source>Items found:</source> <target>Elementos encontrados:</target> -<source>Speed:</source> -<target>Velocidade:</target> - <source>Time remaining:</source> <target>Tempo restante:</target> @@ -926,6 +926,9 @@ O comando é disparado se: <source>Minimize to notification area</source> <target>Minimizar para a área de notificação</target> +<source>Bytes copied:</source> +<target>Bytes copiados:</target> + <source>Close</source> <target>Fechar</target> @@ -938,6 +941,9 @@ O comando é disparado se: <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> +<source>&Stop</source> +<target>&Parar</target> + <source>Stop synchronization at first error</source> <target>Interrompe a sincronização ao primeiro erro</target> @@ -956,9 +962,6 @@ O comando é disparado se: <source>How can I schedule a batch job?</source> <target>Como posso agendar uma tarefa em lote?</target> -<source>&Recycle bin</source> -<target>&Lixeira</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> @@ -1007,8 +1010,11 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Description</source> <target>Descrição</target> -<source>Restore hidden windows</source> -<target>Restaurar janelas ocultadas</target> +<source>Show hidden dialogs again</source> +<target>Mostrar diálogos ocultados</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Mostra todos os diálogos e mensagens de alerta permanentemente ocultados</target> <source>&Default</source> <target>&Config. Padrão</target> @@ -1070,8 +1076,8 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Main Bar</source> <target>Barra Principal</target> -<source>Compare both sides</source> -<target>Comparar os dois lados</target> +<source>Start comparison</source> +<target>Iniciar comparação</target> <source>Comparison settings</source> <target>Parâmetros de comparação</target> @@ -1166,9 +1172,6 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Select time span...</source> <target>Selecionar intervalo de tempo...</target> -<source>Default view</source> -<target>Visualização padrão</target> - <source>Show "%x"</source> <target>Mostrar "%x"</target> @@ -1199,7 +1202,7 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Synchronization Settings</source> <target>Configurações de Sincronização</target> -<source>Reset filter</source> +<source>Clear filter</source> <target>Limpar filtro</target> <source>Show files that exist on left side only</source> @@ -1358,8 +1361,11 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>- Other side's counterpart to %item_folder%</source> <target>- Contrapartida do outro lado para %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Restaurar todos as janelas e avisos ocultados?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Mostrar diálogos e mensanges de alerta ocultados novamente?</target> + +<source>&Show</source> +<target>&Mostrar</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 mudanças em ambos os lados. Arquivos e pastas apagados e/ou movidos e conflitos são detectados automaticamente usando um banco de dados.</target> diff --git a/FreeFileSync/Build/Languages/romanian.lng b/FreeFileSync/Build/Languages/romanian.lng index 8e5302bb..ee8e29ac 100644 --- a/FreeFileSync/Build/Languages/romanian.lng +++ b/FreeFileSync/Build/Languages/romanian.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Dosarul corespondent va fi considerat ca fiind gol.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Dosarele următoare au căi dependente. Atenție la setarea regulilor de sincronizare:</target> +<source>The following folder paths are dependent from each other:</source> +<target>Următoarele căi de dosare sînt dependente una de alta:</target> <source>File %x has an invalid date.</source> <target>Fila %x are o dată nevalidă.</target> @@ -199,6 +199,25 @@ <source>Update attributes on right</source> <target>Actualizează atributele în partea dreaptă</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>1 bait</pluralform> +<pluralform>%x baiți</pluralform> +<pluralform>%x de baiți</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>Fila cu baza de date %x este incompatibilă.</target> @@ -260,25 +279,6 @@ <source>Total time:</source> <target>Timp Total:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>1 bait</pluralform> -<pluralform>%x baiți</pluralform> -<pluralform>%x de baiți</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Eroare la parsarea filei %x, rîndul %y, coloana %z.</target> @@ -346,8 +346,8 @@ <source>&Quit</source> <target>&Ieși</target> -<source>&Program</source> -<target>&Program</target> +<source>&File</source> +<target>&Filă</target> <source>&View help</source> <target>&Cuprins</target> @@ -438,9 +438,6 @@ Comanda este declanșată dacă: <source>&Show error</source> <target>A&rată eroarea</target> -<source>&Exit</source> -<target>&Ieși</target> - <source>Incorrect command line:</source> <target>Linie de comandă incorectă:</target> @@ -504,8 +501,8 @@ Comanda este declanșată dacă: <source>Data verification error: %x and %y have different content.</source> <target>Eroare la verificarea datelor: %x și %y au conținut diferit.</target> -<source>Cannot find %x.</source> -<target>Nu pot găsi %x.</target> +<source>Cannot find folder %x.</source> +<target>Nu pot găsi dosarul %x.</target> <source>Target folder %x already existing.</source> <target>Dosarul țintă %x există deja.</target> @@ -534,8 +531,8 @@ Comanda este declanșată dacă: <source>Available:</source> <target>Disponibil:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Va fi modificat un dosar care face parte din mai multe perechi de dosare. Reverifică setările de sincronizare.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Mai multe perechi de dosare scriu într-un subdosar comun. Revezi configurația.</target> <source>Synchronizing folder pair:</source> <target>Sincronizez perechea de dosare:</target> @@ -574,7 +571,7 @@ Comanda este declanșată dacă: <target>&Nu arăta din nou această atenționare</target> <source>&Ignore</source> -<target>&OK</target> +<target>&Ignoră</target> <source>&Switch</source> <target>&Comută</target> @@ -637,8 +634,8 @@ Comanda este declanșată dacă: <source>Name</source> <target>Nume</target> -<source>Relative path</source> -<target>Cale Relativă</target> +<source>Relative folder</source> +<target>Dosar Relativ</target> <source>Base folder</source> <target>Dosar Bază (Rădăcină)</target> @@ -668,7 +665,7 @@ Comanda este declanșată dacă: <target>Setările locale de sincronizare</target> <source>Local filter</source> -<target>Filtru local</target> +<target>Filtru Local</target> <source>Active</source> <target>Activ</target> @@ -679,8 +676,8 @@ Comanda este declanșată dacă: <source>Remove local settings</source> <target>Înlătură setările locale</target> -<source>Reset local filter</source> -<target>Resetează filtrul local</target> +<source>Clear local filter</source> +<target>Curăță filtrul local</target> <source>Copy</source> <target>Copiază</target> @@ -700,11 +697,11 @@ Comanda este declanșată dacă: <source>Save as &batch job...</source> <target>Salvea&ză ca Sarcină Set...</target> -<source>1. &Compare</source> -<target>1. &Compară</target> +<source>Start &comparison</source> +<target>Pornește &Compararea</target> -<source>2. &Synchronize</source> -<target>2. &Sincronizează</target> +<source>Start &synchronization</source> +<target>Pornește &Sincronizarea</target> <source>&Options</source> <target>&Opțiuni</target> @@ -715,21 +712,24 @@ 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>&Tools</source> <target>&Unelte</target> +<source>&Check for new version</source> +<target>Caută &Versiune Nouă</target> + <source>&Check now</source> <target>&Caută Acum</target> <source>Check &automatically once a week</source> <target>Caută &Automat în Fiecare Săptămînă</target> -<source>&Check for new version</source> -<target>Caută &Versiune Nouă</target> - <source>Cancel</source> <target>Anulează</target> @@ -757,18 +757,15 @@ Comanda este declanșată dacă: <source>Match case</source> <target>Potrivește cu caseta literelor (MAJ/min)</target> +<source>New</source> +<target>Nouă</target> + <source>Open...</source> <target>Deschide...</target> <source>Save</source> <target>Salvează</target> -<source>Save as GUI job</source> -<target>Salvează ca Sarcină GUI [*.ffs_gui]</target> - -<source>Save as batch job</source> -<target>Salvează ca Sarcină Set [*.ffs_batch]</target> - <source>Save as...</source> <target>Salvează ca...</target> @@ -781,14 +778,14 @@ Comanda este declanșată dacă: <source>Statistics:</source> <target>Statistici:</target> -<source>Number of files and folders that will be created</source> -<target>Numărul de file și dosare care vor fi create</target> +<source>Number of files and folders that will be deleted</source> +<target>Numărul de file și dosare care vor fi șterse</target> <source>Number of files that will be overwritten</source> <target>Numărul de file care vor fi suprascrise</target> -<source>Number of files and folders that will be deleted</source> -<target>Numărul de file și dosare care vor fi șterse</target> +<source>Number of files and folders that will be created</source> +<target>Numărul de file și dosare care vor fi create</target> <source>Total bytes to copy</source> <target>Numărul total de baiți copiați</target> @@ -805,6 +802,15 @@ Comanda este declanșată dacă: <source>Identify equal files by comparing the file content.</source> <target>Filele identice sînt descoperite prin compararea conținutului filelor.</target> +<source>Ignore time shift (in hours)</source> +<target>Ignoră decalajul temporal (în ore)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Consideră ca identice timpurile filelor cu decalajul specificat</target> + +<source>Handle daylight saving time</source> +<target>Gestionarea timpului de vară (DST)</target> + <source>Symbolic links:</source> <target>Legături Simbolice:</target> @@ -835,8 +841,8 @@ Comanda este declanșată dacă: <source>Maximum:</source> <target>Maxim:</target> -<source>&Reset</source> -<target>&Resetează</target> +<source>C&lear</source> +<target>C&urăță</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Selectează regulile filtrului pentru a exclude anumite file de la sincronizare. Introdu căile filelor relative la perechea lor de dosare corespondentă.</target> @@ -861,20 +867,20 @@ Comanda este declanșată dacă: <source>Delete files:</source> <target>Ștergerea Filelor:</target> -<source>Permanent</source> -<target>Definitivă</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>Recycle bin</source> -<target>Reciclator</target> +<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>Versioning</source> -<target>Versionare</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> @@ -885,14 +891,11 @@ Comanda este declanșată dacă: <source>Handle errors:</source> <target>Gestionarea Erorilor:</target> -<source>Ignore</source> -<target>Ignorare</target> - <source>Hide all error and warning messages</source> <target>Mesajele de eroare și de avertizare nu sînt arătate</target> -<source>Pop-up</source> -<target>Popîc</target> +<source>&Pop-up</source> +<target>&Popîc</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> @@ -915,9 +918,6 @@ Comanda este declanșată dacă: <source>Items found:</source> <target>Elemente Găsite:</target> -<source>Speed:</source> -<target>Viteză:</target> - <source>Time remaining:</source> <target>Timp Rămas:</target> @@ -930,6 +930,9 @@ Comanda este declanșată dacă: <source>Minimize to notification area</source> <target>Minimizează în aria de notificare (sertar)</target> +<source>Bytes copied:</source> +<target>Baiți copiați:</target> + <source>Close</source> <target>Închide</target> @@ -942,6 +945,9 @@ 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>Stop synchronization at first error</source> <target>Oprește sincronizarea la prima eroare întîlnită</target> @@ -960,9 +966,6 @@ Comanda este declanșată dacă: <source>How can I schedule a batch job?</source> <target>Cum pot planifica o sarcină set?</target> -<source>&Recycle bin</source> -<target>&Reciclator</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Setările următoare sînt folosite pentru toate sarcinile de sincronizare.</target> @@ -1011,8 +1014,11 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Description</source> <target>Descriere</target> -<source>Restore hidden windows</source> -<target>Restaurează ferestrele ascunse</target> +<source>Show hidden dialogs again</source> +<target>Arată din nou dialogurile ascunse</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Sînt arătate din nou dialogurile și mesajele de eroare care au fost ascunse permanent</target> <source>&Default</source> <target>Coloanele &Implicite</target> @@ -1074,8 +1080,8 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Main Bar</source> <target>Bara Principală</target> -<source>Compare both sides</source> -<target>Compară Părțile Stîngă și Dreaptă</target> +<source>Start comparison</source> +<target>Pornește Compararea</target> <source>Comparison settings</source> <target>Setările Comparării</target> @@ -1174,9 +1180,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>Default view</source> -<target>Vedere Implicită</target> - <source>Show "%x"</source> <target>Arată "%x"</target> @@ -1207,8 +1210,8 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Synchronization Settings</source> <target>Setările Sincronizării</target> -<source>Reset filter</source> -<target>Resetează Filtrul</target> +<source>Clear filter</source> +<target>Curăță Filtrul</target> <source>Show files that exist on left side only</source> <target>Arată filele care există doar în stînga</target> @@ -1368,8 +1371,11 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>- Other side's counterpart to %item_folder%</source> <target>- corespondentul din partea opusă al lui %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Restaurezi toate ferestrele și avertismentele ascunse?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Arăt din nou dialogurile și mesajele de eroare ascunse?</target> + +<source>&Show</source> +<target>&Arată</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Identifică și propagă modificările din ambele părți. Ștergerile, renumirile și conflictele sînt detectate automat, folosind o bază de date.</target> diff --git a/FreeFileSync/Build/Languages/russian.lng b/FreeFileSync/Build/Languages/russian.lng index bb35b592..ca7d03f9 100644 --- a/FreeFileSync/Build/Languages/russian.lng +++ b/FreeFileSync/Build/Languages/russian.lng @@ -109,8 +109,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Соответствующая папка будет считаться пустой.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Следующие папки имеют зависимые пути. Будьте осторожны при настройке правил синхронизации:</target> +<source>The following folder paths are dependent from each other:</source> +<target>Следующие пути папок зависят друг от друга:</target> <source>File %x has an invalid date.</source> <target>Файл %x имеет недействительную дату.</target> @@ -202,6 +202,25 @@ <source>Update attributes on right</source> <target>Обновление атрибутов справа</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>%x байт</pluralform> +<pluralform>%x байта</pluralform> +<pluralform>%x байт</pluralform> +</target> + +<source>%x MB</source> +<target>%x МБ</target> + +<source>%x KB</source> +<target>%x КБ</target> + +<source>%x GB</source> +<target>%x ГБ</target> + <source>Database file %x is incompatible.</source> <target>Файл базы данных %x несовместим.</target> @@ -263,25 +282,6 @@ <source>Total time:</source> <target>Общее время:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>%x байт</pluralform> -<pluralform>%x байта</pluralform> -<pluralform>%x байт</pluralform> -</target> - -<source>%x MB</source> -<target>%x МБ</target> - -<source>%x KB</source> -<target>%x КБ</target> - -<source>%x GB</source> -<target>%x ГБ</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Ошибка при разборе файла %x, строка %y, колонка %z.</target> @@ -349,7 +349,7 @@ <source>&Quit</source> <target>&Выход</target> -<source>&Program</source> +<source>&File</source> <target>&Файл</target> <source>&View help</source> @@ -441,9 +441,6 @@ The command is triggered if: <source>&Show error</source> <target>&Показать ошибку</target> -<source>&Exit</source> -<target>&Выход</target> - <source>Incorrect command line:</source> <target>Неверная командная строка:</target> @@ -507,8 +504,8 @@ The command is triggered if: <source>Data verification error: %x and %y have different content.</source> <target>Ошибка проверки данных: %x и %y имеют разное содержание!</target> -<source>Cannot find %x.</source> -<target>Невозможно найти %x.</target> +<source>Cannot find folder %x.</source> +<target>Невозможно найти папку %x.</target> <source>Target folder %x already existing.</source> <target>Целевая папка %x уже существует.</target> @@ -540,8 +537,8 @@ The command is triggered if: <source>Available:</source> <target>Доступно:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Папка, входящая в несколько пар папок, будет изменена. Пожалуйста, проверьте настройки синхронизации.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Несколько пар папок пишут в общую папку. Пожалуйста, проверьте конфигурацию.</target> <source>Synchronizing folder pair:</source> <target>Синхронизация пары папок:</target> @@ -643,8 +640,8 @@ The command is triggered if: <source>Name</source> <target>Имя</target> -<source>Relative path</source> -<target>Относительный путь</target> +<source>Relative folder</source> +<target>Относительная папка</target> <source>Base folder</source> <target>Основная папка</target> @@ -685,8 +682,8 @@ The command is triggered if: <source>Remove local settings</source> <target>Удалить локальные настройки</target> -<source>Reset local filter</source> -<target>Сбросить локальный фильтр</target> +<source>Clear local filter</source> +<target>Очистить локальный фильтр</target> <source>Copy</source> <target>Копировать</target> @@ -704,13 +701,13 @@ The command is triggered if: <target>&Сохранить</target> <source>Save as &batch job...</source> -<target>Сохранить как &пакетное задание</target> +<target>Сохранить как пакетное &задание</target> -<source>1. &Compare</source> -<target>1. С&равнить</target> +<source>Start &comparison</source> +<target>Начать с&равнение</target> -<source>2. &Synchronize</source> -<target>2. С&инхронизировать</target> +<source>Start &synchronization</source> +<target>Начать с&инхронизацию</target> <source>&Options</source> <target>&Настройки</target> @@ -721,21 +718,24 @@ The command is triggered if: <source>&Find...</source> <target>&Найти...</target> +<source>&Reset layout</source> +<target>&Сбросить расположение</target> + <source>&Export file list...</source> <target>&Экспортировать список файлов...</target> <source>&Tools</source> <target>&Инструменты</target> +<source>&Check for new version</source> +<target>&Проверка обновлений</target> + <source>&Check now</source> <target>&Проверить сейчас</target> <source>Check &automatically once a week</source> <target>Проверять &автоматически раз в неделю</target> -<source>&Check for new version</source> -<target>&Проверка обновлений</target> - <source>Cancel</source> <target>Отмена</target> @@ -763,18 +763,15 @@ The command is triggered if: <source>Match case</source> <target>Учитывать регистр</target> +<source>New</source> +<target>Новая</target> + <source>Open...</source> <target>Открыть...</target> <source>Save</source> <target>Сохранить</target> -<source>Save as GUI job</source> -<target>Сохранить как обычное задание</target> - -<source>Save as batch job</source> -<target>Сохранить как пакетное задание</target> - <source>Save as...</source> <target>Сохранить как...</target> @@ -787,14 +784,14 @@ The command is triggered if: <source>Statistics:</source> <target>Статистика:</target> -<source>Number of files and folders that will be created</source> -<target>Количество файлов и папок, которые будут созданы</target> +<source>Number of files and folders that will be deleted</source> +<target>Количество файлов и папок, которые будут удалены</target> <source>Number of files that will be overwritten</source> <target>Количество файлов, которые будут перезаписаны</target> -<source>Number of files and folders that will be deleted</source> -<target>Количество файлов и папок, которые будут удалены</target> +<source>Number of files and folders that will be created</source> +<target>Количество файлов и папок, которые будут созданы</target> <source>Total bytes to copy</source> <target>Всего байт для копирования</target> @@ -811,11 +808,20 @@ The command is triggered if: <source>Identify equal files by comparing the file content.</source> <target>Определять одинаковые файлы путем сравнения содержания файла.</target> +<source>Ignore time shift (in hours)</source> +<target>Игнорировать временной сдвиг (в часах)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Считать время файлов с указанным смещением равным</target> + +<source>Handle daylight saving time</source> +<target>Ручной переход на летнее время</target> + <source>Symbolic links:</source> <target>Символьные ссылки:</target> <source>More information</source> -<target>Подробнее</target> +<target>Больше информации</target> <source>Local settings:</source> <target>Локальные настройки:</target> @@ -827,7 +833,7 @@ The command is triggered if: <target>Исключить:</target> <source>Show examples</source> -<target>Подробнее</target> +<target>Показать примеры</target> <source>Time span:</source> <target>Промежуток времени:</target> @@ -841,8 +847,8 @@ The command is triggered if: <source>Maximum:</source> <target>максимум:</target> -<source>&Reset</source> -<target>&Сбросить</target> +<source>C&lear</source> +<target>&Очистить</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Выберите правила фильтрации для исключения определенных файлов из синхронизации. Введите пути файлов относящиеся к соответствующим парам папок.</target> @@ -867,20 +873,20 @@ The command is triggered if: <source>Delete files:</source> <target>Удаление файлов:</target> -<source>Permanent</source> -<target>Удалять безвозвратно</target> +<source>&Permanent</source> +<target>&Удалять безвозвратно</target> <source>Delete or overwrite files permanently</source> <target>Удалять или перезаписывать файлы, не помещая в "Корзину"</target> -<source>Recycle bin</source> -<target>Перемещать в "Корзину"</target> +<source>&Recycle bin</source> +<target>В "&Корзину"</target> <source>Back up deleted and overwritten files in the recycle bin</source> <target>Делать резервную копию удаленных и перезаписанных файлов в "Корзине"</target> -<source>Versioning</source> -<target>Архивировать</target> +<source>&Versioning</source> +<target>&Архивировать</target> <source>Move files to a user-defined folder</source> <target>Перемещать файлы в пользовательскую папку</target> @@ -891,14 +897,11 @@ The command is triggered if: <source>Handle errors:</source> <target>Обработка ошибкок:</target> -<source>Ignore</source> -<target>Игнорировать</target> - <source>Hide all error and warning messages</source> <target>Скрывать все ошибки и сообщения с предупреждениями</target> -<source>Pop-up</source> -<target>Показывать всплывающие окна</target> +<source>&Pop-up</source> +<target>&Всплывающие окна</target> <source>Show pop-up on errors or warnings</source> <target>Показывать всплывающие окна при ошибках и предупреждениях</target> @@ -921,9 +924,6 @@ The command is triggered if: <source>Items found:</source> <target>Элементов найдено:</target> -<source>Speed:</source> -<target>Скорость:</target> - <source>Time remaining:</source> <target>Времени осталось:</target> @@ -936,6 +936,9 @@ The command is triggered if: <source>Minimize to notification area</source> <target>Свернуть в область уведомлений</target> +<source>Bytes copied:</source> +<target>Данных скопированно:</target> + <source>Close</source> <target>Закрыть</target> @@ -952,6 +955,9 @@ The command is triggered if: в планировщике задач: %x </target> +<source>&Stop</source> +<target>&Остановить</target> + <source>Stop synchronization at first error</source> <target>Остановить синхронизацию при первой ошибке</target> @@ -970,9 +976,6 @@ The command is triggered if: <source>How can I schedule a batch job?</source> <target>Как запланировать пакетное задание?</target> -<source>&Recycle bin</source> -<target>В "&Корзину"</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Следующие настройки используются для всех заданий синхронизации.</target> @@ -1021,8 +1024,11 @@ This guarantees a consistent state even in case of a serious error. <source>Description</source> <target>Описание</target> -<source>Restore hidden windows</source> -<target>Восстановить скрытые окна</target> +<source>Show hidden dialogs again</source> +<target>Показать скрытые окна снова</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Показать все скрытые окна и сообщения с предупреждениями снова</target> <source>&Default</source> <target>&По умолчанию</target> @@ -1084,8 +1090,8 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>Главная панель</target> -<source>Compare both sides</source> -<target>Сравнить обе стороны</target> +<source>Start comparison</source> +<target>Начать сравнение</target> <source>Comparison settings</source> <target>Настройки сравнения</target> @@ -1184,9 +1190,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>Выберите промежуток времени...</target> -<source>Default view</source> -<target>Стандартный вид</target> - <source>Show "%x"</source> <target>Показать "%x"</target> @@ -1217,8 +1220,8 @@ This guarantees a consistent state even in case of a serious error. <source>Synchronization Settings</source> <target>Настройки синхронизации</target> -<source>Reset filter</source> -<target>Сбросить фильтр</target> +<source>Clear filter</source> +<target>Очистить фильтр</target> <source>Show files that exist on left side only</source> <target>Показать файлы, существующие только слева</target> @@ -1381,8 +1384,11 @@ This guarantees a consistent state even in case of a serious error. <source>- Other side's counterpart to %item_folder%</source> <target>- аналог %item_folder% с другой стороны</target> -<source>Restore all hidden windows and warnings?</source> -<target>Восстановить все скрытые окна и предупреждения?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Показать скрытые окна и сообщения с предупреждениями снова?</target> + +<source>&Show</source> +<target>&Показать</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Выявять и распространять изменения на обе стороны. Удаленные, перемещенные и конфликтующие файлы определяются автоматически с использованием базы данных.</target> @@ -1490,10 +1496,10 @@ This guarantees a consistent state even in case of a serious error. <target>Невозможно записать время изменения файла %x.</target> <source>Cannot read security context of %x.</source> -<target>Невозможно прочитать контекст безобасности %x.</target> +<target>Невозможно прочитать контекст безопасности %x.</target> <source>Cannot write security context of %x.</source> -<target>Невозможно записать контекст безобасности %x.</target> +<target>Невозможно записать контекст безопасности %x.</target> <source>Cannot read permissions of %x.</source> <target>Невозможно прочитать права доступа %x.</target> @@ -1565,7 +1571,7 @@ This guarantees a consistent state even in case of a serious error. <target>Невозможно зарегистрироваться для получения системных сообщений.</target> <source>Cannot set privilege %x.</source> -<target>Невозможно установить привелегии %x.</target> +<target>Невозможно установить привилегии %x.</target> <source>Unable to suspend system sleep mode.</source> <target>Невозможно приостановить режим сна системы.</target> diff --git a/FreeFileSync/Build/Languages/scottish_gaelic.lng b/FreeFileSync/Build/Languages/scottish_gaelic.lng index fe2c3069..14ff1dc5 100644 --- a/FreeFileSync/Build/Languages/scottish_gaelic.lng +++ b/FreeFileSync/Build/Languages/scottish_gaelic.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Thèid am pasgan a leanas a làimhseachadh mar phasgan falamh.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Tha slighean eisimeileachdach aig na pasganan a leanas. Bi faiceallach nuair a chruthaicheas tu riaghailtean sioncronachaidh:</target> +<source>The following folder paths are dependent from each other:</source> +<target>Tha slighean nam pasganan a leanas an eisimeil a chèile:</target> <source>File %x has an invalid date.</source> <target>Tha ceann-là mì-dhligheach aig an fhaidhle %x.</target> @@ -137,7 +137,7 @@ <target>A’ gintinn liosta nam faidhle...</target> <source>Starting comparison</source> -<target>A’ tòiseachadh air a’ choimeas</target> +<target>A’ tòiseachadh air a’ choimeasadh</target> <source>Calculating sync directions...</source> <target>Ag àireamhachadh comhairean an t-sioncronachaidh...</target> @@ -199,6 +199,26 @@ <source>Update attributes on right</source> <target>Ùraich na buadhan air an taobh deas</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>%x byte</pluralform> +<pluralform>%x bytes</pluralform> +<pluralform>%x bytes</pluralform> +<pluralform>%x bytes</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>Chan eil am faidhle stòir-dhàta %x co-chòrdail.</target> @@ -261,26 +281,6 @@ <source>Total time:</source> <target>An ùine gu lèir:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>%x byte</pluralform> -<pluralform>%x bytes</pluralform> -<pluralform>%x bytes</pluralform> -<pluralform>%x bytes</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Mearachd le parsadh an fhaidhle %x, loidhne %y, colbh %z.</target> @@ -349,8 +349,8 @@ <source>&Quit</source> <target>&Fàg</target> -<source>&Program</source> -<target>&Prògram</target> +<source>&File</source> +<target>&Faidhle</target> <source>&View help</source> <target>&Faic a’ chobhair</target> @@ -441,9 +441,6 @@ Thèid an loidhne-àithne a chur gu dol: <source>&Show error</source> <target>&Seall a’ mhearachd</target> -<source>&Exit</source> -<target>&Fàg an-seo</target> - <source>Incorrect command line:</source> <target>Loidhne-àithne chearr:</target> @@ -507,8 +504,8 @@ Thèid an loidhne-àithne a chur gu dol: <source>Data verification error: %x and %y have different content.</source> <target>Mearachd le dearbhadh an dàta: tha susbaint eadar-dhealaichte ann an %x agus %y.</target> -<source>Cannot find %x.</source> -<target>Cha ghabh %x a lorg.</target> +<source>Cannot find folder %x.</source> +<target>Chan urrainn dhuinn am pasgan %x a lorg</target> <source>Target folder %x already existing.</source> <target>Tha am pasgan-uidhe %x ann mu thràth.</target> @@ -537,8 +534,8 @@ Thèid an loidhne-àithne a chur gu dol: <source>Available:</source> <target>Na tha ri làimh:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Thèid pasgan atharrachadh a tha ’na phàirt de dh’iomadh paidhir de phasgain. Nach doir thu sùil air roghainnean an t-sioncronachaidh?</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Tha grunnan a phaidhrichean phasganan a’ sgrìobhadh anns an aon fho-phasgan. Thoir sùil air an rèiteachadh</target> <source>Synchronizing folder pair:</source> <target>A’ sioncronachadh paidhir nam pasgan:</target> @@ -641,8 +638,8 @@ Thèid an loidhne-àithne a chur gu dol: <source>Name</source> <target>Ainm</target> -<source>Relative path</source> -<target>An t-slighe dhàimheach</target> +<source>Relative folder</source> +<target>Pasgan dàimheach</target> <source>Base folder</source> <target>Bun-phasgan</target> @@ -683,8 +680,8 @@ Thèid an loidhne-àithne a chur gu dol: <source>Remove local settings</source> <target>Thoir air falbh na roghainnean ionadail</target> -<source>Reset local filter</source> -<target>Ath-shuidhich a’ chriathrag ionadail</target> +<source>Clear local filter</source> +<target>Falamhaich a’ chriathrag iondail</target> <source>Copy</source> <target>Dèan lethbhreac</target> @@ -704,11 +701,11 @@ Thèid an loidhne-àithne a chur gu dol: <source>Save as &batch job...</source> <target>Sàbhail mar obair &baidse...</target> -<source>1. &Compare</source> -<target>1. &Dèan coimeas</target> +<source>Start &comparison</source> +<target>Tòisich air a’ &choimheas</target> -<source>2. &Synchronize</source> -<target>2. &Dèan sioncronachadh</target> +<source>Start &synchronization</source> +<target>Tòisich air an t-&sioncronachadh</target> <source>&Options</source> <target>R&oghainnean</target> @@ -719,21 +716,24 @@ Thèid an loidhne-àithne a chur gu dol: <source>&Find...</source> <target>L&org...</target> +<source>&Reset layout</source> +<target>&Ath-shuidhich a’ cho-dhealbhachd</target> + <source>&Export file list...</source> <target>Às-p&hortaich liosta nam faidhle...</target> <source>&Tools</source> <target>&Innealan</target> +<source>&Check for new version</source> +<target>Thoir sùil a&ch a bheil tionndadh ùr ann</target> + <source>&Check now</source> <target>&Thoir sùil an-dràsta</target> <source>Check &automatically once a week</source> <target>Thoir sùil gu &fèin-obrachail turas san t-seachdain</target> -<source>&Check for new version</source> -<target>Thoir sùil a&ch a bheil tionndadh ùr ann</target> - <source>Cancel</source> <target>Sguir dheth</target> @@ -761,18 +761,15 @@ Thèid an loidhne-àithne a chur gu dol: <source>Match case</source> <target>An aire do litrichean mòra ’s beaga</target> +<source>New</source> +<target>Ùr</target> + <source>Open...</source> <target>Fosgail...</target> <source>Save</source> <target>Sàbhail</target> -<source>Save as GUI job</source> -<target>Sàbhail mar obair GUI</target> - -<source>Save as batch job</source> -<target>Sàbhail mar obair baidse</target> - <source>Save as...</source> <target>Sàbhail mar...</target> @@ -785,14 +782,14 @@ Thèid an loidhne-àithne a chur gu dol: <source>Statistics:</source> <target>Stats:</target> -<source>Number of files and folders that will be created</source> -<target>Àireamh nam faidhle ’s nam pasgan a thèid a chruthachadh</target> +<source>Number of files and folders that will be deleted</source> +<target>Àireamh nam faidhle ’s nam pasgan a thèid a sguabadh às</target> <source>Number of files that will be overwritten</source> <target>Àireamh nam faidhle a thèid sgrìobhadh thairis orra</target> -<source>Number of files and folders that will be deleted</source> -<target>Àireamh nam faidhle ’s nam pasgan a thèid a sguabadh às</target> +<source>Number of files and folders that will be created</source> +<target>Àireamh nam faidhle ’s nam pasgan a thèid a chruthachadh</target> <source>Total bytes to copy</source> <target>Co mheud baidht a thèid lethbhreac a dhèanamh dhiubh</target> @@ -809,6 +806,15 @@ Thèid an loidhne-àithne a chur gu dol: <source>Identify equal files by comparing the file content.</source> <target>Lorg faidhlichean a tha co-ionnann le bhith a’ dèanamh coimeas eadar susbaint nam faidhlichean.</target> +<source>Ignore time shift (in hours)</source> +<target>Leig seachad sioft an ama (ann an uairean a thìde)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Làimhsich amannan fhaidhlichean aig a bheil an offset sin mar gum biodh iad co-ionnann</target> + +<source>Handle daylight saving time</source> +<target>Aire ri tìde an t-samhraidh</target> + <source>Symbolic links:</source> <target>Ceanglaichean samhlachail:</target> @@ -839,8 +845,8 @@ Thèid an loidhne-àithne a chur gu dol: <source>Maximum:</source> <target>Air a’ char as motha:</target> -<source>&Reset</source> -<target>&Ath-shuidhich</target> +<source>C&lear</source> +<target>Fala&mhaich</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Tagh riaghailteach criathraidh gus seòrsachan àraidh de dh’fhaidhlichean fhàgail às an t-sioncronachadh. Cuir a-steach slighean fhaidhlichean a-rèir paidhir an dà phasgan aca.</target> @@ -865,20 +871,20 @@ Thèid an loidhne-àithne a chur gu dol: <source>Delete files:</source> <target>Sguab às na faidhlichean:</target> -<source>Permanent</source> -<target>Buan</target> +<source>&Permanent</source> +<target>&Buan</target> <source>Delete or overwrite files permanently</source> <target>Sguab às no sgrìobh thairis air faidhlichean gu buan</target> -<source>Recycle bin</source> -<target>Am biona</target> +<source>&Recycle bin</source> +<target>A&m biona</target> <source>Back up deleted and overwritten files in the recycle bin</source> <target>Dèan lethbhreac-glèidhidh de dh’fhaidhlichean sa bhiona a chaidh a sguabadh às no a chaidh sgrìobhadh thairis orra</target> -<source>Versioning</source> -<target>Versioning</target> +<source>&Versioning</source> +<target>&Versioning</target> <source>Move files to a user-defined folder</source> <target>Gluais na faidhlichean gu àite a shònraich an cleachdaiche</target> @@ -889,14 +895,11 @@ Thèid an loidhne-àithne a chur gu dol: <source>Handle errors:</source> <target>Mearachdan làimhseachaidh:</target> -<source>Ignore</source> -<target>Leig seachad</target> - <source>Hide all error and warning messages</source> <target>Falaich gach teachdaireachd mu mhearachdan no rabhaidhean</target> -<source>Pop-up</source> -<target>Priob-uinneag</target> +<source>&Pop-up</source> +<target>&Priob-uinneag</target> <source>Show pop-up on errors or warnings</source> <target>Seall priob-uinneagan a thaobh mhearachdan no rabhaidhean</target> @@ -919,9 +922,6 @@ Thèid an loidhne-àithne a chur gu dol: <source>Items found:</source> <target>Rudan a chaidh a lorg:</target> -<source>Speed:</source> -<target>Astar:</target> - <source>Time remaining:</source> <target>An ùine a tha air fhàgail:</target> @@ -934,6 +934,9 @@ Thèid an loidhne-àithne a chur gu dol: <source>Minimize to notification area</source> <target>Lùghdach ’s gluais gu raon nam brathan</target> +<source>Bytes copied:</source> +<target>Bytes a chaidh lethbhreac a dhèanamh dhiubh</target> + <source>Close</source> <target>Dùin</target> @@ -946,6 +949,9 @@ Thèid an loidhne-àithne a chur gu dol: <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> <target>Cruthaich faidhle batch airson sioncronachadh a dh’obraicheas gun thusa a bhith an làthair. Gus a thòiseachadh, dèan briogadh dùbailte air an fhaidhle seo ann am planadair shaothraichean: %x</target> +<source>&Stop</source> +<target>&Sguir dheth</target> + <source>Stop synchronization at first error</source> <target>Sguir dhen t-sioncronachadh aig a’ chiad mhearachd</target> @@ -964,9 +970,6 @@ Thèid an loidhne-àithne a chur gu dol: <source>How can I schedule a batch job?</source> <target>Ciamar a chuireas mi obair baidse air an sgeideal?</target> -<source>&Recycle bin</source> -<target>A&m biona</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Thèid na roghainnean a leanas a chleachdadh airson a h-uile obair sioncronachaidh.</target> @@ -1015,8 +1018,11 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <source>Description</source> <target>Tuairisgeul</target> -<source>Restore hidden windows</source> -<target>Aisig na h-uinneagan falaichte</target> +<source>Show hidden dialogs again</source> +<target>Seall na còmraidhean falaichte a-rithist</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Seall na còmraidhean is rabhaidhean falaichte uile a-rithist</target> <source>&Default</source> <target>&Bun-roghainn</target> @@ -1078,8 +1084,8 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <source>Main Bar</source> <target>Am prìomh-bhàr</target> -<source>Compare both sides</source> -<target>Dèan coimeas air an dà thaobh</target> +<source>Start comparison</source> +<target>Tòisich air a’ choimeasadh</target> <source>Comparison settings</source> <target>Roghainnean a’ choimeasaidh</target> @@ -1182,9 +1188,6 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <source>Select time span...</source> <target>Tagh an raon-ama...</target> -<source>Default view</source> -<target>An sealladh bunaiteach</target> - <source>Show "%x"</source> <target>Seall “%x”</target> @@ -1215,8 +1218,8 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <source>Synchronization Settings</source> <target>Roghainnean an t-sioncronachaidh</target> -<source>Reset filter</source> -<target>Ath-shuidhich a’ chriathrag</target> +<source>Clear filter</source> +<target>Falamhaich a’ chriathrag</target> <source>Show files that exist on left side only</source> <target>Na seall ach faidhlichean a tha air an taobh chlì a-mhàin</target> @@ -1378,8 +1381,11 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <source>- Other side's counterpart to %item_folder%</source> <target>- Seise %item_folder% aig a’ choimpiutair eile</target> -<source>Restore all hidden windows and warnings?</source> -<target>A bheil thu airson gach uinneag is rabhadh falaichte aiseaga?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>A bheil thu airson na còmhraidhean is rabhaidhean falaichte a shealltainn a-rithist?</target> + +<source>&Show</source> +<target>&Seall</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Lorg is sìolaich na h-atharraichean air an dà thaobh. Mothaichidh sinn do rudan a chaidh a sguabadh às, a ghluasad no còmhstrithean gu fèin-obrachail le stòr-dàta.</target> diff --git a/FreeFileSync/Build/Languages/serbian.lng b/FreeFileSync/Build/Languages/serbian.lng index 64516484..be37ffa6 100644 --- a/FreeFileSync/Build/Languages/serbian.lng +++ b/FreeFileSync/Build/Languages/serbian.lng @@ -7,6 +7,9 @@ <plural_definition>n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2</plural_definition> </header> +<source>Unable to set application identifier.</source> +<target></target> + <source>Both sides have changed since last synchronization.</source> <target>Обе су стране промењене од последње синхронизације.</target> @@ -106,8 +109,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Одговарајући фолдер сматраће се празним.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Следећи фолдери имају зависне путање. Будите пажљиви када подешавате синхронизациона правила:</target> +<source>The following folder paths are dependent from each other:</source> +<target>Следећи фолдерски парови зависни су један од другог:</target> <source>File %x has an invalid date.</source> <target>Датотека %x има невалидни датум.</target> @@ -199,6 +202,28 @@ <source>Update attributes on right</source> <target>Освежи атрибуте десно</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>%x бајт</pluralform> +<pluralform>%x бајта</pluralform> +<pluralform>%x бајтова</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + +<source>Cannot load file %x.</source> +<target>Не могу учитати датотеку %x.</target> + <source>Database file %x is incompatible.</source> <target>Датотека базе %x је некомпатибилна.</target> @@ -260,25 +285,6 @@ <source>Total time:</source> <target>Укупно време:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>%x бајт</pluralform> -<pluralform>%x бајта</pluralform> -<pluralform>%x бајтова</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Грешка у анализи датотеке %x, ред %y, колона %z.</target> @@ -322,9 +328,6 @@ <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source> <target>Молимо користите FreeFileSync 64-битну верзију за израду shadow копија на овом систему.</target> -<source>Cannot load file %x.</source> -<target>Не могу учитати датотеку %x.</target> - <source>Cannot determine volume name for %x.</source> <target>Не могу утврдити назив партиције за %x.</target> @@ -346,8 +349,8 @@ <source>&Quit</source> <target>&Излаз</target> -<source>&Program</source> -<target>&Програм</target> +<source>&File</source> +<target>&Датотека</target> <source>&View help</source> <target>&Погледај помоћ</target> @@ -438,9 +441,6 @@ The command is triggered if: <source>&Show error</source> <target>&Прикажи грешку</target> -<source>&Exit</source> -<target>&Излаз</target> - <source>Incorrect command line:</source> <target>Нетачна командна линија:</target> @@ -504,8 +504,8 @@ The command is triggered if: <source>Data verification error: %x and %y have different content.</source> <target>Грешка при провери података: %x и %y имају различит садржај.</target> -<source>Cannot find %x.</source> -<target>Не могу пронаћи %x.</target> +<source>Cannot find folder %x.</source> +<target>Не могу пронаћи фолдер %x.</target> <source>Target folder %x already existing.</source> <target>Одредишни фолдер %x већ постоји.</target> @@ -534,8 +534,8 @@ The command is triggered if: <source>Available:</source> <target>Доступно:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Фолдер ће бити промењен који је део више парова фолдера. Молимо проверите синхронизацијска подешавања.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Више парова фолдера уписује у заједничком фолдеру. Молимо проверите вашу конфигурацију.</target> <source>Synchronizing folder pair:</source> <target>Синхронизовање фолдерског пара:</target> @@ -637,8 +637,8 @@ The command is triggered if: <source>Name</source> <target>Име</target> -<source>Relative path</source> -<target>Релативна путања</target> +<source>Relative folder</source> +<target>Релативни фолдер</target> <source>Base folder</source> <target>Основни фолдер</target> @@ -679,8 +679,8 @@ The command is triggered if: <source>Remove local settings</source> <target>Уклони локална подешавања</target> -<source>Reset local filter</source> -<target>Ресетуј локални филтер</target> +<source>Clear local filter</source> +<target>Обриши локални филтер</target> <source>Copy</source> <target>Копирај</target> @@ -700,11 +700,11 @@ The command is triggered if: <source>Save as &batch job...</source> <target>Сачувај као &беч задатак...</target> -<source>1. &Compare</source> -<target>1. &Упореди</target> +<source>Start &comparison</source> +<target>Почни &упоређивање</target> -<source>2. &Synchronize</source> -<target>2. &Синхронизуј</target> +<source>Start &synchronization</source> +<target>Почни &синхронизацију</target> <source>&Options</source> <target>&Опције</target> @@ -715,21 +715,24 @@ The command is triggered if: <source>&Find...</source> <target>&Нађи...</target> +<source>&Reset layout</source> +<target>&Ресетуј распоред</target> + <source>&Export file list...</source> <target>&Извоз листе датотека...</target> <source>&Tools</source> <target>&Алати</target> +<source>&Check for new version</source> +<target>&Провери постојање нове верзије</target> + <source>&Check now</source> <target>&Провери сада</target> <source>Check &automatically once a week</source> <target>Провери &аутоматски једном недељно</target> -<source>&Check for new version</source> -<target>&Провери постојање нове верзије</target> - <source>Cancel</source> <target>Одустани</target> @@ -757,18 +760,15 @@ The command is triggered if: <source>Match case</source> <target>По величини слова</target> +<source>New</source> +<target>Ново</target> + <source>Open...</source> <target>Отвори...</target> <source>Save</source> <target>Сачувај</target> -<source>Save as GUI job</source> -<target>Сачувај као GUI задатак</target> - -<source>Save as batch job</source> -<target>Сачувај као беч задатак</target> - <source>Save as...</source> <target>Сачувај као...</target> @@ -781,14 +781,14 @@ The command is triggered if: <source>Statistics:</source> <target>Статистика:</target> -<source>Number of files and folders that will be created</source> -<target>Број датотека и фолдера који ће бити креирани</target> +<source>Number of files and folders that will be deleted</source> +<target>Број датотека и фолдера који ће бити избрисани</target> <source>Number of files that will be overwritten</source> <target>Број датотека које ће бити замењене у садржају</target> -<source>Number of files and folders that will be deleted</source> -<target>Број датотека и фолдера који ће бити избрисани</target> +<source>Number of files and folders that will be created</source> +<target>Број датотека и фолдера који ће бити креирани</target> <source>Total bytes to copy</source> <target>Укупно бајтова за копирање</target> @@ -805,6 +805,15 @@ The command is triggered if: <source>Identify equal files by comparing the file content.</source> <target>Идентификуј једнаке датотеке упоређивањем садржаја датотека.</target> +<source>Ignore time shift (in hours)</source> +<target>Игнориши временски помак (у сатима)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Сматрај времена датотека са задатим помаком као једнака</target> + +<source>Handle daylight saving time</source> +<target>Руковођење сезонским рачунањем времена</target> + <source>Symbolic links:</source> <target>Симболичне везе:</target> @@ -835,8 +844,8 @@ The command is triggered if: <source>Maximum:</source> <target>Максимум:</target> -<source>&Reset</source> -<target>&Ресетуј</target> +<source>C&lear</source> +<target>О&бриши</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Одаберите филтерска подешавања да би искључили одређене датотеке из синхронизације. Унесите путање датотека релативно према њиховим одговарајућим фолдерским паровима.</target> @@ -861,20 +870,20 @@ The command is triggered if: <source>Delete files:</source> <target>Обриши датотеке:</target> -<source>Permanent</source> -<target>Трајно</target> +<source>&Permanent</source> +<target>&Трајно</target> <source>Delete or overwrite files permanently</source> <target>Трајно избриши или замени датотеке</target> -<source>Recycle bin</source> -<target>Корпа за смеће</target> +<source>&Recycle bin</source> +<target>&Корпа за смеће</target> <source>Back up deleted and overwritten files in the recycle bin</source> <target>Направи резервне копије обрисаних и замењених датотека у Корпи за смеће</target> -<source>Versioning</source> -<target>Верзионирање</target> +<source>&Versioning</source> +<target>&Верзионирање</target> <source>Move files to a user-defined folder</source> <target>Премести датотеке у кориснички одабран фолдер</target> @@ -885,14 +894,11 @@ The command is triggered if: <source>Handle errors:</source> <target>Обрада грешака:</target> -<source>Ignore</source> -<target>Игнориши</target> - <source>Hide all error and warning messages</source> <target>Сакриј све грешке и упозорења</target> -<source>Pop-up</source> -<target>Искачући прозор</target> +<source>&Pop-up</source> +<target>&Искачући прозор</target> <source>Show pop-up on errors or warnings</source> <target>Прикажи искачући прозор при грешкама и упозорењима</target> @@ -915,9 +921,6 @@ The command is triggered if: <source>Items found:</source> <target>Пронађене ставке:</target> -<source>Speed:</source> -<target>Брзина:</target> - <source>Time remaining:</source> <target>Преостало време:</target> @@ -930,6 +933,9 @@ The command is triggered if: <source>Minimize to notification area</source> <target>Минимизирај у области за обавештења</target> +<source>Bytes copied:</source> +<target>Бајта копирано:</target> + <source>Close</source> <target>Затвори</target> @@ -942,6 +948,9 @@ 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>Stop synchronization at first error</source> <target>Заустави синхронизацију при првој грешци</target> @@ -960,9 +969,6 @@ The command is triggered if: <source>How can I schedule a batch job?</source> <target>Како могу заказати беч задатак?</target> -<source>&Recycle bin</source> -<target>&Корпа за смеће</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Следећа подешавања се користе за све синхронизацијске задатке.</target> @@ -1011,8 +1017,11 @@ This guarantees a consistent state even in case of a serious error. <source>Description</source> <target>Опис</target> -<source>Restore hidden windows</source> -<target>Прикажи скривене прозоре</target> +<source>Show hidden dialogs again</source> +<target>Прикажи скривене прозоре поново</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Прикажи све трајно скривене прозоре и поруке упозорења поново</target> <source>&Default</source> <target>&Подразумевано</target> @@ -1074,8 +1083,8 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>Главна трака</target> -<source>Compare both sides</source> -<target>Упореди обе стране</target> +<source>Start comparison</source> +<target>Почни упоређивање</target> <source>Comparison settings</source> <target>Подешавања упоређивања</target> @@ -1174,9 +1183,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>Одаберите временски распон...</target> -<source>Default view</source> -<target>Подразумевани приказ</target> - <source>Show "%x"</source> <target>Прикажи "%x"</target> @@ -1207,8 +1213,8 @@ This guarantees a consistent state even in case of a serious error. <source>Synchronization Settings</source> <target>Подешавања синхронизације</target> -<source>Reset filter</source> -<target>Ресетуј филтер</target> +<source>Clear filter</source> +<target>Обриши филтер</target> <source>Show files that exist on left side only</source> <target>Прикажи датотеке које постоје само на левој страни</target> @@ -1368,8 +1374,11 @@ This guarantees a consistent state even in case of a serious error. <source>- Other side's counterpart to %item_folder%</source> <target>- Дупликат с друге стране у %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Прикажи све скривене прозоре и упозорења?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Прикажи све скривене прозоре и упозорења поново?</target> + +<source>&Show</source> +<target>&Прикажи</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Пронађи и изврши промене на обе стране. Брисања, премештања и конфликти се откривају аутоматски употребом базе података.</target> diff --git a/FreeFileSync/Build/Languages/slovenian.lng b/FreeFileSync/Build/Languages/slovenian.lng index 0e7ced97..5832b3f7 100644 --- a/FreeFileSync/Build/Languages/slovenian.lng +++ b/FreeFileSync/Build/Languages/slovenian.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Ustrezajoča mapa bo smatrana kot prazna.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Naslednje mape imajo odvisne poti. Bodite previdni pri nastavitvi sinhronizacijskih pravil:</target> +<source>The following folder paths are dependent from each other:</source> +<target>Naslednje poti imenikov so med seboj odvisne:</target> <source>File %x has an invalid date.</source> <target>Datoteka %x ima neveljaven datum.</target> @@ -199,6 +199,26 @@ <source>Update attributes on right</source> <target>Posodobi atribute na desni</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>%x bajt</pluralform> +<pluralform>%x bajta</pluralform> +<pluralform>%x bajti</pluralform> +<pluralform>%x bajtov</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>Datoteka podatkovne baze %x je nekompatibilna.</target> @@ -261,26 +281,6 @@ <source>Total time:</source> <target>Celoten čas:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>%x bajt</pluralform> -<pluralform>%x bajta</pluralform> -<pluralform>%x bajti</pluralform> -<pluralform>%x bajtov</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Napaka pri razčlenjevanju datoteke %x, vrstica %y, stolpec %z.</target> @@ -349,8 +349,8 @@ <source>&Quit</source> <target>&Zapri</target> -<source>&Program</source> -<target>&Program</target> +<source>&File</source> +<target>&Datoteka</target> <source>&View help</source> <target>&Prikaži pomoč</target> @@ -441,9 +441,6 @@ Ukaz se sproži če: <source>&Show error</source> <target>&Pokaži napako</target> -<source>&Exit</source> -<target>&Izhod</target> - <source>Incorrect command line:</source> <target>Napačna ukazna vrstica:</target> @@ -507,8 +504,8 @@ Ukaz se sproži če: <source>Data verification error: %x and %y have different content.</source> <target>Napaka pri preverjanju podatkov: %x in %y imata drugačno vsebino.</target> -<source>Cannot find %x.</source> -<target>Ne morem najti %x.</target> +<source>Cannot find folder %x.</source> +<target>Ne najdem mape %x.</target> <source>Target folder %x already existing.</source> <target>Ciljna mapa %x že obstaja.</target> @@ -537,8 +534,8 @@ Ukaz se sproži če: <source>Available:</source> <target>Na voljo:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Spremenjena bo mapa, ki je del večkratnih parov map. Prosim preglejte nastavitve sinhronizacije.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Več parov map zapisuje v skupno podmapo. Prosimo, preverite svojo konfiguracijo.</target> <source>Synchronizing folder pair:</source> <target>Sinhroniziram par map:</target> @@ -641,8 +638,8 @@ Ukaz se sproži če: <source>Name</source> <target>Ime</target> -<source>Relative path</source> -<target>Relativna pot</target> +<source>Relative folder</source> +<target>Relativna mapa</target> <source>Base folder</source> <target>Osnovna mapa</target> @@ -683,8 +680,8 @@ Ukaz se sproži če: <source>Remove local settings</source> <target>Odstrani lokalne nastavitve</target> -<source>Reset local filter</source> -<target>Ponastavi lokalne filtre</target> +<source>Clear local filter</source> +<target>Počisti lokalni filter</target> <source>Copy</source> <target>Kopiraj</target> @@ -696,7 +693,7 @@ Ukaz se sproži če: <target>Lokalne sinhnorizacijske nastavitve</target> <source>&New</source> -<target>&Novo</target> +<target>&Nova</target> <source>&Save</source> <target>&Shrani</target> @@ -704,11 +701,11 @@ Ukaz se sproži če: <source>Save as &batch job...</source> <target>Shrani kot serijsko op&ravilo...</target> -<source>1. &Compare</source> -<target>1. &Primerjaj</target> +<source>Start &comparison</source> +<target>Začni &primerjavo</target> -<source>2. &Synchronize</source> -<target>2. &Sinhroniziraj</target> +<source>Start &synchronization</source> +<target>Začni &sinhnorizacijo</target> <source>&Options</source> <target>&Možnosti</target> @@ -719,21 +716,24 @@ 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>&Tools</source> <target>&Orodja</target> +<source>&Check for new version</source> +<target>&Preveri, če obstaja nova verzija</target> + <source>&Check now</source> <target>P&reveri zdaj</target> <source>Check &automatically once a week</source> <target>S&amodejno preveri enkrat tedensko</target> -<source>&Check for new version</source> -<target>&Preveri, če obstaja nova verzija</target> - <source>Cancel</source> <target>Prekliči</target> @@ -761,18 +761,15 @@ Ukaz se sproži če: <source>Match case</source> <target>Ujemaj se s primerom</target> +<source>New</source> +<target>Nova</target> + <source>Open...</source> <target>Odpri...</target> <source>Save</source> <target>Shrani</target> -<source>Save as GUI job</source> -<target>Shrani kot opravilo v uporabniškem vmesniku</target> - -<source>Save as batch job</source> -<target>Shrani kot serijsko opravilo</target> - <source>Save as...</source> <target>Shrani kot...</target> @@ -785,14 +782,14 @@ Ukaz se sproži če: <source>Statistics:</source> <target>Statistika:</target> -<source>Number of files and folders that will be created</source> -<target>Število datotek in map, ki bodo ustvarjene</target> +<source>Number of files and folders that will be deleted</source> +<target>Število datotek in map, ki bodo izbrisane</target> <source>Number of files that will be overwritten</source> <target>Število datotek, ki bodo prepisane</target> -<source>Number of files and folders that will be deleted</source> -<target>Število datotek in map, ki bodo izbrisane</target> +<source>Number of files and folders that will be created</source> +<target>Število datotek in map, ki bodo ustvarjene</target> <source>Total bytes to copy</source> <target>Skupno bajtov za kopiranje</target> @@ -809,6 +806,15 @@ Ukaz se sproži če: <source>Identify equal files by comparing the file content.</source> <target>Določi enake datoteke s primerjavo vsebine.</target> +<source>Ignore time shift (in hours)</source> +<target>Ignorirani časovni okvir (v urah)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Čas datotek znotraj izbranga časovnega okvirja je upoštevan kot isti</target> + +<source>Handle daylight saving time</source> +<target>Upoštevaj poletni in zimski čas</target> + <source>Symbolic links:</source> <target>Simbolične povezave:</target> @@ -839,8 +845,8 @@ Ukaz se sproži če: <source>Maximum:</source> <target>Maksimum:</target> -<source>&Reset</source> -<target>&Ponovni zagon</target> +<source>C&lear</source> +<target>&Počisti</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Izberi filtrirna pravila za izključitev določenih datotek iz sinhnorizacije. Vpiši pot datotek relativno na imenik v obdelavi</target> @@ -865,20 +871,20 @@ Ukaz se sproži če: <source>Delete files:</source> <target>Izbriši datoteke:</target> -<source>Permanent</source> -<target>Trajno</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>Recycle bin</source> -<target>Koš</target> +<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>Versioning</source> -<target>Ustvarjanje različič</target> +<source>&Versioning</source> +<target>&Verzioniranje</target> <source>Move files to a user-defined folder</source> <target>Premakni datoteke v izbran imenik</target> @@ -889,14 +895,11 @@ Ukaz se sproži če: <source>Handle errors:</source> <target>Upravljanje napak:</target> -<source>Ignore</source> -<target>Ignoriraj</target> - <source>Hide all error and warning messages</source> <target>Skrij vsa obvestila o napakah in opozorilih</target> -<source>Pop-up</source> -<target>Pogovorno okno</target> +<source>&Pop-up</source> +<target>&Pop-up</target> <source>Show pop-up on errors or warnings</source> <target>Prikaži pojavne napaka ali opozorila</target> @@ -919,9 +922,6 @@ Ukaz se sproži če: <source>Items found:</source> <target>Najdenih elementov:</target> -<source>Speed:</source> -<target>Hitrost:</target> - <source>Time remaining:</source> <target>Preostali čas:</target> @@ -934,6 +934,9 @@ Ukaz se sproži če: <source>Minimize to notification area</source> <target>Pomanjšaj v območje obvestil</target> +<source>Bytes copied:</source> +<target>Prepisanih bajtov:</target> + <source>Close</source> <target>Zapri</target> @@ -946,6 +949,9 @@ 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 samodejno sinhnorizacijo. Za zagon dvojno kliknite to datoteko ali pa jo umestite v razporejevalnik opravil: %x</target> +<source>&Stop</source> +<target>&Ustavi</target> + <source>Stop synchronization at first error</source> <target>Ustavi sinhnorizacojo ob prvi napaki</target> @@ -964,9 +970,6 @@ Ukaz se sproži če: <source>How can I schedule a batch job?</source> <target>Kako nastavim urnik za serijsko opravilo?</target> -<source>&Recycle bin</source> -<target>&Koš</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Naslednje nastavitve se uporabljajo pri vseh sinhronizacijskih opravilih.</target> @@ -1015,8 +1018,11 @@ To zagotavlja konsistenco podatkov v primeru napake. <source>Description</source> <target>Opis</target> -<source>Restore hidden windows</source> -<target>Obnovi skrita okna</target> +<source>Show hidden dialogs again</source> +<target>Zopet prikaži skrite dilaoge</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Znova prikaži vse dokončno skrite dialoge in opozorila</target> <source>&Default</source> <target>&Privzeto</target> @@ -1078,8 +1084,8 @@ To zagotavlja konsistenco podatkov v primeru napake. <source>Main Bar</source> <target>Glavna vrstica</target> -<source>Compare both sides</source> -<target>Primerjaj obe strani</target> +<source>Start comparison</source> +<target>Začni primerjavo</target> <source>Comparison settings</source> <target>Nastavitve primerjanja</target> @@ -1182,9 +1188,6 @@ To zagotavlja konsistenco podatkov v primeru napake. <source>Select time span...</source> <target>Izberite časovni okvir...</target> -<source>Default view</source> -<target>Privzeti pogled</target> - <source>Show "%x"</source> <target>Prikaži "%x"</target> @@ -1215,8 +1218,8 @@ To zagotavlja konsistenco podatkov v primeru napake. <source>Synchronization Settings</source> <target>Nastavitve sinhnorizacije</target> -<source>Reset filter</source> -<target>Ponastavi filter</target> +<source>Clear filter</source> +<target>Počisti filter</target> <source>Show files that exist on left side only</source> <target>Prikaži datoteke, ki obstajajo samo na levi</target> @@ -1378,8 +1381,11 @@ To zagotavlja konsistenco podatkov v primeru napake. <source>- Other side's counterpart to %item_folder%</source> <target>- Na drugi strani nasprotno v %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Obnovim vsa skrita okna in opozorila?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Znova prikaži skrite dialoge in obvestila</target> + +<source>&Show</source> +<target>&Prikaži</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Identificiraj in razširjaj spremembe na obeh straneh. Izbrisi, premiki in spori so samodejno zaznani z uporabo podatkovne baze.</target> diff --git a/FreeFileSync/Build/Languages/spanish.lng b/FreeFileSync/Build/Languages/spanish.lng index 62b53c3a..3c142c1c 100644 --- a/FreeFileSync/Build/Languages/spanish.lng +++ b/FreeFileSync/Build/Languages/spanish.lng @@ -7,6 +7,9 @@ <plural_definition>n == 1 ? 0 : 1</plural_definition> </header> +<source>Unable to set application identifier.</source> +<target></target> + <source>Both sides have changed since last synchronization.</source> <target>Ambos lados han cambiado desde la última sincronización.</target> @@ -106,8 +109,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>La siguiente carpeta será considerada como vacía.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Las carpetas siguientes usan rutas dependientes. Tenga cuidado al definir reglas de sincronización:</target> +<source>The following folder paths are dependent from each other:</source> +<target>Las rutas de carpetas siguientes tienen dependencias reciprocas:</target> <source>File %x has an invalid date.</source> <target>El archivo %x tiene una fecha inválida.</target> @@ -199,6 +202,27 @@ <source>Update attributes on right</source> <target>Actualizar atributos en la derecha</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + +<source>Cannot load file %x.</source> +<target>No se puede cargar el archivo %x.</target> + <source>Database file %x is incompatible.</source> <target>El archivo de base de datos %x es incompatible.</target> @@ -259,24 +283,6 @@ <source>Total time:</source> <target>Tiempo total:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Error analizando archivo %x, fila %y, columna %z.</target> @@ -319,9 +325,6 @@ <source>Please use FreeFileSync 64-bit version to create shadow copies on this system.</source> <target>Por favor, use la versión de 64 bits de FreeFileSync para crear copias de Shadow en el sistema.</target> -<source>Cannot load file %x.</source> -<target>No se puede cargar el archivo %x.</target> - <source>Cannot determine volume name for %x.</source> <target>No se puede determinar nombre del volumen de %x.</target> @@ -343,8 +346,8 @@ <source>&Quit</source> <target>&Salir</target> -<source>&Program</source> -<target>&Programa</target> +<source>&File</source> +<target>&Archivo</target> <source>&View help</source> <target>&Ver ayuda</target> @@ -353,7 +356,7 @@ <target>&Acerca de</target> <source>&Help</source> -<target>&Ayuda</target> +<target>A&yuda</target> <source>Usage:</source> <target>Uso:</target> @@ -435,9 +438,6 @@ El comando es disparado si: <source>&Show error</source> <target>Mo&strar error</target> -<source>&Exit</source> -<target>&Salir</target> - <source>Incorrect command line:</source> <target>Línea de comandos incorrecta:</target> @@ -501,8 +501,8 @@ El comando es disparado si: <source>Data verification error: %x and %y have different content.</source> <target>Error al comprobar los datos: %x y %y tienen contenidos diferentes.</target> -<source>Cannot find %x.</source> -<target>No se pudo encontrar %x.</target> +<source>Cannot find folder %x.</source> +<target>No se puede encontrar la carpeta %x</target> <source>Target folder %x already existing.</source> <target>La carpeta de destino %x ya existe.</target> @@ -531,8 +531,8 @@ El comando es disparado si: <source>Available:</source> <target>Disponible:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Una carpeta, que es parte de múltiple pares de carpetas, será modificada. Por favor, revise las opciones de sincronización.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Tiene varias carpetas emparejadas para escribir en la misma subcarpeta. Revise su configuración.</target> <source>Synchronizing folder pair:</source> <target>Sincronizando par de carpetas:</target> @@ -633,8 +633,8 @@ El comando es disparado si: <source>Name</source> <target>Nombre</target> -<source>Relative path</source> -<target>Ruta relativa</target> +<source>Relative folder</source> +<target>Carpeta relativa</target> <source>Base folder</source> <target>Carpeta base</target> @@ -675,8 +675,8 @@ El comando es disparado si: <source>Remove local settings</source> <target>Eliminar opciones locales</target> -<source>Reset local filter</source> -<target>Reiniciar el filtro local</target> +<source>Clear local filter</source> +<target>Borrar el filtro local</target> <source>Copy</source> <target>Copiar</target> @@ -696,11 +696,11 @@ El comando es disparado si: <source>Save as &batch job...</source> <target>Guardar como tarea por &lotes…</target> -<source>1. &Compare</source> -<target>1. &Comparar</target> +<source>Start &comparison</source> +<target>Iniciar la &comparación</target> -<source>2. &Synchronize</source> -<target>2. &Sincronizar</target> +<source>Start &synchronization</source> +<target>Iniciar la &sincronización</target> <source>&Options</source> <target>&Opciones</target> @@ -711,21 +711,24 @@ El comando es disparado si: <source>&Find...</source> <target>&Buscar…</target> +<source>&Reset layout</source> +<target>&Reiniciar la presentación</target> + <source>&Export file list...</source> <target>&Exportar lista de archivos…</target> <source>&Tools</source> <target>Herramien&tas</target> +<source>&Check for new version</source> +<target>&Comprobar nueva versión</target> + <source>&Check now</source> <target>&Comprobar ahora</target> <source>Check &automatically once a week</source> <target>Comprobar &automáticamente una vez por semana</target> -<source>&Check for new version</source> -<target>&Comprobar nueva versión</target> - <source>Cancel</source> <target>Cancelar</target> @@ -753,18 +756,15 @@ El comando es disparado si: <source>Match case</source> <target>Coincidir mayúsculas y minúsculas</target> +<source>New</source> +<target>Nuevo</target> + <source>Open...</source> <target>Abrir…</target> <source>Save</source> <target>Guardar</target> -<source>Save as GUI job</source> -<target>Guardar como tarea de interfaz</target> - -<source>Save as batch job</source> -<target>Guardar como tarea por lotes</target> - <source>Save as...</source> <target>Guardar como…</target> @@ -777,14 +777,14 @@ El comando es disparado si: <source>Statistics:</source> <target>Estadísticas:</target> -<source>Number of files and folders that will be created</source> -<target>Número de archivos y carpetas que serán creados</target> +<source>Number of files and folders that will be deleted</source> +<target>Número de archivos y carpetas que serán eliminados</target> <source>Number of files that will be overwritten</source> <target>Número de archivos que serán sobrescritos</target> -<source>Number of files and folders that will be deleted</source> -<target>Número de archivos y carpetas que serán eliminados</target> +<source>Number of files and folders that will be created</source> +<target>Número de archivos y carpetas que serán creados</target> <source>Total bytes to copy</source> <target>Total de bytes a copiar</target> @@ -801,6 +801,15 @@ El comando es disparado si: <source>Identify equal files by comparing the file content.</source> <target>Comparar archivos iguales por el contenido.</target> +<source>Ignore time shift (in hours)</source> +<target>Ignorar desfase horario (en horas)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Considerar que las fechas con el desfase indicado son idénticas</target> + +<source>Handle daylight saving time</source> +<target>Tener en cuenta la hora de verano</target> + <source>Symbolic links:</source> <target>Vínculos simbólicos:</target> @@ -831,8 +840,8 @@ El comando es disparado si: <source>Maximum:</source> <target>Máximo:</target> -<source>&Reset</source> -<target>&Reiniciar</target> +<source>C&lear</source> +<target>B&orrar</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Seleccione reglas para excluir archivos durante la sincronización. Indique rutas relativas a la carpeta emparejada correspondiente.</target> @@ -857,20 +866,20 @@ El comando es disparado si: <source>Delete files:</source> <target>Eliminar archivos:</target> -<source>Permanent</source> -<target>Permanente</target> +<source>&Permanent</source> +<target>&Permanente</target> <source>Delete or overwrite files permanently</source> <target>Borrar o sobrescribir los archivos permanentemente</target> -<source>Recycle bin</source> -<target>Papelera de reciclaje</target> +<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>Versioning</source> -<target>Control de versiones</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> @@ -881,14 +890,11 @@ El comando es disparado si: <source>Handle errors:</source> <target>Tratar errores:</target> -<source>Ignore</source> -<target>Ignorar</target> - <source>Hide all error and warning messages</source> <target>Ocultar todos los mensajes de error y aviso</target> -<source>Pop-up</source> -<target>Automático</target> +<source>&Pop-up</source> +<target>E&mergentep</target> <source>Show pop-up on errors or warnings</source> <target>Mostrar ventana emergente de errores o avisos</target> @@ -911,9 +917,6 @@ El comando es disparado si: <source>Items found:</source> <target>Elementos encontrados:</target> -<source>Speed:</source> -<target>Velocidad:</target> - <source>Time remaining:</source> <target>Tiempo restante:</target> @@ -926,6 +929,9 @@ El comando es disparado si: <source>Minimize to notification area</source> <target>Minimizar en el área de notificación</target> +<source>Bytes copied:</source> +<target>Bytes copiados:</target> + <source>Close</source> <target>Cerrar</target> @@ -938,6 +944,9 @@ 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>Stop synchronization at first error</source> <target>Detener la sincronización con el primer error</target> @@ -956,9 +965,6 @@ El comando es disparado si: <source>How can I schedule a batch job?</source> <target>Cómo puedo programar una tarea por lotes?</target> -<source>&Recycle bin</source> -<target>Papelera de &reciclaje</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Las opciones siguientes se utilizan para todas las tareas de sincronización.</target> @@ -1007,8 +1013,11 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Description</source> <target>Descripción</target> -<source>Restore hidden windows</source> -<target>Restaurar ventanas ocultas</target> +<source>Show hidden dialogs again</source> +<target>Volver a mostrar los diálogos ocultos</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Volver a mostrar todos los diálogos y mensajes de advertencia que fueron permanentemente ocultados</target> <source>&Default</source> <target>&Configuración predeterminada</target> @@ -1070,8 +1079,8 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Main Bar</source> <target>Barra principal</target> -<source>Compare both sides</source> -<target>Comparar ambos lados</target> +<source>Start comparison</source> +<target>Iniciar la comparación</target> <source>Comparison settings</source> <target>Opciones de comparación</target> @@ -1166,9 +1175,6 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Select time span...</source> <target>Seleccionar duración…</target> -<source>Default view</source> -<target>Vista predeterminada</target> - <source>Show "%x"</source> <target>Mostrar "%x"</target> @@ -1199,8 +1205,8 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Synchronization Settings</source> <target>Opciones de sincronización</target> -<source>Reset filter</source> -<target>Reiniciar el filtro</target> +<source>Clear filter</source> +<target>Borrar filtro</target> <source>Show files that exist on left side only</source> <target>Mostrar sólo archivos existentes en la izquierda</target> @@ -1358,8 +1364,11 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>- Other side's counterpart to %item_folder%</source> <target>- El otro lado de %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Restaurar todas las ventanas y mensajes de advertencia ocultados ?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>¿Volver a mostrar los diálogos ocultos y las advertencias?</target> + +<source>&Show</source> +<target>Mo&strar</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Identificar y propagar cambios en ambos lados. Archivos eliminados, movidos y conflictos se detectan automáticamente usando una base de datos.</target> @@ -1377,7 +1386,7 @@ Se garantiza un estado coherente incluso en caso de error grave. <target>Excluir</target> <source>Direct</source> -<target>Enviar</target> +<target>Directo</target> <source>Follow</source> <target>Seguir</target> diff --git a/FreeFileSync/Build/Languages/swedish.lng b/FreeFileSync/Build/Languages/swedish.lng index 8f9838c5..3b7ba35a 100644 --- a/FreeFileSync/Build/Languages/swedish.lng +++ b/FreeFileSync/Build/Languages/swedish.lng @@ -92,7 +92,7 @@ <target>Valfritt antal FreeFileSync .ffs_gui och/eller .ffs_batch konfigurationsfiler.</target> <source>Any number of alternative directory pairs for at most one config file.</source> -<target>Valfritt antal alternativa mapp-par för som mest, en konfigurationsfil</target> +<target>Valfritt antal alternativa katalogpar för som mest, en konfigurationsfil</target> <source>Cannot find the following folders:</source> <target>Kan inte hitta följande mappar:</target> @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Motsvarande mapp kommer att betraktas som tom.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Följande mappar har beroende sökvägar. Var försiktig vid konfigurering av synkroniseringsregler:</target> +<source>The following folder paths are dependent from each other:</source> +<target>Följande mappsökvägar är beroende av varandra:</target> <source>File %x has an invalid date.</source> <target>Filen %x har ett ogiltigt datum.</target> @@ -199,6 +199,24 @@ <source>Update attributes on right</source> <target>Uppdatera attribut på höger sida</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>1 byte</pluralform> +<pluralform>%x byte</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>Databasfilen %x är inkompatibel</target> @@ -259,24 +277,6 @@ <source>Total time:</source> <target>Total tid:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>1 byte</pluralform> -<pluralform>%x byte</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Tolkningsfel på filen %x, rad %y, kolumn %z.</target> @@ -343,8 +343,8 @@ <source>&Quit</source> <target>&Avsluta</target> -<source>&Program</source> -<target>&Program</target> +<source>&File</source> +<target>&Arkiv</target> <source>&View help</source> <target>&Visa hjälpen</target> @@ -435,9 +435,6 @@ Kommandot triggas om: <source>&Show error</source> <target>&Visa fel</target> -<source>&Exit</source> -<target>&Avsluta</target> - <source>Incorrect command line:</source> <target>Felaktig kommandorad:</target> @@ -501,8 +498,8 @@ Kommandot triggas om: <source>Data verification error: %x and %y have different content.</source> <target>Dataverifieringsfel: %x och %y har olika innehåll.</target> -<source>Cannot find %x.</source> -<target>Kan inte hitta %x.</target> +<source>Cannot find folder %x.</source> +<target>Kan inte hitta mappen %x</target> <source>Target folder %x already existing.</source> <target>Målmappen %x finns redan.</target> @@ -531,11 +528,11 @@ Kommandot triggas om: <source>Available:</source> <target>Tillgängligt:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>En mapp som tillhör flera mapp-par är på väg att ändras. Kontrollera synkroniseringsinställningarna</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target>Flera katalogpar skriver till samma undermapp. Kontrollera dina inställningar.</target> <source>Synchronizing folder pair:</source> -<target>Synkroniserar mapp-par:</target> +<target>Synkroniserar katalogpar:</target> <source>Generating database...</source> <target>Skapar databas...</target> @@ -633,8 +630,8 @@ Kommandot triggas om: <source>Name</source> <target>Namn</target> -<source>Relative path</source> -<target>Sökväg</target> +<source>Relative folder</source> +<target>Relativ mapp</target> <source>Base folder</source> <target>Basmapp</target> @@ -675,8 +672,8 @@ Kommandot triggas om: <source>Remove local settings</source> <target>Ta bort lokala inställningar</target> -<source>Reset local filter</source> -<target>Återställ lokalt filter</target> +<source>Clear local filter</source> +<target>Rensa lokalt filter</target> <source>Copy</source> <target>Kopiera</target> @@ -696,11 +693,11 @@ Kommandot triggas om: <source>Save as &batch job...</source> <target>Spara som &batch-fil...</target> -<source>1. &Compare</source> -<target>1. &Jämför</target> +<source>Start &comparison</source> +<target>&Jämför</target> -<source>2. &Synchronize</source> -<target>2. &Synkronisera</target> +<source>Start &synchronization</source> +<target>&Synkronisera</target> <source>&Options</source> <target>&Alternativ</target> @@ -711,21 +708,24 @@ 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>&Tools</source> <target>&Verktyg</target> +<source>&Check for new version</source> +<target>&Sök efter uppdateringar</target> + <source>&Check now</source> <target>&Sök nu</target> <source>Check &automatically once a week</source> <target>Sök &automatiskt en gång per vecka</target> -<source>&Check for new version</source> -<target>&Sök efter uppdateringar</target> - <source>Cancel</source> <target>Avbryt</target> @@ -736,10 +736,10 @@ Kommandot triggas om: <target>Synkronisera</target> <source>Add folder pair</source> -<target>Lägg till mapp-par</target> +<target>Lägg till katalogpar</target> <source>Remove folder pair</source> -<target>Ta bort mapp-par</target> +<target>Ta bort katalogpar</target> <source>Swap sides</source> <target>Byt sida</target> @@ -753,18 +753,15 @@ Kommandot triggas om: <source>Match case</source> <target>Matcha gemener/VERSALER</target> +<source>New</source> +<target>Nytt</target> + <source>Open...</source> <target>Öppna...</target> <source>Save</source> <target>Spara</target> -<source>Save as GUI job</source> -<target>Spara som grafisk åtgärd</target> - -<source>Save as batch job</source> -<target>Spara som batch-fil</target> - <source>Save as...</source> <target>Spara som...</target> @@ -777,14 +774,14 @@ Kommandot triggas om: <source>Statistics:</source> <target>Statistik:</target> -<source>Number of files and folders that will be created</source> -<target>Antal filer och mappar som kommer att skapas</target> +<source>Number of files and folders that will be deleted</source> +<target>Antal filer och mappar som kommer att tas bort</target> <source>Number of files that will be overwritten</source> <target>Antal filer som kommer att skrivas över</target> -<source>Number of files and folders that will be deleted</source> -<target>Antal filer och mappar som kommer att tas bort</target> +<source>Number of files and folders that will be created</source> +<target>Antal filer och mappar som kommer att skapas</target> <source>Total bytes to copy</source> <target>Byte att kopiera</target> @@ -801,6 +798,15 @@ Kommandot triggas om: <source>Identify equal files by comparing the file content.</source> <target>Identifiera likadana filer genom att jämföra filinnehåll.</target> +<source>Ignore time shift (in hours)</source> +<target>Ignorera tidsförskjutning (i timmar)</target> + +<source>Consider file times with specified offset as equal</source> +<target>Betrakta filtider med specificerad förskjutning som lika</target> + +<source>Handle daylight saving time</source> +<target>Hantera sommartid</target> + <source>Symbolic links:</source> <target>Symboliska länkar:</target> @@ -831,11 +837,11 @@ Kommandot triggas om: <source>Maximum:</source> <target>Max:</target> -<source>&Reset</source> -<target>&Återställ</target> +<source>C&lear</source> +<target>&Rensa</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> -<target>Skapa filtreringsregler för att undanta vissa filer från synkronisering. Sökvägar relateras till motsvarande mapp-par</target> +<target>Skapa filtreringsregler för att undanta vissa filer från synkronisering. Sökvägar relateras till motsvarande katalogpar</target> <source>Detect moved files</source> <target>Hitta flyttade filer</target> @@ -857,20 +863,20 @@ Kommandot triggas om: <source>Delete files:</source> <target>Ta bort filer:</target> -<source>Permanent</source> -<target>Permanent</target> +<source>&Permanent</source> +<target>&Permanent</target> <source>Delete or overwrite files permanently</source> <target>Ta bort eller skriv över permanent</target> -<source>Recycle bin</source> -<target>Papperskorgen</target> +<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>Versioning</source> -<target>Versionshantering</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> @@ -881,14 +887,11 @@ Kommandot triggas om: <source>Handle errors:</source> <target>Felhantering:</target> -<source>Ignore</source> -<target>Ignorera</target> - <source>Hide all error and warning messages</source> <target>Visa inte fel- och varningsmeddelanden</target> -<source>Pop-up</source> -<target>Popup</target> +<source>&Pop-up</source> +<target>&Popup</target> <source>Show pop-up on errors or warnings</source> <target>Visa popup vid fel och varningar</target> @@ -911,9 +914,6 @@ Kommandot triggas om: <source>Items found:</source> <target>Funna poster:</target> -<source>Speed:</source> -<target>Hastighet:</target> - <source>Time remaining:</source> <target>Återstående tid:</target> @@ -926,6 +926,9 @@ Kommandot triggas om: <source>Minimize to notification area</source> <target>Minimera till meddelandefältet</target> +<source>Bytes copied:</source> +<target>Kopierade byte:</target> + <source>Close</source> <target>Stäng</target> @@ -938,6 +941,9 @@ 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>Stop synchronization at first error</source> <target>Stoppa synkroniseringen vid första fel som uppstår</target> @@ -956,9 +962,6 @@ Kommandot triggas om: <source>How can I schedule a batch job?</source> <target>Hur schemalägger jag en batch-fil?</target> -<source>&Recycle bin</source> -<target>&Papperskorgen</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Följande inställningar används för all synkronisering</target> @@ -1007,8 +1010,11 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Description</source> <target>Beskrivning</target> -<source>Restore hidden windows</source> -<target>Återställ dolda vyer</target> +<source>Show hidden dialogs again</source> +<target>Visa dolda dialoger igen</target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target>Visa alla permanent dolda dialoger och varningsmeddelanden igen</target> <source>&Default</source> <target>&Standard</target> @@ -1053,7 +1059,7 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <target>&Inställningar...</target> <source>Folder Pairs</source> -<target>Mapp-par</target> +<target>Katalogpar</target> <source>Find</source> <target>Sök</target> @@ -1070,8 +1076,8 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Main Bar</source> <target>Primärt verktygsfält</target> -<source>Compare both sides</source> -<target>Jämför båda sidor</target> +<source>Start comparison</source> +<target>Jämför</target> <source>Comparison settings</source> <target>Jämförelseinställningar</target> @@ -1166,9 +1172,6 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Select time span...</source> <target>Välj tidsintervall...</target> -<source>Default view</source> -<target>Standardvy</target> - <source>Show "%x"</source> <target>Visa "%x"</target> @@ -1199,8 +1202,8 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Synchronization Settings</source> <target>Synkroniseringsinställningar</target> -<source>Reset filter</source> -<target>Återställ filter</target> +<source>Clear filter</source> +<target>Rensa filter</target> <source>Show files that exist on left side only</source> <target>Visa filer som endast finns till vänster</target> @@ -1358,8 +1361,11 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>- Other side's counterpart to %item_folder%</source> <target>- Andra sidans motsvarighet till %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Vill du återställa alla dolda vyer och varningar</target> +<source>Show hidden dialogs and warning messages again?</source> +<target>Vill du visa dolda dialoger och varningsmeddelanden igen?</target> + +<source>&Show</source> +<target>&Visa</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Identifierar och sprider förändringar på båda sidor. Borttagningar, förflyttningar och konflikter detekteras automatiskt med hjälp av en databas.</target> diff --git a/FreeFileSync/Build/Languages/turkish.lng b/FreeFileSync/Build/Languages/turkish.lng index dbc70ac3..076ebc56 100644 --- a/FreeFileSync/Build/Languages/turkish.lng +++ b/FreeFileSync/Build/Languages/turkish.lng @@ -106,8 +106,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Karşıdaki klasör boş olarak kabul edilecek.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Şu klasörlerin yolları birbirine bağlı. Eşleştirme kurallarını ayarlarken dikkatli olun:</target> +<source>The following folder paths are dependent from each other:</source> +<target></target> <source>File %x has an invalid date.</source> <target>%x dosyasının tarihi geçersiz.</target> @@ -199,6 +199,24 @@ <source>Update attributes on right</source> <target>Sağdaki öznitelikler güncellensin</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>1 bayt</pluralform> +<pluralform>%x bayt</pluralform> +</target> + +<source>%x MB</source> +<target>%x MB</target> + +<source>%x KB</source> +<target>%x KB</target> + +<source>%x GB</source> +<target>%x GB</target> + <source>Database file %x is incompatible.</source> <target>%x veritabanı dosyası uyumsuz</target> @@ -259,24 +277,6 @@ <source>Total time:</source> <target>Toplam süre:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>1 bayt</pluralform> -<pluralform>%x bayt</pluralform> -</target> - -<source>%x MB</source> -<target>%x MB</target> - -<source>%x KB</source> -<target>%x KB</target> - -<source>%x GB</source> -<target>%x GB</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>%x dosyası işlenirken hata, satır %y, sütun %z.</target> @@ -343,8 +343,8 @@ <source>&Quit</source> <target>Çı&kın</target> -<source>&Program</source> -<target>&Dosya</target> +<source>&File</source> +<target></target> <source>&View help</source> <target>&Yardıma bakın</target> @@ -435,9 +435,6 @@ Komut şu durumlarda yürütülür: <source>&Show error</source> <target>Hataya &bakın</target> -<source>&Exit</source> -<target>Çı&kın</target> - <source>Incorrect command line:</source> <target>Geçersiz komut satırı:</target> @@ -501,8 +498,8 @@ Komut şu durumlarda yürütülür: <source>Data verification error: %x and %y have different content.</source> <target>Veri doğrulama hatası: %x ve %y farklı içeriklere sahip.</target> -<source>Cannot find %x.</source> -<target>%x bulunamadı.</target> +<source>Cannot find folder %x.</source> +<target></target> <source>Target folder %x already existing.</source> <target>%x hedef klasörü zaten var.</target> @@ -531,8 +528,8 @@ Komut şu durumlarda yürütülür: <source>Available:</source> <target>Kullanılabilir:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Çoklu klasör çiftlerinin parçası olan bir klasör değiştirilecek. Lütfen eşleştirme ayarlarını gözden geçirin.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target></target> <source>Synchronizing folder pair:</source> <target>Eşleştirilen klasör çifti:</target> @@ -633,8 +630,8 @@ Komut şu durumlarda yürütülür: <source>Name</source> <target>Ad</target> -<source>Relative path</source> -<target>Bağıl klasör yolu</target> +<source>Relative folder</source> +<target></target> <source>Base folder</source> <target>Başlangıç klasörü</target> @@ -675,8 +672,8 @@ Komut şu durumlarda yürütülür: <source>Remove local settings</source> <target>Yerel ayarları silin</target> -<source>Reset local filter</source> -<target>Yerel süzgeci sıfırlayın</target> +<source>Clear local filter</source> +<target></target> <source>Copy</source> <target>Kopyalayın</target> @@ -696,11 +693,11 @@ Komut şu durumlarda yürütülür: <source>Save as &batch job...</source> <target>&Toplu iş olarak kaydedin...</target> -<source>1. &Compare</source> -<target>1. &Karşılaştırın</target> +<source>Start &comparison</source> +<target></target> -<source>2. &Synchronize</source> -<target>2. &Eşleştirin</target> +<source>Start &synchronization</source> +<target></target> <source>&Options</source> <target>A&yarlar</target> @@ -711,21 +708,24 @@ Komut şu durumlarda yürütülür: <source>&Find...</source> <target>A&rayın...</target> +<source>&Reset layout</source> +<target></target> + <source>&Export file list...</source> <target>Dosya list&esini verin...</target> <source>&Tools</source> <target>A&raçlar</target> +<source>&Check for new version</source> +<target>Yeni &sürümü denetleyin</target> + <source>&Check now</source> <target>&Sürümü Denetleyin</target> <source>Check &automatically once a week</source> <target>&Haftada bir kendiliğinden denetlensin</target> -<source>&Check for new version</source> -<target>Yeni &sürümü denetleyin</target> - <source>Cancel</source> <target>İptal</target> @@ -753,18 +753,15 @@ Komut şu durumlarda yürütülür: <source>Match case</source> <target>Büyük-küçük harf uysun</target> +<source>New</source> +<target></target> + <source>Open...</source> <target>Açın...</target> <source>Save</source> <target>Kaydedin</target> -<source>Save as GUI job</source> -<target>Grafik arayüz işi olarak kaydedin</target> - -<source>Save as batch job</source> -<target>Toplu iş olarak kaydedin</target> - <source>Save as...</source> <target>Farklı kaydedin...</target> @@ -777,14 +774,14 @@ Komut şu durumlarda yürütülür: <source>Statistics:</source> <target>İstatistikler:</target> -<source>Number of files and folders that will be created</source> -<target>Eklenecek dosya ve klasör sayısı</target> +<source>Number of files and folders that will be deleted</source> +<target>Silinecek dosya ve klasör sayısı</target> <source>Number of files that will be overwritten</source> <target>Üzerine yazılacak dosya sayısı</target> -<source>Number of files and folders that will be deleted</source> -<target>Silinecek dosya ve klasör sayısı</target> +<source>Number of files and folders that will be created</source> +<target>Eklenecek dosya ve klasör sayısı</target> <source>Total bytes to copy</source> <target>Toplam kopyalanacak bayt</target> @@ -801,6 +798,15 @@ Komut şu durumlarda yürütülür: <source>Identify equal files by comparing the file content.</source> <target>Dosyaların aynı olup olmadığı, içeriklerine göre belirlensin.</target> +<source>Ignore time shift (in hours)</source> +<target></target> + +<source>Consider file times with specified offset as equal</source> +<target></target> + +<source>Handle daylight saving time</source> +<target></target> + <source>Symbolic links:</source> <target>Sembolik bağlantılar:</target> @@ -831,8 +837,8 @@ Komut şu durumlarda yürütülür: <source>Maximum:</source> <target>En büyük:</target> -<source>&Reset</source> -<target>Sıfı&rlayın</target> +<source>C&lear</source> +<target></target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Eşleştirmeye katılmayacak dosyaların süzülme kurallarını belirleyin. Dosya yollarını bulundukları klasör çiftine göre yazın.</target> @@ -857,20 +863,20 @@ Komut şu durumlarda yürütülür: <source>Delete files:</source> <target>Dosya silme işlemi:</target> -<source>Permanent</source> -<target>Kalıcı olarak silinsin</target> +<source>&Permanent</source> +<target></target> <source>Delete or overwrite files permanently</source> <target>Dosyalar kalıcı olarak silinir ya da üzerine yazılır</target> -<source>Recycle bin</source> -<target>Geri Dönüşüm Kutusuna atılsın</target> +<source>&Recycle bin</source> +<target>Ge&ri Dönüşüm Kutusu</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>Versioning</source> -<target>Eski sürüm olarak saklansın</target> +<source>&Versioning</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> @@ -881,14 +887,11 @@ Komut şu durumlarda yürütülür: <source>Handle errors:</source> <target>Hata olursa:</target> -<source>Ignore</source> -<target>Yoksayılsın</target> - <source>Hide all error and warning messages</source> <target>Hiçbir hata ve uyarı iletisi görüntülenmez</target> -<source>Pop-up</source> -<target>Görüntülensin</target> +<source>&Pop-up</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> @@ -911,9 +914,6 @@ Komut şu durumlarda yürütülür: <source>Items found:</source> <target>Bulunan öge:</target> -<source>Speed:</source> -<target>Hız:</target> - <source>Time remaining:</source> <target>Kalan süre:</target> @@ -926,6 +926,9 @@ Komut şu durumlarda yürütülür: <source>Minimize to notification area</source> <target>Bildirim alanına küçültün</target> +<source>Bytes copied:</source> +<target></target> + <source>Close</source> <target>Kapatın</target> @@ -938,6 +941,9 @@ 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>Hiç bir soru sorulmadan eşleştirme 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></target> + <source>Stop synchronization at first error</source> <target>Oluşacak ilk hatada eşleştirme durdurulur</target> @@ -956,9 +962,6 @@ Komut şu durumlarda yürütülür: <source>How can I schedule a batch job?</source> <target>Bir toplu işlem nasıl zamanlanır?</target> -<source>&Recycle bin</source> -<target>Ge&ri Dönüşüm Kutusu</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Aşağıdaki ayarlar tüm eşleştirme işlemleri için geçerlidir.</target> @@ -1007,8 +1010,11 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Description</source> <target>Açıklama</target> -<source>Restore hidden windows</source> -<target>Gizlenmiş pencereler yeniden görüntülensin</target> +<source>Show hidden dialogs again</source> +<target></target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target></target> <source>&Default</source> <target>&Varsayılan</target> @@ -1070,8 +1076,8 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Main Bar</source> <target>Ana Çubuk</target> -<source>Compare both sides</source> -<target>İki tarafı karşılaştırın</target> +<source>Start comparison</source> +<target></target> <source>Comparison settings</source> <target>Karşılaştırma ayarları</target> @@ -1166,9 +1172,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>Default view</source> -<target>Varsayılan görünüm</target> - <source>Show "%x"</source> <target>"%x" paneli görüntülensin</target> @@ -1199,8 +1202,8 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Synchronization Settings</source> <target>Eşleştirme Ayarları</target> -<source>Reset filter</source> -<target>Süzgeci sıfırlayın</target> +<source>Clear filter</source> +<target></target> <source>Show files that exist on left side only</source> <target>Yalnız sol tarafta bulunan dosyaları görüntüler ya da gizler</target> @@ -1358,8 +1361,11 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>- Other side's counterpart to %item_folder%</source> <target>%item_folder% ögesinin diğer taraftaki karşılığı</target> -<source>Restore all hidden windows and warnings?</source> -<target>Gizlenmiş tüm pencere ve uyarılar yeniden görüntülensin mi?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target></target> + +<source>&Show</source> +<target></target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>İki tarafta da değişikliklere bakılır ve karşılıklı kopyalanır. Silinmiş, taşınmış ve çakışan ögeler, veritabanı kullanılarak kendiliğinden algılanır.</target> diff --git a/FreeFileSync/Build/Languages/ukrainian.lng b/FreeFileSync/Build/Languages/ukrainian.lng index d392929d..a2a7ea0f 100644 --- a/FreeFileSync/Build/Languages/ukrainian.lng +++ b/FreeFileSync/Build/Languages/ukrainian.lng @@ -109,8 +109,8 @@ <source>The corresponding folder will be considered as empty.</source> <target>Відповідна папка буде вважатися порожньою.</target> -<source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target>Наступні папки мають залежні шляхи. Будьте обережні при налаштуванні правил синхронізації:</target> +<source>The following folder paths are dependent from each other:</source> +<target></target> <source>File %x has an invalid date.</source> <target>Файл %x має неіснуючу дату.</target> @@ -202,6 +202,25 @@ <source>Update attributes on right</source> <target>Оновити атрибути праворуч</target> +<source> +<pluralform>1 byte</pluralform> +<pluralform>%x bytes</pluralform> +</source> +<target> +<pluralform>%x байт</pluralform> +<pluralform>%x байти</pluralform> +<pluralform>%x байтів</pluralform> +</target> + +<source>%x MB</source> +<target>%x МБ</target> + +<source>%x KB</source> +<target>%x КБ</target> + +<source>%x GB</source> +<target>%x ГБ</target> + <source>Database file %x is incompatible.</source> <target>Несумісний файл бази даних %x.</target> @@ -263,25 +282,6 @@ <source>Total time:</source> <target>Загальний час:</target> -<source> -<pluralform>1 byte</pluralform> -<pluralform>%x bytes</pluralform> -</source> -<target> -<pluralform>%x байт</pluralform> -<pluralform>%x байти</pluralform> -<pluralform>%x байтів</pluralform> -</target> - -<source>%x MB</source> -<target>%x МБ</target> - -<source>%x KB</source> -<target>%x КБ</target> - -<source>%x GB</source> -<target>%x ГБ</target> - <source>Error parsing file %x, row %y, column %z.</source> <target>Помилка розбору файла %x, рядок %y, колонка %z.</target> @@ -349,8 +349,8 @@ <source>&Quit</source> <target>&Вихід</target> -<source>&Program</source> -<target>&Програма</target> +<source>&File</source> +<target></target> <source>&View help</source> <target>&Перегляд довідки</target> @@ -441,9 +441,6 @@ The command is triggered if: <source>&Show error</source> <target>&Показати помилку</target> -<source>&Exit</source> -<target>&Вихід</target> - <source>Incorrect command line:</source> <target>Неправильний командний рядок:</target> @@ -507,8 +504,8 @@ The command is triggered if: <source>Data verification error: %x and %y have different content.</source> <target>Помилка перевірки даних: %x та %y мають різний вміст.</target> -<source>Cannot find %x.</source> -<target>Не вдається знайти %x.</target> +<source>Cannot find folder %x.</source> +<target></target> <source>Target folder %x already existing.</source> <target>Цільова папка %x вже існує.</target> @@ -537,8 +534,8 @@ The command is triggered if: <source>Available:</source> <target>Доступно:</target> -<source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Буде змінена папка, яка є частиною кількох пар папок. Будь ласка, перегляньте налаштування синхронізації.</target> +<source>Multiple folder pairs write to a common subfolder. Please review your configuration.</source> +<target></target> <source>Synchronizing folder pair:</source> <target>Синхронізація пари папок:</target> @@ -640,8 +637,8 @@ The command is triggered if: <source>Name</source> <target>Назва</target> -<source>Relative path</source> -<target>Відносний шлях</target> +<source>Relative folder</source> +<target></target> <source>Base folder</source> <target>Базова папка</target> @@ -682,8 +679,8 @@ The command is triggered if: <source>Remove local settings</source> <target>Вилучити локальні налаштування</target> -<source>Reset local filter</source> -<target>Оновити локальний фільтр</target> +<source>Clear local filter</source> +<target></target> <source>Copy</source> <target>Копіювати</target> @@ -703,11 +700,11 @@ The command is triggered if: <source>Save as &batch job...</source> <target>Зберегти як &пакетне завдання</target> -<source>1. &Compare</source> -<target>1. &Порівняти</target> +<source>Start &comparison</source> +<target></target> -<source>2. &Synchronize</source> -<target>2. &Синхронізувати</target> +<source>Start &synchronization</source> +<target></target> <source>&Options</source> <target>&Опції</target> @@ -718,21 +715,24 @@ The command is triggered if: <source>&Find...</source> <target>&Знайти...</target> +<source>&Reset layout</source> +<target></target> + <source>&Export file list...</source> <target>&Експортувати список файлів...</target> <source>&Tools</source> <target>&Інструменти</target> +<source>&Check for new version</source> +<target>&Перевірка наявності нової версії</target> + <source>&Check now</source> <target>&Перевірити тепер</target> <source>Check &automatically once a week</source> <target>Перевіряти &автоматично щотижня</target> -<source>&Check for new version</source> -<target>&Перевірка наявності нової версії</target> - <source>Cancel</source> <target>Відмінити</target> @@ -760,18 +760,15 @@ The command is triggered if: <source>Match case</source> <target>Враховувати регістр</target> +<source>New</source> +<target></target> + <source>Open...</source> <target>Відкрити...</target> <source>Save</source> <target>Зберегти</target> -<source>Save as GUI job</source> -<target>Зберегти як завдання графічного інтерфейсу</target> - -<source>Save as batch job</source> -<target>Зберегти як пакетне завдання</target> - <source>Save as...</source> <target>Зберегти як...</target> @@ -784,14 +781,14 @@ The command is triggered if: <source>Statistics:</source> <target>Статистика:</target> -<source>Number of files and folders that will be created</source> -<target>Кількість файлів і папок, які будуть створені</target> +<source>Number of files and folders that will be deleted</source> +<target>Кількість файлів і папок, які будуть вилучені</target> <source>Number of files that will be overwritten</source> <target>Кількість файлів, які будуть перезаписані</target> -<source>Number of files and folders that will be deleted</source> -<target>Кількість файлів і папок, які будуть вилучені</target> +<source>Number of files and folders that will be created</source> +<target>Кількість файлів і папок, які будуть створені</target> <source>Total bytes to copy</source> <target>Всього зкопіювати байтів</target> @@ -808,6 +805,15 @@ The command is triggered if: <source>Identify equal files by comparing the file content.</source> <target>Визначити однакові файли порівнюючи їх вміст.</target> +<source>Ignore time shift (in hours)</source> +<target></target> + +<source>Consider file times with specified offset as equal</source> +<target></target> + +<source>Handle daylight saving time</source> +<target></target> + <source>Symbolic links:</source> <target>Символьні посилання:</target> @@ -838,8 +844,8 @@ The command is triggered if: <source>Maximum:</source> <target>Максимум:</target> -<source>&Reset</source> -<target>&Відновити</target> +<source>C&lear</source> +<target></target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> <target>Виберіть правила фільтрації для виключення деяких файлів із синхронізації. Введіть шляхи файлів відносно відповідної пари папок.</target> @@ -864,20 +870,20 @@ The command is triggered if: <source>Delete files:</source> <target>Вилучити файли:</target> -<source>Permanent</source> -<target>Назавжди</target> +<source>&Permanent</source> +<target></target> <source>Delete or overwrite files permanently</source> <target>Вилучати чи перезаписати файли назавжди</target> -<source>Recycle bin</source> -<target>Корзина</target> +<source>&Recycle bin</source> +<target>&Корзина</target> <source>Back up deleted and overwritten files in the recycle bin</source> <target>Резервно зберегти вилучені та перезаисані файли в Корзині</target> -<source>Versioning</source> -<target>Запис версій</target> +<source>&Versioning</source> +<target></target> <source>Move files to a user-defined folder</source> <target>Перемістити файли у визначену користувачем папку</target> @@ -888,14 +894,11 @@ The command is triggered if: <source>Handle errors:</source> <target>Обробка помилок:</target> -<source>Ignore</source> -<target>Ігнорувати</target> - <source>Hide all error and warning messages</source> <target>Приховати всі помилки і повідомлення з попередженнями</target> -<source>Pop-up</source> -<target>Виринаючі вікна</target> +<source>&Pop-up</source> +<target></target> <source>Show pop-up on errors or warnings</source> <target>Показувати виринаючі вікна при помилках та попередженнях</target> @@ -918,9 +921,6 @@ The command is triggered if: <source>Items found:</source> <target>Елементів знайдено:</target> -<source>Speed:</source> -<target>Швидкість:</target> - <source>Time remaining:</source> <target>Залишилось часу:</target> @@ -933,6 +933,9 @@ The command is triggered if: <source>Minimize to notification area</source> <target>Згорнути в область повідомлень</target> +<source>Bytes copied:</source> +<target></target> + <source>Close</source> <target>Замкнути</target> @@ -945,6 +948,9 @@ 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>Stop synchronization at first error</source> <target>Зупинити синхронізацію при першій помилці</target> @@ -963,9 +969,6 @@ The command is triggered if: <source>How can I schedule a batch job?</source> <target>Як можна запланувати пакетне завдання?</target> -<source>&Recycle bin</source> -<target>&Корзина</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Наступні налаштування використовуються для всіх завдань синхронізації.</target> @@ -1014,8 +1017,11 @@ This guarantees a consistent state even in case of a serious error. <source>Description</source> <target>Опис</target> -<source>Restore hidden windows</source> -<target>Відновити приховані вікна</target> +<source>Show hidden dialogs again</source> +<target></target> + +<source>Show all permanently hidden dialogs and warning messages again</source> +<target></target> <source>&Default</source> <target>&За замовчуванням</target> @@ -1077,8 +1083,8 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>Головна панель</target> -<source>Compare both sides</source> -<target>Порівняти обидві сторони</target> +<source>Start comparison</source> +<target></target> <source>Comparison settings</source> <target>Налаштування порівнювання</target> @@ -1177,9 +1183,6 @@ This guarantees a consistent state even in case of a serious error. <source>Select time span...</source> <target>Виберіть інтервал часу...</target> -<source>Default view</source> -<target>Вигляд за замовчуванням</target> - <source>Show "%x"</source> <target>Показати "%x"</target> @@ -1210,8 +1213,8 @@ This guarantees a consistent state even in case of a serious error. <source>Synchronization Settings</source> <target>Налаштування Синхронізації</target> -<source>Reset filter</source> -<target>Оновити фільтр</target> +<source>Clear filter</source> +<target></target> <source>Show files that exist on left side only</source> <target>Показати файли, які є тільки ліворуч</target> @@ -1371,8 +1374,11 @@ This guarantees a consistent state even in case of a serious error. <source>- Other side's counterpart to %item_folder%</source> <target>- Елемент з протилежної сторони до %item_folder%</target> -<source>Restore all hidden windows and warnings?</source> -<target>Відновити всі приховані вікна та попередження?</target> +<source>Show hidden dialogs and warning messages again?</source> +<target></target> + +<source>&Show</source> +<target></target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> <target>Виявити та поширити зміни на обидві сторони. Видалення, перейменування та конфлікти визначаються автоматично використовуючи базу даних.</target> diff --git a/FreeFileSync/Source/Makefile b/FreeFileSync/Source/Makefile index f9c1647e..ced7374a 100644 --- a/FreeFileSync/Source/Makefile +++ b/FreeFileSync/Source/Makefile @@ -1,5 +1,3 @@ -BLAH_BLUBB_123= -#for some buggy reason the first row in the make file has no effect on Suse Linux! => make sure there's no important command APPNAME = FreeFileSync prefix = /usr BINDIR = $(DESTDIR)$(prefix)/bin @@ -7,21 +5,10 @@ SHAREDIR = $(DESTDIR)$(prefix)/share APPSHAREDIR = $(SHAREDIR)/$(APPNAME) DOCSHAREDIR = $(SHAREDIR)/doc/$(APPNAME) -CXXFLAGS = -std=c++11 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ --Wall -Winit-self -Wredundant-decls -Wmissing-include-dirs -Wswitch-enum -Wmain +CXXFLAGS = -std=c++11 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" -Wall \ +-O3 -DNDEBUG `wx-config --cxxflags --debug=no` -DZEN_LINUX -pthread -release launchpad: CXXFLAGS += -O3 -DNDEBUG -debug: CXXFLAGS += -g -D__WXDEBUG__ - -LINKFLAGS = - -#distinguish Linux/OSX builds -OPERATING_SYSTEM_NAME := $(shell uname) - -#################### Linux ############################ -ifeq ($(OPERATING_SYSTEM_NAME), Linux) -COMPILER_BIN = g++ -pthread -CXXFLAGS += -DZEN_LINUX -Wcast-align -Wshadow +LINKFLAGS = -s `wx-config --libs std, aui --debug=no` -lboost_thread -lboost_system -lz -pthread #Gtk - support recycler/icon loading/no button border/grid scrolling CXXFLAGS += `pkg-config --cflags gtk+-2.0` @@ -41,36 +28,7 @@ CXXFLAGS += `pkg-config --cflags unity` -DHAVE_UBUNTU_UNITY LINKFLAGS += `pkg-config --libs unity` endif -release launchpad: LINKFLAGS += -s -#release debug: LINKFLAGS += -lX11 -endif -#################### OS X ############################ -ifeq ($(OPERATING_SYSTEM_NAME), Darwin) -COMPILER_BIN = clang++ -stdlib=libc++ -mmacosx-version-min=10.7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -CXXFLAGS += -DZEN_MAC -Wbind-to-temporary-copy -Wambiguous-member-template -Wextra-tokens - -#-Wl,-Bstatic not supported on OSX! -# check dependencies with: otool -L FreeFileSync -endif -###################################################### - -WX_CONFIG_LIB =$(HOME)/Desktop/wxWidgets/lib -BOOST_LIB_DIR =$(HOME)/Desktop/boost/stage/lib -CXXFLAGS += -I$(HOME)/Desktop/boost - -release: CXXFLAGS += `$(WX_CONFIG_LIB)/release/bin/wx-config --cxxflags --debug=no --static=yes` -debug: CXXFLAGS += `$(WX_CONFIG_LIB)/debug/bin/wx-config --cxxflags --debug=yes --static=yes` -launchpad: CXXFLAGS += `wx-config --cxxflags --debug=no` - -release: LINKFLAGS += `$(WX_CONFIG_LIB)/release/bin/wx-config --libs std, aui --debug=no --static=yes` -debug: LINKFLAGS += `$(WX_CONFIG_LIB)/debug/bin/wx-config --libs std, aui --debug=yes --static=yes` -launchpad: LINKFLAGS += `wx-config --libs std, aui --debug=no` - -release debug: LINKFLAGS += $(BOOST_LIB_DIR)/libboost_thread.a $(BOOST_LIB_DIR)/libboost_system.a -launchpad: LINKFLAGS += -lboost_thread -lboost_system -lz - - -CPP_LIST= #internal list of all *.cpp files needed for compilation +CPP_LIST= CPP_LIST+=algorithm.cpp CPP_LIST+=application.cpp CPP_LIST+=comparison.cpp @@ -126,33 +84,18 @@ CPP_LIST+=../../wx+/popup_dlg.cpp CPP_LIST+=../../wx+/popup_dlg_generated.cpp CPP_LIST+=../../wx+/zlib_wrap.cpp -# OS X -ifeq ($(OPERATING_SYSTEM_NAME), Darwin) -MM_LIST= #objective C files -MM_LIST+=ui/osx_dock.mm -MM_LIST+=lib/osx_file_icon.mm -endif - -#list of all *.o files -OBJECT_LIST = $(CPP_LIST:%.cpp=../Obj/FFS_GCC_Make_Release/ffs/src/%.o) -OBJECT_LIST += $(MM_LIST:%.mm=../Obj/FFS_GCC_Make_Release/ffs/src/%.mm.o) +OBJECT_LIST = $(CPP_LIST:%.cpp=../Obj/FFS_GCC_Make_Release/ffs/src/%.o) -all: release +all: launchpad -release: FreeFileSync -debug: FreeFileSync launchpad: FreeFileSync -../Obj/FFS_GCC_Make_Release/ffs/src/%.mm.o : %.mm - mkdir -p $(dir $@) - $(COMPILER_BIN) $(CXXFLAGS) -c $< -o $@ - ../Obj/FFS_GCC_Make_Release/ffs/src/%.o : %.cpp mkdir -p $(dir $@) - $(COMPILER_BIN) $(CXXFLAGS) -c $< -o $@ + g++ $(CXXFLAGS) -c $< -o $@ FreeFileSync: $(OBJECT_LIST) - $(COMPILER_BIN) -o ../Build/$(APPNAME) $(OBJECT_LIST) $(LINKFLAGS) + g++ -o ../Build/$(APPNAME) $(OBJECT_LIST) $(LINKFLAGS) clean: rm -rf ../Obj/FFS_GCC_Make_Release diff --git a/FreeFileSync/Source/RealtimeSync/Makefile b/FreeFileSync/Source/RealtimeSync/Makefile index b3d440ca..cd888bcf 100644 --- a/FreeFileSync/Source/RealtimeSync/Makefile +++ b/FreeFileSync/Source/RealtimeSync/Makefile @@ -1,58 +1,17 @@ -BLAH_BLUBB_123= -#for some buggy reason the first row in the make file has no effect on Suse Linux! => make sure there's no important command APPNAME = RealtimeSync prefix = /usr BINDIR = $(DESTDIR)$(prefix)/bin -CXXFLAGS = -std=c++11 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ --Wall -Winit-self -Wredundant-decls -Wmissing-include-dirs -Wswitch-enum -Wmain +CXXFLAGS = -std=c++11 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" -Wall \ +-O3 -DNDEBUG `wx-config --cxxflags --debug=no` -DZEN_LINUX -pthread -release launchpad: CXXFLAGS += -O3 -DNDEBUG -debug: CXXFLAGS += -g -D__WXDEBUG__ - -LINKFLAGS = - -#distinguish Linux/Mac builds -OPERATING_SYSTEM_NAME := $(shell uname) - -#################### Linux ############################ -ifeq ($(OPERATING_SYSTEM_NAME), Linux) -COMPILER_BIN = g++ -pthread -CXXFLAGS += -DZEN_LINUX -Wcast-align -Wshadow +LINKFLAGS = -s `wx-config --libs std, aui --debug=no` -lboost_thread -lboost_system -lz -pthread #Gtk - support "no button border" CXXFLAGS += `pkg-config --cflags gtk+-2.0` LINKFLAGS += `pkg-config --libs gtk+-2.0` -release launchpad: LINKFLAGS += -s -#release debug: LINKFLAGS += -lX11 -endif -#################### OS X ############################ -ifeq ($(OPERATING_SYSTEM_NAME), Darwin) -COMPILER_BIN = clang++ -stdlib=libc++ -mmacosx-version-min=10.7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -CXXFLAGS += -DZEN_MAC -Wbind-to-temporary-copy -Wambiguous-member-template -Wextra-tokens - -#-Wl,-Bstatic not supported on OSX! -# check dependencies with: otool -L FreeFileSync -endif -###################################################### - -WX_CONFIG_LIB =$(HOME)/Desktop/wxWidgets/lib -BOOST_LIB_DIR =$(HOME)/Desktop/boost/stage/lib -CXXFLAGS += -I$(HOME)/Desktop/boost - -release: CXXFLAGS += `$(WX_CONFIG_LIB)/release/bin/wx-config --cxxflags --debug=no --static=yes` -debug: CXXFLAGS += `$(WX_CONFIG_LIB)/debug/bin/wx-config --cxxflags --debug=yes --static=yes` -launchpad: CXXFLAGS += `wx-config --cxxflags --debug=no` - -release: LINKFLAGS += `$(WX_CONFIG_LIB)/release/bin/wx-config --libs std, aui --debug=no --static=yes` -debug: LINKFLAGS += `$(WX_CONFIG_LIB)/debug/bin/wx-config --libs std, aui --debug=yes --static=yes` -launchpad: LINKFLAGS += `wx-config --libs std, aui --debug=no` - -release debug: LINKFLAGS += $(BOOST_LIB_DIR)/libboost_thread.a $(BOOST_LIB_DIR)/libboost_system.a -launchpad: LINKFLAGS += -lboost_thread -lboost_system -lz - -CPP_LIST= #internal list of all *.cpp files needed for compilation +CPP_LIST= CPP_LIST+=application.cpp CPP_LIST+=gui_generated.cpp CPP_LIST+=main_dlg.cpp @@ -78,21 +37,18 @@ CPP_LIST+=../../../wx+/image_resources.cpp CPP_LIST+=../../../wx+/popup_dlg.cpp CPP_LIST+=../../../wx+/popup_dlg_generated.cpp -#list of all *.o files (we need the "RTS" subdirectory to handle "../*.cpp" files OBJECT_LIST=$(CPP_LIST:%.cpp=../../Obj/RTS_GCC_Make_Release/ffs/src/rts/%.o) -all: release +all: launchpad -release: RealtimeSync -debug: RealtimeSync launchpad: RealtimeSync ../../Obj/RTS_GCC_Make_Release/ffs/src/rts/%.o : %.cpp mkdir -p $(dir $@) - $(COMPILER_BIN) $(CXXFLAGS) -c $< -o $@ + g++ $(CXXFLAGS) -c $< -o $@ RealtimeSync: $(OBJECT_LIST) - $(COMPILER_BIN) -o ../../Build/$(APPNAME) $(OBJECT_LIST) $(LINKFLAGS) + g++ -o ../../Build/$(APPNAME) $(OBJECT_LIST) $(LINKFLAGS) clean: rm -rf ../../Obj/RTS_GCC_Make_Release diff --git a/FreeFileSync/Source/RealtimeSync/application.cpp b/FreeFileSync/Source/RealtimeSync/application.cpp index 1ab5c688..20195baf 100644 --- a/FreeFileSync/Source/RealtimeSync/application.cpp +++ b/FreeFileSync/Source/RealtimeSync/application.cpp @@ -23,6 +23,7 @@ #ifdef ZEN_WIN #include <zen/win_ver.h> +#include "../lib/app_user_mode_id.h" #elif defined ZEN_LINUX #include <gtk/gtk.h> @@ -69,13 +70,15 @@ bool Application::OnInit() //SEM_FAILCRITICALERRORS at startup. This is to prevent error mode dialogs from hanging the application." ::SetErrorMode(SEM_FAILCRITICALERRORS); + setAppUserModeId(L"RealtimeSync", L"SourceForge.RealtimeSync"); //noexcept + //consider: RealtimeSync.exe, RealtimeSync_Win32.exe, RealtimeSync_x64.exe + + wxToolTip::SetMaxWidth(-1); //disable tooltip wrapping -> Windows only + #elif defined ZEN_LINUX ::gtk_rc_parse((zen::getResourceDir() + "styles.gtk_rc").c_str()); //remove inner border from bitmap buttons #endif -#ifdef ZEN_WIN - wxToolTip::SetMaxWidth(-1); //disable tooltip wrapping -> Windows only -#endif //Windows User Experience Interaction Guidelines: tool tips should have 5s timeout, info tips no timeout => compromise: wxToolTip::SetAutoPop(7000); //http://msdn.microsoft.com/en-us/library/windows/desktop/aa511495.aspx diff --git a/FreeFileSync/Source/RealtimeSync/gui_generated.cpp b/FreeFileSync/Source/RealtimeSync/gui_generated.cpp index aec080d8..6a70d57d 100644 --- a/FreeFileSync/Source/RealtimeSync/gui_generated.cpp +++ b/FreeFileSync/Source/RealtimeSync/gui_generated.cpp @@ -32,7 +32,7 @@ MainDlgGenerated::MainDlgGenerated( wxWindow* parent, wxWindowID id, const wxStr m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("&Quit") ) , wxEmptyString, wxITEM_NORMAL ); m_menuFile->Append( m_menuItem4 ); - m_menubar1->Append( m_menuFile, _("&Program") ); + m_menubar1->Append( m_menuFile, _("&File") ); m_menuHelp = new wxMenu(); wxMenuItem* m_menuItemContent; diff --git a/FreeFileSync/Source/application.cpp b/FreeFileSync/Source/application.cpp index d611943e..6a3a095d 100644 --- a/FreeFileSync/Source/application.cpp +++ b/FreeFileSync/Source/application.cpp @@ -25,6 +25,7 @@ #ifdef ZEN_WIN #include <zen/win_ver.h> +#include "lib/app_user_mode_id.h" #elif defined ZEN_LINUX #include <gtk/gtk.h> @@ -140,7 +141,6 @@ const wxEventType EVENT_ENTER_EVENT_LOOP = wxNewEventType(); //################################################################################################################## - bool Application::OnInit() { //-> this seems rather useless: @@ -155,14 +155,16 @@ bool Application::OnInit() //SEM_FAILCRITICALERRORS at startup. This is to prevent error mode dialogs from hanging the application." ::SetErrorMode(SEM_FAILCRITICALERRORS); + setAppUserModeId(L"FreeFileSync", L"SourceForge.FreeFileSync"); //noexcept + //consider: FreeFileSync.exe, FreeFileSync_Win32.exe, FreeFileSync_x64.exe + + wxToolTip::SetMaxWidth(-1); //disable tooltip wrapping -> Windows only + #elif defined ZEN_LINUX ::gtk_init(nullptr, nullptr); ::gtk_rc_parse((getResourceDir() + "styles.gtk_rc").c_str()); //remove inner border from bitmap buttons #endif -#ifdef ZEN_WIN - wxToolTip::SetMaxWidth(-1); //disable tooltip wrapping -> Windows only -#endif //Windows User Experience Interaction Guidelines: tool tips should have 5s timeout, info tips no timeout => compromise: wxToolTip::SetAutoPop(7000); //http://msdn.microsoft.com/en-us/library/windows/desktop/aa511495.aspx @@ -200,6 +202,7 @@ void Application::onEnterEventLoop(wxEvent& event) launch(commandArgs); } + #ifdef ZEN_MAC /* wxWidgets initialization sequence on OS X is a mess: @@ -283,7 +286,7 @@ void Application::launch(const std::vector<Zstring>& commandArgs) //tentatively set program language to OS default until GlobalSettings.xml is read later setLanguage(xmlAccess::XmlGlobalSettings().programLanguage); //throw FileError } - catch (const FileError&) { assert(false); } //no messagebox: consider batch job! + catch (const FileError&) { assert(false); } auto notifyError = [&](const std::wstring& msg, const std::wstring& title) { diff --git a/FreeFileSync/Source/lib/dir_lock.cpp b/FreeFileSync/Source/lib/dir_lock.cpp index 87e5d070..821976f5 100644 --- a/FreeFileSync/Source/lib/dir_lock.cpp +++ b/FreeFileSync/Source/lib/dir_lock.cpp @@ -158,15 +158,27 @@ Zstring deleteAbandonedLockName(const Zstring& lockfilepath) //make sure to NOT #ifdef ZEN_WIN Zstring getLoginSid() //throw FileError { - HANDLE hToken = 0; + HANDLE hToken = nullptr; if (!::OpenProcessToken(::GetCurrentProcess(), //__in HANDLE ProcessHandle, TOKEN_ALL_ACCESS, //__in DWORD DesiredAccess, &hToken)) //__out PHANDLE TokenHandle throwFileError(_("Cannot get process information."), L"OpenProcessToken", getLastError()); ZEN_ON_SCOPE_EXIT(::CloseHandle(hToken)); - DWORD bufferSize = 0; - ::GetTokenInformation(hToken, TokenGroups, nullptr, 0, &bufferSize); + DWORD bufferSize = [&] + { + DWORD sz = 0; + if (!::GetTokenInformation(hToken, TokenGroups, nullptr, 0, &sz)) + { + if (::GetLastError() != ERROR_INSUFFICIENT_BUFFER) + throwFileError(_("Cannot get process information."), L"GetTokenInformation", getLastError()); + + if (sz > 0) + return sz; + } + + throw FileError(_("Cannot get process information."), L"failed to get GetTokenInformation buffer size"); //shouldn't happen + }(); std::vector<char> buffer(bufferSize); if (!::GetTokenInformation(hToken, //__in HANDLE TokenHandle, diff --git a/FreeFileSync/Source/lib/icon_buffer.cpp b/FreeFileSync/Source/lib/icon_buffer.cpp index 2da7d83d..c9f60ad9 100644 --- a/FreeFileSync/Source/lib/icon_buffer.cpp +++ b/FreeFileSync/Source/lib/icon_buffer.cpp @@ -619,7 +619,11 @@ void WorkerThread::operator()() //thread entry //Prerequisites, see thumbnail.h //1. Initialize COM - ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); + if (FAILED(::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE))) + { + assert(false); + return; + } ZEN_ON_SCOPE_EXIT(::CoUninitialize()); //2. Initialize system image list diff --git a/FreeFileSync/Source/lib/parallel_scan.cpp b/FreeFileSync/Source/lib/parallel_scan.cpp index a80e4d91..18ac4216 100644 --- a/FreeFileSync/Source/lib/parallel_scan.cpp +++ b/FreeFileSync/Source/lib/parallel_scan.cpp @@ -152,7 +152,7 @@ std::vector<std::set<DirectoryKey>> separateByDistinctDisk(const std::set<Direct */ //------------------------------------------------------------------------------------------ -typedef Zbase<wchar_t, StorageRefCountThreadSafe> BasicWString; //thread safe string class for UI texts +typedef Zbase<wchar_t, StorageRefCountThreadSafe> BasicWString; //thread-safe string class for UI texts class AsyncCallback //actor pattern diff --git a/FreeFileSync/Source/synchronization.cpp b/FreeFileSync/Source/synchronization.cpp index d2fa2cb5..af37ffc8 100644 --- a/FreeFileSync/Source/synchronization.cpp +++ b/FreeFileSync/Source/synchronization.cpp @@ -454,7 +454,7 @@ Zstring DeletionHandling::getOrCreateRecyclerTempDirPf() //throw FileError //ensure unique ownership: Zstring dirpath = baseDirPf_ + Zstr("RecycleBin") + TEMP_FILE_ENDING; - for (int i = 1;; ++i) + for (int i = 0;; ++i) try { makeDirectory(dirpath, /*bool failIfExists*/ true); //throw FileError, ErrorTargetExisting @@ -462,6 +462,7 @@ Zstring DeletionHandling::getOrCreateRecyclerTempDirPf() //throw FileError } catch (const ErrorTargetExisting&) { + if (i == 10) throw; //avoid endless recursion in pathological cases dirpath = baseDirPf_ + Zstr("RecycleBin") + Zchar('_') + numberTo<Zstring>(i) + TEMP_FILE_ENDING; } }(); @@ -946,7 +947,7 @@ void SynchronizeFolderPair::prepare2StepMove(FilePair& sourceObj, //the very same (.ffs_tmp) name and is copied before the second step of the move is executed //good news: even in this pathologic case, this may only prevent the copy of the other file, but not the move - for (int i = 1;; ++i) + for (int i = 0;; ++i) try { reportInfo(txtMovingFile, source, tmpTarget); @@ -955,6 +956,7 @@ void SynchronizeFolderPair::prepare2StepMove(FilePair& sourceObj, } catch (const ErrorTargetExisting&) //repeat until unique name found: no file system race condition! { + if (i == 10) throw; //avoid endless recursion in pathological cases tmpTarget = sourceObj.getBaseDirPf<side>() + sourceObj.getItemName<side>() + Zchar('_') + numberTo<Zstring>(i) + TEMP_FILE_ENDING; } @@ -2262,7 +2264,7 @@ void zen::synchronize(const TimeComp& timeStamp, if (!conflictDirs.empty()) { - std::wstring msg = _("A folder will be modified that is part of multiple folder pairs. Please review synchronization settings.") + L"\n"; + std::wstring msg = _("Multiple folder pairs write to a common subfolder. Please review your configuration.") + L"\n"; for (const Zstring& dirpath : conflictDirs) msg += std::wstring(L"\n") + dirpath; diff --git a/FreeFileSync/Source/ui/batch_status_handler.cpp b/FreeFileSync/Source/ui/batch_status_handler.cpp index 164ce302..bf8bf758 100644 --- a/FreeFileSync/Source/ui/batch_status_handler.cpp +++ b/FreeFileSync/Source/ui/batch_status_handler.cpp @@ -42,11 +42,11 @@ public: FindLogfiles(const Zstring& prefix, std::vector<Zstring>& logfiles) : prefix_(prefix), logfiles_(logfiles) {} private: - virtual void onFile(const Zchar* shortName, const Zstring& filepath, const FileInfo& details) + virtual void onFile(const Zchar* shortName, const Zstring& filePath, const FileInfo& details) { const Zstring fileName(shortName); if (startsWith(fileName, prefix_) && endsWith(fileName, Zstr(".log"))) - logfiles_.push_back(filepath); + logfiles_.push_back(filePath); } virtual TraverseCallback* onDir(const Zchar* shortName, const Zstring& dirpath) { return nullptr; } //DON'T traverse into subdirs @@ -91,17 +91,18 @@ std::unique_ptr<FileOutput> prepareNewLogfile(const Zstring& logfileDirectory, / const Zstring body = appendSeparator(logfileDir) + utfCvrtTo<Zstring>(jobName) + Zstr(" ") + formatTime<Zstring>(Zstr("%Y-%m-%d %H%M%S"), timeStamp); //ensure uniqueness + Zstring filepath = body + Zstr(".log"); for (int i = 0;; ++i) try { - const Zstring& filepath = i == 0 ? - body + Zstr(".log") : - body + Zstr('_') + numberTo<Zstring>(i) + Zstr(".log"); - return make_unique<FileOutput>(filepath, FileOutput::ACC_CREATE_NEW); //throw FileError, ErrorTargetExisting //*no* file system race-condition! } - catch (const ErrorTargetExisting&) {} + catch (const ErrorTargetExisting&) + { + if (i == 10) throw; //avoid endless recursion in pathological cases + filepath = body + Zstr('_') + numberTo<Zstring>(i) + Zstr(".log"); + } } } diff --git a/FreeFileSync/Source/ui/custom_grid.cpp b/FreeFileSync/Source/ui/custom_grid.cpp index 3dc89a94..c40c5f86 100644 --- a/FreeFileSync/Source/ui/custom_grid.cpp +++ b/FreeFileSync/Source/ui/custom_grid.cpp @@ -624,7 +624,7 @@ private: case COL_TYPE_FILENAME: return _("Name"); //= short name case COL_TYPE_REL_FOLDER: - return _("Relative path"); + return _("Relative folder"); case COL_TYPE_BASE_DIRECTORY: return _("Base folder"); case COL_TYPE_SIZE: diff --git a/FreeFileSync/Source/ui/dir_name.cpp b/FreeFileSync/Source/ui/dir_name.cpp index 2b020383..4926985c 100644 --- a/FreeFileSync/Source/ui/dir_name.cpp +++ b/FreeFileSync/Source/ui/dir_name.cpp @@ -204,9 +204,11 @@ void DirectoryName<NameControl>::onSelectDir(wxCommandEvent& event) #ifdef ZEN_WIN if (vistaOrLater()) { - using namespace ifile; - const DllFun<FunType_showFolderPicker> showFolderPicker(getDllName(), funName_showFolderPicker); - const DllFun<FunType_freeString> freeString (getDllName(), funName_freeString); +#define DEF_DLL_FUN(name) const DllFun<ifile::FunType_##name> name(ifile::getDllName(), ifile::funName_##name); + DEF_DLL_FUN(showFolderPicker); + DEF_DLL_FUN(freeString); +#undef DEF_DLL_FUN + if (showFolderPicker && freeString) { wchar_t* selectedFolder = nullptr; @@ -215,9 +217,9 @@ void DirectoryName<NameControl>::onSelectDir(wxCommandEvent& event) ZEN_ON_SCOPE_EXIT(freeString(selectedFolder)); ZEN_ON_SCOPE_EXIT(freeString(errorMsg)); - const GuidProxy guid = { '\x0', '\x4a', '\xf9', '\x31', '\xb4', '\x92', '\x40', '\xa0', - '\x8d', '\xc2', '\xc', '\xa5', '\xef', '\x59', '\x6e', '\x3b' - }; //some random GUID => have Windows save IFileDialog state separately from other file/dir pickers! + const ifile::GuidProxy guid = { '\x0', '\x4a', '\xf9', '\x31', '\xb4', '\x92', '\x40', '\xa0', + '\x8d', '\xc2', '\xc', '\xa5', '\xef', '\x59', '\x6e', '\x3b' + }; //some random GUID => have Windows save IFileDialog state separately from other file/dir pickers! showFolderPicker(static_cast<HWND>(selectButton_.GetHWND()), //in; ==HWND defaultdirpath.empty() ? static_cast<const wchar_t*>(nullptr) : defaultdirpath.c_str(), //in, optional! diff --git a/FreeFileSync/Source/ui/folder_pair.h b/FreeFileSync/Source/ui/folder_pair.h index 9f700a59..e48b1e87 100644 --- a/FreeFileSync/Source/ui/folder_pair.h +++ b/FreeFileSync/Source/ui/folder_pair.h @@ -146,7 +146,7 @@ private: }; ContextMenu menu; - menu.addItem(_("Reset local filter"), removeLocalFilterCfg, nullptr, !isNullFilter(localFilter)); + menu.addItem(_("Clear local filter"), removeLocalFilterCfg, nullptr, !isNullFilter(localFilter)); menu.addSeparator(); menu.addItem( _("Copy"), copyFilter, nullptr, !isNullFilter(localFilter)); menu.addItem( _("Paste"), pasteFilter, nullptr, filterCfgOnClipboard.get() != nullptr); diff --git a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/gui_generated.cpp index 8ed5fe52..d3fbc6e4 100644 --- a/FreeFileSync/Source/ui/gui_generated.cpp +++ b/FreeFileSync/Source/ui/gui_generated.cpp @@ -43,7 +43,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const m_menuItemCompare = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("Start &comparison") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL ); m_menuFile->Append( m_menuItemCompare ); - m_menuItemSynchronize = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("Start synchronization") ) + wxT('\t') + wxT("F9"), wxEmptyString, wxITEM_NORMAL ); + m_menuItemSynchronize = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("Start &synchronization") ) + wxT('\t') + wxT("F9"), wxEmptyString, wxITEM_NORMAL ); m_menuFile->Append( m_menuItemSynchronize ); m_menuFile->AppendSeparator(); @@ -52,7 +52,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("&Quit") ) , wxEmptyString, wxITEM_NORMAL ); m_menuFile->Append( m_menuItem4 ); - m_menubar1->Append( m_menuFile, _("File") ); + m_menubar1->Append( m_menuFile, _("&File") ); m_menuTools = new wxMenu(); m_menuItemOptions = new wxMenuItem( m_menuTools, wxID_PREFERENCES, wxString( _("&Options") ) , wxEmptyString, wxITEM_NORMAL ); @@ -544,7 +544,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const bSizer17611->Add( m_bpButtonNew, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); - m_staticText951 = new wxStaticText( m_panelConfig, wxID_ANY, _("&New"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText951 = new wxStaticText( m_panelConfig, wxID_ANY, _("New"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText951->Wrap( -1 ); bSizer17611->Add( m_staticText951, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 2 ); @@ -588,12 +588,12 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const bSizer1772 = new wxBoxSizer( wxHORIZONTAL ); m_bpButtonSaveAs = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW ); - m_bpButtonSaveAs->SetToolTip( _("Save as GUI job") ); + m_bpButtonSaveAs->SetToolTip( _("dummy") ); bSizer1772->Add( m_bpButtonSaveAs, 0, 0, 5 ); m_bpButtonSaveAsBatch = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW ); - m_bpButtonSaveAsBatch->SetToolTip( _("Save as batch job") ); + m_bpButtonSaveAsBatch->SetToolTip( _("dummy") ); bSizer1772->Add( m_bpButtonSaveAsBatch, 0, wxALIGN_CENTER_HORIZONTAL, 5 ); @@ -1121,7 +1121,7 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w m_panelCompSettingsHolder->SetSizer( bSizer275 ); m_panelCompSettingsHolder->Layout(); bSizer275->Fit( m_panelCompSettingsHolder ); - m_notebook->AddPage( m_panelCompSettingsHolder, _("dummy"), true ); + m_notebook->AddPage( m_panelCompSettingsHolder, _("dummy"), false ); m_panelFilterSettingsHolder = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelFilterSettingsHolder->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); @@ -1325,8 +1325,8 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w wxBoxSizer* bSizer280; bSizer280 = new wxBoxSizer( wxHORIZONTAL ); - m_buttonReset = new wxButton( m_panelFilterSettingsHolder, wxID_DEFAULT, _("&Reset"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); - bSizer280->Add( m_buttonReset, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + m_buttonClear = new wxButton( m_panelFilterSettingsHolder, wxID_DEFAULT, _("C&lear"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); + bSizer280->Add( m_buttonClear, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); m_staticText44 = new wxStaticText( m_panelFilterSettingsHolder, wxID_ANY, _("Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair."), wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_staticText44->Wrap( 600 ); @@ -1339,7 +1339,7 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w m_panelFilterSettingsHolder->SetSizer( bSizer278 ); m_panelFilterSettingsHolder->Layout(); bSizer278->Fit( m_panelFilterSettingsHolder ); - m_notebook->AddPage( m_panelFilterSettingsHolder, _("dummy"), false ); + m_notebook->AddPage( m_panelFilterSettingsHolder, _("dummy"), true ); m_panelSyncSettingsHolder = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelSyncSettingsHolder->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); @@ -1545,7 +1545,7 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w wxBoxSizer* bSizer180; bSizer180 = new wxBoxSizer( wxHORIZONTAL ); - m_toggleBtnPermanent = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("Permanent"), wxDefaultPosition, wxDefaultSize, 0 ); + m_toggleBtnPermanent = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("&Permanent"), wxDefaultPosition, wxDefaultSize, 0 ); m_toggleBtnPermanent->SetToolTip( _("Delete or overwrite files permanently") ); bSizer180->Add( m_toggleBtnPermanent, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT, 5 ); @@ -1555,7 +1555,7 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w bSizer180->Add( m_toggleBtnRecycler, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT, 5 ); - m_toggleBtnVersioning = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("Versioning"), wxDefaultPosition, wxDefaultSize, 0 ); + m_toggleBtnVersioning = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("&Versioning"), wxDefaultPosition, wxDefaultSize, 0 ); m_toggleBtnVersioning->SetToolTip( _("Move files to a user-defined folder") ); bSizer180->Add( m_toggleBtnVersioning, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); @@ -1659,7 +1659,7 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w bSizer175->Add( m_toggleBtnErrorIgnore, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - m_toggleBtnErrorPopup = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("Pop-up"), wxDefaultPosition, wxDefaultSize, 0 ); + m_toggleBtnErrorPopup = new wxToggleButton( m_panelSyncSettings, wxID_ANY, _("&Pop-up"), wxDefaultPosition, wxDefaultSize, 0 ); m_toggleBtnErrorPopup->SetToolTip( _("Show pop-up on errors or warnings") ); bSizer175->Add( m_toggleBtnErrorPopup, 0, wxALIGN_CENTER_VERTICAL, 5 ); @@ -1742,7 +1742,7 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w m_choiceUnitTimespan->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this ); m_choiceUnitMinSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this ); m_choiceUnitMaxSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( ConfigDlgGenerated::OnChangeFilterOption ), NULL, this ); - m_buttonReset->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnFilterReset ), NULL, this ); + m_buttonClear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnFilterReset ), NULL, this ); m_checkBoxUseLocalSyncOptions->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnToggleLocalSyncSettings ), NULL, this ); m_toggleBtnTwoWay->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( ConfigDlgGenerated::OnSyncTwoWayDouble ), NULL, this ); m_toggleBtnTwoWay->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( ConfigDlgGenerated::OnSyncTwoWay ), NULL, this ); @@ -2405,14 +2405,39 @@ SyncProgressPanelGenerated::SyncProgressPanelGenerated( wxWindow* parent, wxWind wxBoxSizer* bSizer161; bSizer161 = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* bSizer175; + bSizer175 = new wxBoxSizer( wxHORIZONTAL ); + + m_bitmapGraphKeyBytes = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + bSizer175->Add( m_bitmapGraphKeyBytes, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 ); + + wxStaticText* m_staticText99; + m_staticText99 = new wxStaticText( m_panelProgress, wxID_ANY, _("Bytes copied:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText99->Wrap( -1 ); + bSizer175->Add( m_staticText99, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - bSizer161->Add( 0, 15, 0, 0, 5 ); + + bSizer161->Add( bSizer175, 0, 0, 5 ); m_panelGraphBytes = new zen::Graph2D( m_panelProgress, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_panelGraphBytes->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); bSizer161->Add( m_panelGraphBytes, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 15 ); + wxBoxSizer* bSizer174; + bSizer174 = new wxBoxSizer( wxHORIZONTAL ); + + m_bitmapGraphKeyItems = new wxStaticBitmap( m_panelProgress, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + bSizer174->Add( m_bitmapGraphKeyItems, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 ); + + wxStaticText* m_staticText100; + m_staticText100 = new wxStaticText( m_panelProgress, wxID_ANY, _("Items processed:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText100->Wrap( -1 ); + bSizer174->Add( m_staticText100, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + + bSizer161->Add( bSizer174, 0, 0, 5 ); + m_panelGraphItems = new zen::Graph2D( m_panelProgress, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_panelGraphItems->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); @@ -2425,7 +2450,7 @@ SyncProgressPanelGenerated::SyncProgressPanelGenerated( wxWindow* parent, wxWind bSizer171->Add( bSizer161, 1, wxEXPAND, 5 ); - bSizer171->Add( 0, 280, 0, 0, 5 ); + bSizer171->Add( 0, 310, 0, 0, 5 ); bSizer173->Add( bSizer171, 1, wxEXPAND, 5 ); @@ -2589,12 +2614,12 @@ BatchDlgGenerated::BatchDlgGenerated( wxWindow* parent, wxWindowID id, const wxS bSizer169->Add( m_toggleBtnErrorIgnore, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); - m_toggleBtnErrorPopup = new wxToggleButton( m_panel35, wxID_ANY, _("Pop-up"), wxDefaultPosition, wxDefaultSize, 0 ); + m_toggleBtnErrorPopup = new wxToggleButton( m_panel35, wxID_ANY, _("&Pop-up"), wxDefaultPosition, wxDefaultSize, 0 ); m_toggleBtnErrorPopup->SetToolTip( _("Show pop-up on errors or warnings") ); bSizer169->Add( m_toggleBtnErrorPopup, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - m_toggleBtnErrorStop = new wxToggleButton( m_panel35, wxID_ANY, _("Stop"), wxDefaultPosition, wxDefaultSize, 0 ); + m_toggleBtnErrorStop = new wxToggleButton( m_panel35, wxID_ANY, _("&Stop"), wxDefaultPosition, wxDefaultSize, 0 ); m_toggleBtnErrorStop->SetToolTip( _("Stop synchronization at first error") ); bSizer169->Add( m_toggleBtnErrorStop, 0, wxALIGN_CENTER_VERTICAL, 5 ); @@ -3007,7 +3032,9 @@ OptionsDlgGenerated::OptionsDlgGenerated( wxWindow* parent, wxWindowID id, const wxBoxSizer* bSizer1881; bSizer1881 = new wxBoxSizer( wxHORIZONTAL ); - m_buttonResetDialogs = new zen::BitmapTextButton( m_panel39, wxID_ANY, _("Restore hidden windows"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); + m_buttonResetDialogs = new zen::BitmapTextButton( m_panel39, wxID_ANY, _("Show hidden dialogs again"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); + m_buttonResetDialogs->SetToolTip( _("Show all permanently hidden dialogs and warning messages again") ); + bSizer1881->Add( m_buttonResetDialogs, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10 ); m_staticline40 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL ); diff --git a/FreeFileSync/Source/ui/gui_generated.h b/FreeFileSync/Source/ui/gui_generated.h index 37c1c307..4b238ba9 100644 --- a/FreeFileSync/Source/ui/gui_generated.h +++ b/FreeFileSync/Source/ui/gui_generated.h @@ -300,7 +300,7 @@ protected: wxSpinCtrl* m_spinCtrlMaxSize; wxChoice* m_choiceUnitMaxSize; wxStaticLine* m_staticline62; - wxButton* m_buttonReset; + wxButton* m_buttonClear; wxStaticText* m_staticText44; wxPanel* m_panelSyncSettingsHolder; wxBoxSizer* bSizerLocalSyncSettings; @@ -546,7 +546,9 @@ public: wxPanel* m_panelTimeRemaining; wxStaticText* m_staticTextRemTime; wxStaticText* m_staticTextTimeElapsed; + wxStaticBitmap* m_bitmapGraphKeyBytes; zen::Graph2D* m_panelGraphBytes; + wxStaticBitmap* m_bitmapGraphKeyItems; zen::Graph2D* m_panelGraphItems; wxNotebook* m_notebookResult; wxStaticLine* m_staticlineFooter; diff --git a/FreeFileSync/Source/ui/gui_status_handler.cpp b/FreeFileSync/Source/ui/gui_status_handler.cpp index dfd89444..cb6ecf25 100644 --- a/FreeFileSync/Source/ui/gui_status_handler.cpp +++ b/FreeFileSync/Source/ui/gui_status_handler.cpp @@ -270,7 +270,7 @@ SyncStatusHandler::~SyncStatusHandler() else try { - //use EXEC_TYPE_ASYNC until there is reason no to: https://sourceforge.net/p/freefilesync/discussion/help/thread/828dca52 + //use EXEC_TYPE_ASYNC until there is reason not to: https://sourceforge.net/p/freefilesync/discussion/help/thread/828dca52 tryReportingError([&] { shellExecute2(expandMacros(finalCommand), EXEC_TYPE_ASYNC); }, //throw FileError, throw X? *this); } diff --git a/FreeFileSync/Source/ui/main_dlg.cpp b/FreeFileSync/Source/ui/main_dlg.cpp index 4c27407a..e7f99fdf 100644 --- a/FreeFileSync/Source/ui/main_dlg.cpp +++ b/FreeFileSync/Source/ui/main_dlg.cpp @@ -607,9 +607,12 @@ MainDialog::MainDialog(const Zstring& globalConfigFile, m_panelSearch->Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(MainDialog::OnSearchPanelKeyPressed), nullptr, this); //set tool tips with (non-translated!) short cut hint - m_bpButtonNew ->SetToolTip(_("&New") + L" (Ctrl+N)"); - m_bpButtonOpen ->SetToolTip(_("Open...") + L" (Ctrl+O)"); - m_bpButtonSave ->SetToolTip(_("Save") + L" (Ctrl+S)"); + m_bpButtonNew ->SetToolTip(replaceCpy(_("&New"), L"&", L"") + L" (Ctrl+N)"); // + m_bpButtonOpen ->SetToolTip(replaceCpy(_("&Open..."), L"&", L"") + L" (Ctrl+O)"); //reuse texts from gui builder + m_bpButtonSave ->SetToolTip(replaceCpy(_("&Save"), L"&", L"") + L" (Ctrl+S)"); // + m_bpButtonSaveAs ->SetToolTip(replaceCpy(_("Save &as..."), L"&", L"")); // + m_bpButtonSaveAsBatch->SetToolTip(replaceCpy(_("Save as &batch job..."), L"&", L"")); // + m_buttonCompare ->SetToolTip(_("Start comparison") + L" (F5)"); m_bpButtonCmpConfig ->SetToolTip(_("Comparison settings") + L" (F6)"); m_bpButtonSyncConfig->SetToolTip(_("Synchronization settings") + L" (F8)"); @@ -3331,7 +3334,7 @@ void MainDialog::OnGlobalFilterContext(wxMouseEvent& event) }; ContextMenu menu; - menu.addItem( _("Reset filter"), clearFilter, nullptr, !isNullFilter(currentCfg.mainCfg.globalFilter)); + menu.addItem( _("Clear filter"), clearFilter, nullptr, !isNullFilter(currentCfg.mainCfg.globalFilter)); menu.addSeparator(); menu.addItem( _("Copy"), copyFilter, nullptr, !isNullFilter(currentCfg.mainCfg.globalFilter)); menu.addItem( _("Paste"), pasteFilter, nullptr, filterCfgOnClipboard.get() != nullptr); diff --git a/FreeFileSync/Source/ui/progress_indicator.cpp b/FreeFileSync/Source/ui/progress_indicator.cpp index 791b3bdf..76117f6c 100644 --- a/FreeFileSync/Source/ui/progress_indicator.cpp +++ b/FreeFileSync/Source/ui/progress_indicator.cpp @@ -1236,14 +1236,14 @@ SyncProgressDialogImpl<TopLevelDialog>::SyncProgressDialogImpl(long style, //wxF pnl.m_bpButtonMinimizeToTray->SetBitmapLabel(getResourceImage(L"minimize_to_tray")); //init graph - curveDataBytes = std::make_shared<CurveDataStatistics>(); - curveDataItems = std::make_shared<CurveDataStatistics>(); - curveDataBytesCurrent = std::make_shared<CurveDataRectangleArea>(); - curveDataItemsCurrent = std::make_shared<CurveDataRectangleArea>(); curveDataBytesTotal = std::make_shared<CurveDataRectangleArea>(); curveDataItemsTotal = std::make_shared<CurveDataRectangleArea>(); + curveDataBytesCurrent = std::make_shared<CurveDataRectangleArea>(); + curveDataItemsCurrent = std::make_shared<CurveDataRectangleArea>(); + curveDataBytes = std::make_shared<CurveDataStatistics>(); + curveDataItems = std::make_shared<CurveDataStatistics>(); - const int xLabelHeight = 18; //we need to use the same height for both graphs to make sure they stretch evenly + const int xLabelHeight = this->GetCharHeight() + 2 * 1/*border*/; //use same height for both graphs to make sure they stretch evenly const int yLabelWidth = 70; pnl.m_panelGraphBytes->setAttributes(Graph2D::MainAttributes(). setLabelX(Graph2D::X_LABEL_BOTTOM, xLabelHeight, std::make_shared<LabelFormatterTimeElapsed>(true)). @@ -1257,14 +1257,35 @@ SyncProgressDialogImpl<TopLevelDialog>::SyncProgressDialogImpl(long style, //wxF setBackgroundColor(wxColor(208, 208, 208)). //light grey setSelectionMode(Graph2D::SELECT_NONE)); + const wxColor colCurveAreaBytes(111, 255, 99); //light green + const wxColor colCurveAreaItems(127, 147, 255); //light blue + + const wxColor colCurveAreaBytesRim(20, 200, 0); //medium green + const wxColor colCurveAreaItemsRim(90, 120, 255); //medium blue + pnl.m_panelGraphBytes->setCurve(curveDataBytesTotal, Graph2D::CurveAttributes().setLineWidth(1).fillCurveArea(*wxWHITE).setColor(wxColor(192, 192, 192))); //medium grey pnl.m_panelGraphItems->setCurve(curveDataItemsTotal, Graph2D::CurveAttributes().setLineWidth(1).fillCurveArea(*wxWHITE).setColor(wxColor(192, 192, 192))); //medium grey pnl.m_panelGraphBytes->addCurve(curveDataBytesCurrent, Graph2D::CurveAttributes().setLineWidth(1).fillCurveArea(wxColor(205, 255, 202))./*faint green*/ setColor(wxColor(12, 128, 0))); //dark green pnl.m_panelGraphItems->addCurve(curveDataItemsCurrent, Graph2D::CurveAttributes().setLineWidth(1).fillCurveArea(wxColor(198, 206, 255))./*faint blue */ setColor(wxColor(53, 25, 255))); //dark blue - pnl.m_panelGraphBytes->addCurve(curveDataBytes, Graph2D::CurveAttributes().setLineWidth(2).fillCurveArea(wxColor(111, 255, 99))./*light green*/ setColor(wxColor(20, 200, 0))); //medium green - pnl.m_panelGraphItems->addCurve(curveDataItems, Graph2D::CurveAttributes().setLineWidth(2).fillCurveArea(wxColor(127, 147, 255))./*light blue */ setColor(wxColor(90, 120, 255))); //medium blue + pnl.m_panelGraphBytes->addCurve(curveDataBytes, Graph2D::CurveAttributes().setLineWidth(2).fillCurveArea(colCurveAreaBytes).setColor(colCurveAreaBytesRim)); + pnl.m_panelGraphItems->addCurve(curveDataItems, Graph2D::CurveAttributes().setLineWidth(2).fillCurveArea(colCurveAreaItems).setColor(colCurveAreaItemsRim)); + + //graph legend: + auto generateSquareBitmap = [&](const wxColor& fillCol, const wxColor& borderCol) + { + wxBitmap bmpSquare(this->GetCharHeight(), this->GetCharHeight()); //seems we don't need to pass 24-bit depth here even for high-contrast color schemes + { + wxMemoryDC dc(bmpSquare); + wxDCBrushChanger dummy(dc, fillCol); + wxDCPenChanger dummy2(dc, borderCol); + dc.DrawRectangle(wxPoint(), bmpSquare.GetSize()); + } + return bmpSquare; + }; + pnl.m_bitmapGraphKeyBytes->SetBitmap(generateSquareBitmap(colCurveAreaBytes, colCurveAreaBytesRim)); + pnl.m_bitmapGraphKeyItems->SetBitmap(generateSquareBitmap(colCurveAreaItems, colCurveAreaItemsRim)); //allow changing the "on completion" command pnl.m_comboBoxOnCompletion->initHistory(onCompletionHistory, onCompletionHistory.size()); //-> we won't use addItemHistory() later diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp index 6857c806..66692f7a 100644 --- a/FreeFileSync/Source/ui/small_dlgs.cpp +++ b/FreeFileSync/Source/ui/small_dlgs.cpp @@ -107,7 +107,9 @@ AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent) wxImage versionImage = stackImages(appnameImg, buildImg, ImageStackLayout::VERTICAL, ImageStackAlignment::CENTER, 0); const int BORDER_SIZE = 5; - wxBitmap headerBmp(GetClientSize().GetWidth(), versionImage.GetHeight() + 2 * BORDER_SIZE); + wxBitmap headerBmp(GetClientSize().GetWidth(), versionImage.GetHeight() + 2 * BORDER_SIZE, 24); + //attention: *must* pass 24 bits, auto-determination fails on Windows high-contrast colors schemes!!! + //problem only manifests when calling wxDC::DrawBitmap { wxMemoryDC dc(headerBmp); dc.SetBackground(*wxWHITE_BRUSH); @@ -507,8 +509,8 @@ void OptionsDlg::OnOkay(wxCommandEvent& event) void OptionsDlg::OnResetDialogs(wxCommandEvent& event) { switch (showConfirmationDialog(this, DialogInfoType::INFO, - PopupDialogCfg().setMainInstructions(_("Restore all hidden windows and warnings?")), - _("&Restore"))) + PopupDialogCfg().setMainInstructions(_("Show hidden dialogs and warning messages again?")), + _("&Show"))) { case ConfirmationButton::DO_IT: settings.optDialogs.resetDialogs(); diff --git a/FreeFileSync/Source/ui/sync_cfg.cpp b/FreeFileSync/Source/ui/sync_cfg.cpp index a2711e0c..2973f194 100644 --- a/FreeFileSync/Source/ui/sync_cfg.cpp +++ b/FreeFileSync/Source/ui/sync_cfg.cpp @@ -271,6 +271,7 @@ ConfigDialog::ConfigDialog(wxWindow* parent, m_textCtrlInclude->SetMaxLength(0); //allow large filter entries! m_textCtrlExclude->SetMaxLength(0); // #endif + assert(!contains(m_buttonClear->GetLabel(), L"&C") && !contains(m_buttonClear->GetLabel(), L"&c")); //gazillionth wxWidgets bug on OS X: Command + C mistakenly hits "&C" access key! m_textCtrlInclude->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(ConfigDialog::onFilterKeyEvent), nullptr, this); m_textCtrlExclude->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(ConfigDialog::onFilterKeyEvent), nullptr, this); @@ -513,7 +514,7 @@ void ConfigDialog::updateFilterGui() m_spinCtrlMinSize ->Enable(activeCfg.unitSizeMin != USIZE_NONE); m_spinCtrlMaxSize ->Enable(activeCfg.unitSizeMax != USIZE_NONE); - m_buttonReset->Enable(!(activeCfg == FilterConfig())); + m_buttonClear->Enable(!(activeCfg == FilterConfig())); } diff --git a/FreeFileSync/Source/version/version.h b/FreeFileSync/Source/version/version.h index db8931f9..a1def1a9 100644 --- a/FreeFileSync/Source/version/version.h +++ b/FreeFileSync/Source/version/version.h @@ -3,7 +3,7 @@ namespace zen { -const wchar_t currentVersion[] = L"6.8"; //internal linkage! +const wchar_t currentVersion[] = L"6.9"; //internal linkage! } #endif diff --git a/wx+/image_tools.cpp b/wx+/image_tools.cpp index f45f3b6f..d36fb2fa 100644 --- a/wx+/image_tools.cpp +++ b/wx+/image_tools.cpp @@ -111,7 +111,7 @@ wxImage zen::stackImages(const wxImage& img1, const wxImage& img2, ImageStackLay namespace { -void makeWhiteTransparent(wxImage& image) //assume black text on white background +void calcAlphaForBlackWhiteImage(wxImage& image) //assume black text on white background { assert(image.HasAlpha()); if (unsigned char* alphaPtr = image.GetAlpha()) @@ -146,13 +146,13 @@ wxImage zen::createImageFromText(const wxString& text, const wxFont& font, const if (text.empty()) return wxImage(); - wxBitmap newBitmap(getTextExtent(text, font)); + wxBitmap newBitmap(getTextExtent(text, font)); //seems we don't need to pass 24-bit depth here even for high-contrast color schemes { wxMemoryDC dc(newBitmap); dc.SetBackground(*wxWHITE_BRUSH); dc.Clear(); - dc.SetTextForeground(*wxBLACK); //for use in makeWhiteTransparent + dc.SetTextForeground(*wxBLACK); //for use in calcAlphaForBlackWhiteImage dc.SetTextBackground(*wxWHITE); // dc.SetFont(font); @@ -172,7 +172,7 @@ wxImage zen::createImageFromText(const wxString& text, const wxFont& font, const output.SetAlpha(); //calculate alpha channel - makeWhiteTransparent(output); + calcAlphaForBlackWhiteImage(output); //apply actual text color unsigned char* dataPtr = output.GetData(); diff --git a/zen/dst_hack.cpp b/zen/dst_hack.cpp index 52d45679..b38f73b4 100644 --- a/zen/dst_hack.cpp +++ b/zen/dst_hack.cpp @@ -57,7 +57,7 @@ bool dst::isFatDrive(const Zstring& filepath) //throw() return false; const DWORD bufferSize = MAX_PATH + 1; - wchar_t fsName[bufferSize]; + wchar_t fsName[bufferSize] = {}; //suprisingly fast: ca. 0.03 ms per call! if (!::GetVolumeInformation(appendSeparator(volumePath).c_str(), //__in_opt LPCTSTR lpRootPathName, diff --git a/zen/file_handling.cpp b/zen/file_handling.cpp index b4622a9c..75062462 100644 --- a/zen/file_handling.cpp +++ b/zen/file_handling.cpp @@ -20,7 +20,6 @@ #include <Aclapi.h> #include "privilege.h" #include "dll.h" -#include "win.h" //includes "windows.h" #include "long_path_prefix.h" #include "dst_hack.h" #include "win_ver.h" @@ -828,8 +827,8 @@ void setFileTimeRaw(const Zstring& filepath, const FILETIME& creationTime, const nullptr, &lastWriteTimeDbg)); - assert(std::abs(filetimeToTimeT(creationTimeDbg ) - filetimeToTimeT(creationTime )) <= 2); //respect 2 second FAT/FAT32 precision - assert(std::abs(filetimeToTimeT(lastWriteTimeDbg) - filetimeToTimeT(lastWriteTime)) <= 2); // + assert(std::abs(filetimeToTimeT(lastWriteTimeDbg) - filetimeToTimeT(lastWriteTime)) <= 2); //respect 2 second FAT/FAT32 precision + //assert(std::abs(filetimeToTimeT(creationTimeDbg ) - filetimeToTimeT(creationTime )) <= 2); -> creation time not available for Linux-hosted Samba shares! #endif } #endif @@ -1632,7 +1631,7 @@ void copyFileWindowsSparse(const Zstring& sourceFile, throw FileError(errorMsg, errorDescr); } - ScopeGuard guardTarget = makeGuard([&] { try { removeFile(targetFile); } catch (FileError&) {} }); //transactional behavior: guard just after opening target and before managing hFileOut + ScopeGuard guardTarget = makeGuard([&] { try { removeFile(targetFile); } catch (FileError&) {} }); //transactional behavior: guard just after opening target and before managing hFileTarget ZEN_ON_SCOPE_EXIT(::CloseHandle(hFileTarget)); //---------------------------------------------------------------------- @@ -1772,26 +1771,26 @@ void copyFileWindowsSparse(const Zstring& sourceFile, FILE_FLAG_SEQUENTIAL_SCAN, nullptr); if (hFileTarget == INVALID_HANDLE_VALUE) - throw 1; + throw FileError(L"fail"); ZEN_ON_SCOPE_EXIT(::CloseHandle(hSparse)); DWORD br = 0; if (!::DeviceIoControl(hSparse, FSCTL_SET_SPARSE, nullptr, 0, nullptr, 0, &br,nullptr)) - throw 1; + throw FileError(L"fail"); LARGE_INTEGER liDistanceToMove = {}; liDistanceToMove.QuadPart = 1024 * 1024 * 1024; //create 5 TB sparse file liDistanceToMove.QuadPart *= 5 * 1024; //maximum file size on NTFS: 16 TB - 64 kB if (!::SetFilePointerEx(hSparse, liDistanceToMove, nullptr, FILE_BEGIN)) - throw 1; + throw FileError(L"fail"); if (!SetEndOfFile(hSparse)) - throw 1; + throw FileError(L"fail"); FILE_ZERO_DATA_INFORMATION zeroInfo = {}; zeroInfo.BeyondFinalZero.QuadPart = liDistanceToMove.QuadPart; if (!::DeviceIoControl(hSparse, FSCTL_SET_ZERO_DATA, &zeroInfo, sizeof(zeroInfo), nullptr, 0, &br, nullptr)) - throw 1; + throw FileError(L"fail"); */ } @@ -2044,6 +2043,7 @@ void copyFileWindowsDefault(const Zstring& sourceFile, dst::isFatDrive(targetFile) && getFilesize(sourceFile) >= 4U * std::uint64_t(1024U * 1024 * 1024)) //throw FileError errorDescr += L"\nFAT volumes cannot store files larger than 4 gigabyte."; + //see "Limitations of the FAT32 File System": http://support.microsoft.com/kb/314463/en-us //note: ERROR_INVALID_PARAMETER can also occur when copying to a SharePoint server or MS SkyDrive and the target filepath is of a restricted type. } @@ -2255,14 +2255,15 @@ void zen::copyFile(const Zstring& sourceFile, //throw FileError, ErrorTargetPath Zstring tmpTarget = targetFile + TEMP_FILE_ENDING; //use temporary file until a correct date has been set //raw file copy - for (int i = 1;; ++i) + for (int i = 0;; ++i) try { copyFileSelectOs(sourceFile, tmpTarget, onUpdateCopyStatus, sourceAttr); //throw FileError: ErrorTargetPathMissing, ErrorTargetExisting, ErrorFileLocked break; } - catch (const ErrorTargetExisting&) //using optimistic strategy: assume everything goes well, but recover on error -> minimize file accesses + catch (const ErrorTargetExisting&) //optimistic strategy: assume everything goes well, but recover on error -> minimize file accesses { + if (i == 10) throw; //avoid endless recursion in pathological cases, e.g. https://sourceforge.net/p/freefilesync/discussion/open-discussion/thread/36adac33 tmpTarget = targetFile + Zchar('_') + numberTo<Zstring>(i) + TEMP_FILE_ENDING; } diff --git a/zen/notify_removal.cpp b/zen/notify_removal.cpp index 3de375f2..45a39c48 100644 --- a/zen/notify_removal.cpp +++ b/zen/notify_removal.cpp @@ -38,7 +38,7 @@ private: MessageProvider (const MessageProvider&) = delete; MessageProvider& operator=(const MessageProvider&) = delete; - static const wchar_t dummyWindowName[]; + static const wchar_t dummyClassName[]; static LRESULT CALLBACK topWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -51,7 +51,7 @@ private: }; -const wchar_t MessageProvider::dummyWindowName[] = L"E6AD5EB1-527B-4EEF-AC75-27883B233380"; //random name +const wchar_t MessageProvider::dummyClassName[] = L"E6AD5EB1-527B-4EEF-AC75-27883B233380"; //random name LRESULT CALLBACK MessageProvider::topWndProc(HWND hwnd, //handle to window @@ -81,37 +81,30 @@ MessageProvider::MessageProvider() : WNDCLASS wc = {}; wc.lpfnWndProc = topWndProc; wc.hInstance = hMainModule; - wc.lpszClassName = dummyWindowName; + wc.lpszClassName = dummyClassName; if (::RegisterClass(&wc) == 0) throwFileError(_("Unable to register to receive system messages."), L"RegisterClass", getLastError()); - ScopeGuard guardClass = makeGuard([&] { ::UnregisterClass(dummyWindowName, hMainModule); }); + ScopeGuard guardClass = makeGuard([&] { ::UnregisterClass(dummyClassName, hMainModule); }); //create dummy-window - windowHandle = ::CreateWindow(dummyWindowName, //LPCTSTR lpClassName OR ATOM in low-order word! - nullptr, //LPCTSTR lpWindowName, - 0, //DWORD dwStyle, - 0, //int x, - 0, //int y, - 0, //int nWidth, - 0, //int nHeight, - 0, //note: we need a toplevel window to receive device arrival events, not a message-window (HWND_MESSAGE)! - nullptr, //HMENU hMenu, - hMainModule, //HINSTANCE hInstance, - nullptr); //LPVOID lpParam + windowHandle = ::CreateWindow(dummyClassName, //_In_opt_ LPCTSTR lpClassName, + nullptr, //_In_opt_ LPCTSTR lpWindowName, + 0, //_In_ DWORD dwStyle, + 0, 0, 0, 0, //_In_ int x, y, nWidth, nHeight, + nullptr, //_In_opt_ HWND hWndParent; we need a toplevel window to receive device arrival events, not a message-window (HWND_MESSAGE)! + nullptr, //_In_opt_ HMENU hMenu, + hMainModule, //_In_opt_ HINSTANCE hInstance, + nullptr); //_In_opt_ LPVOID lpParam if (!windowHandle) throwFileError(_("Unable to register to receive system messages."), L"CreateWindow", getLastError()); //store this-pointer for topWndProc() to use: do this AFTER CreateWindow() to avoid processing messages while this constructor is running!!! //unlike: http://blogs.msdn.com/b/oldnewthing/archive/2014/02/03/10496248.aspx ::SetLastError(ERROR_SUCCESS); //[!] required for proper error handling, see MSDN, SetWindowLongPtr - if (::SetWindowLongPtr(windowHandle, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this)) == 0) - { - const DWORD lastError = ::GetLastError(); //copy before directly or indirectly making other system calls! - if (lastError != ERROR_SUCCESS) - throwFileError(_("Unable to register to receive system messages."), L"SetWindowLongPtr", lastError); - } + if (::SetWindowLongPtr(windowHandle, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this)) == 0 && ::GetLastError() != ERROR_SUCCESS) + throwFileError(_("Unable to register to receive system messages."), L"SetWindowLongPtr", ::GetLastError()); guardClass.dismiss(); } @@ -121,8 +114,8 @@ MessageProvider::~MessageProvider() { //clean-up in reverse order ::DestroyWindow(windowHandle); - ::UnregisterClass(dummyWindowName, //LPCTSTR lpClassName OR ATOM in low-order word! - hMainModule); //HINSTANCE hInstance + ::UnregisterClass(dummyClassName, //LPCTSTR lpClassName OR ATOM in low-order word! + hMainModule); //HINSTANCE hInstance } @@ -4,8 +4,8 @@ // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** -#ifndef DEBUG_PERF_HEADER -#define DEBUG_PERF_HEADER +#ifndef DEBUG_PERF_HEADER_83947184145342652456 +#define DEBUG_PERF_HEADER_83947184145342652456 #include "deprecate.h" #include "tick_count.h" @@ -30,14 +30,10 @@ public: ZEN_DEPRECATE PerfTimer() : //throw TimerError - ticksPerSec_(ticksPerSec()), startTime(), resultShown(false) + ticksPerSec_(ticksPerSec()), startTime(getTicks()), resultShown(false) { - //std::clock() - "counts CPU time in C and wall time in VC++" - WTF!??? -#ifdef ZEN_WIN - if (::SetThreadAffinityMask(::GetCurrentThread(), 1) == 0) //"should not be required unless there are bugs in BIOS or HAL" - msdn, QueryPerformanceCounter - throw TimerError(); -#endif - startTime = getTicks(); + //std::clock() - "counts CPU time in Linux GCC and wall time in VC++" - WTF!??? + if (ticksPerSec_ == 0 || !startTime.isValid()) throw TimerError(); } @@ -50,7 +46,7 @@ public: if (!now.isValid()) throw TimerError(); - const auto delta = static_cast<long>(1000.0 * dist(startTime, now) / ticksPerSec_); + const std::int64_t delta = 1000 * dist(startTime, now) / ticksPerSec_; #ifdef ZEN_WIN std::ostringstream ss; ss << delta << " ms"; @@ -72,4 +68,4 @@ private: }; } -#endif //DEBUG_PERF_HEADER +#endif //DEBUG_PERF_HEADER_83947184145342652456 diff --git a/zen/process_priority.cpp b/zen/process_priority.cpp index d2f6dc26..ee8e7d8b 100644 --- a/zen/process_priority.cpp +++ b/zen/process_priority.cpp @@ -5,17 +5,11 @@ // ************************************************************************** #include "process_priority.h" -#include "sys_error.h" +//#include "sys_error.h" #include "i18n.h" #ifdef ZEN_WIN #include "win.h" //includes "windows.h" - -#elif defined ZEN_LINUX - -#elif defined ZEN_MAC -#include <sys/resource.h> //getiopolicy_np -#include <IOKit/pwr_mgt/IOPMLib.h> //keep in .cpp file to not pollute global namespace! #endif using namespace zen; @@ -99,51 +93,4 @@ private: const int oldIoPrio; }; */ - -#elif defined ZEN_MAC -//https://developer.apple.com/library/mac/#qa/qa1340 -struct PreventStandby::Pimpl -{ - Pimpl() : assertionID() {} - IOPMAssertionID assertionID; -}; - -PreventStandby::PreventStandby() : pimpl(make_unique<Pimpl>()) -{ - IOReturn rv = ::IOPMAssertionCreateWithName(kIOPMAssertionTypeNoIdleSleep, - kIOPMAssertionLevelOn, - CFSTR("FreeFileSync"), - &pimpl->assertionID); - if (rv != kIOReturnSuccess) - throw FileError(_("Unable to suspend system sleep mode."), replaceCpy<std::wstring>(L"IOReturn Code %x", L"%x", numberTo<std::wstring>(rv))); //could not find a better way to convert IOReturn to string -} - -PreventStandby::~PreventStandby() -{ - ::IOPMAssertionRelease(pimpl->assertionID); -} - - -struct ScheduleForBackgroundProcessing::Pimpl -{ - Pimpl() : oldIoPrio() {} - int oldIoPrio; -}; - - -ScheduleForBackgroundProcessing::ScheduleForBackgroundProcessing() : pimpl(make_unique<Pimpl>()) -{ - pimpl->oldIoPrio = ::getiopolicy_np(IOPOL_TYPE_DISK, IOPOL_SCOPE_PROCESS); - if (pimpl->oldIoPrio == -1) - throwFileError(_("Cannot change process I/O priorities."), L"getiopolicy_np", getLastError()); - - if (::setiopolicy_np(IOPOL_TYPE_DISK, IOPOL_SCOPE_PROCESS, IOPOL_THROTTLE) != 0) - throwFileError(_("Cannot change process I/O priorities."), L"setiopolicy_np", getLastError()); -} - - -ScheduleForBackgroundProcessing::~ScheduleForBackgroundProcessing() -{ - ::setiopolicy_np(IOPOL_TYPE_DISK, IOPOL_SCOPE_PROCESS, pimpl->oldIoPrio); -} #endif diff --git a/zen/process_priority.h b/zen/process_priority.h index 78e49cd0..a133985f 100644 --- a/zen/process_priority.h +++ b/zen/process_priority.h @@ -3,11 +3,11 @@ // * GNU General Public License: http://www.gnu.org/licenses/gpl.html * // * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** -#ifndef PREVENTSTANDBY_H_INCLUDED -#define PREVENTSTANDBY_H_INCLUDED +#ifndef PREVENTSTANDBY_H_83421759082143245 +#define PREVENTSTANDBY_H_83421759082143245 #include <memory> -#include <zen/file_error.h> +#include "file_error.h" namespace zen { @@ -34,4 +34,4 @@ private: }; } -#endif // PREVENTSTANDBY_H_INCLUDED +#endif //PREVENTSTANDBY_H_83421759082143245 diff --git a/zen/recycler.cpp b/zen/recycler.cpp index 41ea6002..930b05ac 100644 --- a/zen/recycler.cpp +++ b/zen/recycler.cpp @@ -84,20 +84,21 @@ void zen::recycleOrDelete(const std::vector<Zstring>& itempaths, const std::func if (vistaOrLater()) //new recycle bin usage: available since Vista { - using namespace fileop; - const DllFun<FunType_moveToRecycleBin > moveToRecycler (getDllName(), funName_moveToRecycleBin); - const DllFun<FunType_getLastErrorMessage> getLastErrorMessage(getDllName(), funName_getLastErrorMessage); +#define DEF_DLL_FUN(name) const DllFun<fileop::FunType_##name> name(fileop::getDllName(), fileop::funName_##name); +DEF_DLL_FUN(moveToRecycleBin); +DEF_DLL_FUN(getLastErrorMessage); +#undef DEF_DLL_FUN - if (!moveToRecycler || !getLastErrorMessage) + if (!moveToRecycleBin || !getLastErrorMessage) throw FileError(replaceCpy(_("Unable to move %x to the recycle bin."), L"%x", fmtFileName(itempaths[0])), - replaceCpy(_("Cannot load file %x."), L"%x", fmtFileName(getDllName()))); + replaceCpy(_("Cannot load file %x."), L"%x", fmtFileName(fileop::getDllName()))); std::vector<const wchar_t*> cNames; for (auto it = itempaths.begin(); it != itempaths.end(); ++it) //CAUTION: do not create temporary strings here!! cNames.push_back(it->c_str()); CallbackData cbd(notifyDeletionStatus); - if (!moveToRecycler(&cNames[0], cNames.size(), onRecyclerCallback, &cbd)) + if (!moveToRecycleBin(&cNames[0], cNames.size(), onRecyclerCallback, &cbd)) { if (cbd.exceptionInUserCallback) { diff --git a/zen/tick_count.h b/zen/tick_count.h index cb15fe20..482689d7 100644 --- a/zen/tick_count.h +++ b/zen/tick_count.h @@ -102,7 +102,7 @@ int64_t ticksPerSec() //return 0 on error #ifdef ZEN_WIN LARGE_INTEGER frequency = {}; if (!::QueryPerformanceFrequency(&frequency)) //MSDN promises: "The frequency cannot change while the system is running." - return 0; + return 0; //MSDN: "This won't occur on any system that runs Windows XP or later." static_assert(sizeof(int64_t) >= sizeof(frequency.QuadPart), ""); return frequency.QuadPart; @@ -126,8 +126,10 @@ TickVal getTicks() //return !isValid() on error { #ifdef ZEN_WIN LARGE_INTEGER now = {}; - if (!::QueryPerformanceCounter(&now)) //msdn: SetThreadAffinityMask() may be required if there are bugs in BIOS or HAL" + if (!::QueryPerformanceCounter(&now)) return TickVal(); + //detailed info about QPC: http://msdn.microsoft.com/en-us/library/windows/desktop/dn553408%28v=vs.85%29.aspx + //- MSDN: "No need to set the thread affinity" #elif defined ZEN_LINUX //gettimeofday() seems fine but is deprecated diff --git a/zen/type_traits.h b/zen/type_traits.h index 1c2da5eb..8e85a7b2 100644 --- a/zen/type_traits.h +++ b/zen/type_traits.h @@ -7,7 +7,7 @@ #ifndef TYPE_TRAITS_HEADER_3425628658765467 #define TYPE_TRAITS_HEADER_3425628658765467 -#include <type_traits> //all we need is std::is_class!! +#include <type_traits> //all we need is std::is_class!! namespace zen { @@ -38,10 +38,10 @@ struct ResultType //Herb Sutter's signedness conversion helpers: http://herbsutter.com/2013/06/13/gotw-93-solution-auto-variables-part-2/ template<class T> inline -typename std::make_signed<T>::type makeSigned(T t) { return std::make_signed<T>::type(t); } +typename std::make_signed<T>::type makeSigned(T t) { return typename std::make_signed<T>::type(t); } template<class T> inline -typename std::make_unsigned<T>::type makeUnsigned(T t) { return std::make_unsigned<T>::type(t); } +typename std::make_unsigned<T>::type makeUnsigned(T t) { return typename std::make_unsigned<T>::type(t); } //################# Built-in Types ######################## //Example: "IsSignedInt<int>::value" evaluates to "true" diff --git a/zen/zstring.cpp b/zen/zstring.cpp index f1858efc..f16af6a0 100644 --- a/zen/zstring.cpp +++ b/zen/zstring.cpp @@ -18,6 +18,7 @@ #ifndef NDEBUG #include <mutex> #include <iostream> +#include "thread.h" #endif using namespace zen; @@ -38,14 +39,14 @@ public: void insert(const void* ptr, size_t size) { - std::lock_guard<std::mutex> dummy(lockActStrings); + boost::lock_guard<boost::mutex> dummy(lockActStrings); if (!activeStrings.insert(std::make_pair(ptr, size)).second) reportProblem("Serious Error: New memory points into occupied space: " + rawMemToString(ptr, size)); } void remove(const void* ptr) { - std::lock_guard<std::mutex> dummy(lockActStrings); + boost::lock_guard<boost::mutex> dummy(lockActStrings); if (activeStrings.erase(ptr) != 1) reportProblem("Serious Error: No memory available for deallocation at this location!"); } @@ -94,7 +95,7 @@ private: throw std::logic_error("Memory leak! " + message); } - std::mutex lockActStrings; + boost::mutex lockActStrings; zen::hash_map<const void*, size_t> activeStrings; }; |