diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2015-10-02 14:50:01 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2015-10-02 14:50:01 +0200 |
| commit | 6213f9a4474f28b3df9abafefe2804a105b1f468 (patch) | |
| tree | 16a22816c826ba2da0060bbfe63a1ec2ad0eb1b0 | |
| parent | 6.5 (diff) | |
| download | FreeFileSync-6213f9a4474f28b3df9abafefe2804a105b1f468.tar.gz FreeFileSync-6213f9a4474f28b3df9abafefe2804a105b1f468.tar.bz2 FreeFileSync-6213f9a4474f28b3df9abafefe2804a105b1f468.zip | |
6.6
59 files changed, 4891 insertions, 4145 deletions
diff --git a/FreeFileSync/Build/Changelog.txt b/FreeFileSync/Build/Changelog.txt index 58c12dc6..7a992d2a 100644 --- a/FreeFileSync/Build/Changelog.txt +++ b/FreeFileSync/Build/Changelog.txt @@ -1,3 +1,17 @@ +FreeFileSync 6.6 [2014-06-01] +----------------------------- +Fixed large font size standard button layout +Fixed config dialog graphics glitch with large font sizes +Exit FreeFileSync launcher process during update +Exclude temporary files from RealtimeSync monitor +Implement correct standard button spacing (OS X) +Fixed SELinux compilation issue (Linux) +Installer adds RealtimeSync link to desktop (Windows) +Improved makefile (Linux, OS X) +Reduced binary file size (Linux) +Updated translation files + + FreeFileSync 6.5 [2014-05-01] ----------------------------- Support preview for RAW CR2 image files (Windows Vista and later) diff --git a/FreeFileSync/Build/Languages/arabic.lng b/FreeFileSync/Build/Languages/arabic.lng index 7fc6076e..5e8d0dc3 100644 --- a/FreeFileSync/Build/Languages/arabic.lng +++ b/FreeFileSync/Build/Languages/arabic.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>بنية:</target> -<source>config files</source> -<target>ملفات الخيارات</target> +<source>global config file:</source> +<target></target> + +<source>config files:</source> +<target></target> <source>directory</source> <target>مسار</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target></target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>أي عدد من ملفات خيارات FreeFileSyn أو\و _gui and/or .ffs_batch</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>أي عدد من المسارات البديلة لملف خيارات وحيد على الأكثر.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target></target> <source>Cannot find the following folders:</source> <target>تعذر العثور على المجلدات التالية:</target> @@ -667,11 +673,11 @@ The command is triggered if: <source>Drag && drop</source> <target>سحب و إفلات</target> -<source>Alternate comparison settings</source> -<target>خيارات المفارنة البديلة</target> +<source>Local comparison settings</source> +<target></target> -<source>Alternate synchronization settings</source> -<target>خيارات المزامنة البديلة</target> +<source>Local synchronization settings</source> +<target></target> <source>Local filter</source> <target>فلتر محلي</target> @@ -682,11 +688,11 @@ The command is triggered if: <source>None</source> <target>لا شيء</target> -<source>Remove alternate settings</source> -<target>إزالة الإعدادات البديلة</target> +<source>Remove local settings</source> +<target></target> -<source>Clear filter settings</source> -<target>مسح إعدادات عامل الفلترة</target> +<source>Reset local filter</source> +<target></target> <source>Copy</source> <target>نسخ</target> @@ -694,14 +700,8 @@ The command is triggered if: <source>Paste</source> <target>لصق</target> -<source>Alternate Comparison Settings</source> -<target>خيارات المفارنة البديلة</target> - -<source>Alternate Synchronization Settings</source> -<target>خيارات المزامنة البديلة</target> - -<source>Local Filter</source> -<target>فلتر محلي</target> +<source>Local Synchronization Settings</source> +<target></target> <source>&New</source> <target>&جديد</target> @@ -718,8 +718,8 @@ The command is triggered if: <source>2. &Synchronize</source> <target>2. &مزامنة</target> -<source>&Global settings</source> -<target>&الإعدادات العامة</target> +<source>&Options</source> +<target></target> <source>&Language</source> <target>&اللغة</target> @@ -742,12 +742,12 @@ The command is triggered if: <source>&Check for new version</source> <target>&التحقق من وجود نسخة جديدة</target> -<source>Compare</source> -<target>قارن</target> - <source>Cancel</source> <target>إلغاء الأمر</target> +<source>Compare</source> +<target>قارن</target> + <source>Synchronize</source> <target>مزامنة</target> @@ -769,9 +769,21 @@ The command is triggered if: <source>Match case</source> <target>مطابقة حالة الأحرف (Match case)</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> + <source>View type:</source> <target>عرض النوع:</target> @@ -793,6 +805,9 @@ The command is triggered if: <source>Total bytes to copy</source> <target>إجمالي عدد الـ bytes التي سيتم نسخها</target> +<source>Use local settings:</source> +<target></target> + <source>Select a variant:</source> <target>اختيار بديل:</target> @@ -808,20 +823,35 @@ The command is triggered if: <source>More information</source> <target>المزيد من المعلومات</target> -<source>OK</source> -<target>موافق</target> +<source>Local settings:</source> +<target></target> -<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> -<target>تحديد التغيرات و مواكبتها على الجانبين. عمليات الحذف, النقل و المشاكل المكتشفة باستخدام قواعد البيانات</target> +<source>Include:</source> +<target>إدخال:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>إنشاء نسخة احتياطية من الجانب الأيمن عن طريق تعديل الطرف الأيسر ليطابق الأيمن.</target> +<source>Exclude:</source> +<target>استثناء:</target> -<source>Copy new and updated files to the right folder.</source> -<target>نسخ الملفات المحدثة إلى المجلد المناسب</target> +<source>Show examples</source> +<target>إظهار أمثلة</target> -<source>Configure your own synchronization rules.</source> -<target>تحديد قواعد المزامنة الخاصة بك.</target> +<source>Time span:</source> +<target>المجال الزمني:</target> + +<source>File size:</source> +<target>حجم الملف:</target> + +<source>Minimum:</source> +<target>الحد الأدنى:</target> + +<source>Maximum:</source> +<target>الحد الأقصى:</target> + +<source>&Reset</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> <source>Detect moved files</source> <target>اكتشاف الملفات المنقولة</target> @@ -837,6 +867,9 @@ The command is triggered if: - غير مدعوم من قبل جميع أنطمة الملفات (file systems) </target> +<source>Detect synchronization directions with the help of database files</source> +<target>تحديد اتجاه المزامنة بالاستعانة بقواعد بيانات الملفات</target> + <source>Delete files:</source> <target>حذف الملفات:</target> @@ -861,9 +894,6 @@ The command is triggered if: <source>Naming convention:</source> <target>اصطلاح التسمية:</target> -<source>Show examples</source> -<target>إظهار أمثلة</target> - <source>Handle errors:</source> <target>التعامل مع الأخطاء:</target> @@ -882,8 +912,8 @@ The command is triggered if: <source>On completion:</source> <target>عند الانتهاء:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>تحديد اتجاه المزامنة بالاستعانة بقواعد بيانات الملفات</target> +<source>OK</source> +<target>موافق</target> <source>Start synchronization now?</source> <target>بدأ المزامنة الآن؟</target> @@ -945,30 +975,6 @@ The command is triggered if: <source>&Recycle bin</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> - -<source>Include:</source> -<target>إدخال:</target> - -<source>Exclude:</source> -<target>استثناء:</target> - -<source>Time span:</source> -<target>المجال الزمني:</target> - -<source>File size:</source> -<target>حجم الملف:</target> - -<source>Minimum:</source> -<target>الحد الأدنى:</target> - -<source>Maximum:</source> -<target>الحد الأقصى:</target> - -<source>&Reset</source> -<target>إعادة&</target> - <source>The following settings are used for all synchronization jobs.</source> <target>هذه الإعدادات مستخدمة لجميع مهمات المزامنة</target> @@ -1053,12 +1059,15 @@ This guarantees a consistent state even in case of a serious error. <source>Delete Items</source> <target>حذف العناصر</target> -<source>Global Settings</source> -<target>الخيارات العامة</target> +<source>Options</source> +<target></target> <source>Select Time Span</source> <target>اختيار المطال الزمني</target> +<source>&Preferences...</source> +<target></target> + <source>Folder Pairs</source> <target>أزواج المجلدات</target> @@ -1077,12 +1086,6 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>الشريط الرئيسي</target> -<source>Open...</source> -<target>فتح...</target> - -<source>Save</source> -<target>حفظ</target> - <source>Compare both sides</source> <target>مقارنة بين كلا الجانبين</target> @@ -1225,8 +1228,11 @@ This guarantees a consistent state even in case of a serious error. <source>Delete selected configurations</source> <target>حذف الخيارات المنتقاة</target> -<source>Filter</source> -<target>عامل الفلترة</target> +<source>Synchronization Settings</source> +<target>إعدادات المزامنة</target> + +<source>Reset filter</source> +<target></target> <source>Show files that exist on left side only</source> <target>إظهار الملفات الموجودة في الجانب الأيمن فقط</target> @@ -1276,15 +1282,12 @@ This guarantees a consistent state even in case of a serious error. <source>Set as default</source> <target>تحديد كوضع افتراضي</target> +<source>Filter</source> +<target>عامل الفلترة</target> + <source>All files are in sync</source> <target>جميع الملفات في تزامن كامل</target> -<source>Synchronization Settings</source> -<target>إعدادات المزامنة</target> - -<source>Comparison Settings</source> -<target>إعدادات المقارنة</target> - <source>Cannot find %x</source> <target>لا يمكن العثور على %x</target> @@ -1345,30 +1348,6 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>السجل</target> -<source>Today</source> -<target>اليوم</target> - -<source>This week</source> -<target>هذا الأسبوع</target> - -<source>This month</source> -<target>هذا الشهر</target> - -<source>This year</source> -<target>هذه السنة</target> - -<source>Last x days</source> -<target>الأيام x الماضية</target> - -<source>Byte</source> -<target>Byte</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1398,14 +1377,8 @@ This guarantees a consistent state even in case of a serious error. <pluralform>هل تريد حقاً حذف الـ %x ملف التالية ؟</pluralform> </target> -<source>Exclude</source> -<target>استبعاد</target> - -<source>Direct</source> -<target>مباشر</target> - -<source>Follow</source> -<target>اتبع</target> +<source>Preferences</source> +<target></target> <source>Copy NTFS permissions</source> <target>نسخ أذونات NTFS</target> @@ -1428,8 +1401,50 @@ This guarantees a consistent state even in case of a serious error. <source>Restore all hidden windows and warnings?</source> <target>استعادة جميع نوافذ الحوار و التحذيرات المخفية؟</target> -<source>Leave as unresolved conflict</source> -<target>ترك كاختلافات من دون حل</target> +<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> +<target>تحديد التغيرات و مواكبتها على الجانبين. عمليات الحذف, النقل و المشاكل المكتشفة باستخدام قواعد البيانات</target> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>إنشاء نسخة احتياطية من الجانب الأيمن عن طريق تعديل الطرف الأيسر ليطابق الأيمن.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>نسخ الملفات المحدثة إلى المجلد المناسب</target> + +<source>Configure your own synchronization rules.</source> +<target>تحديد قواعد المزامنة الخاصة بك.</target> + +<source>Exclude</source> +<target>استبعاد</target> + +<source>Direct</source> +<target>مباشر</target> + +<source>Follow</source> +<target>اتبع</target> + +<source>Today</source> +<target>اليوم</target> + +<source>This week</source> +<target>هذا الأسبوع</target> + +<source>This month</source> +<target>هذا الشهر</target> + +<source>This year</source> +<target>هذه السنة</target> + +<source>Last x days</source> +<target>الأيام x الماضية</target> + +<source>Byte</source> +<target>Byte</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>استبدال</target> @@ -1443,6 +1458,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>إلحاق ختم زمني بكل اسم ملف</target> +<source>Comparison</source> +<target></target> + +<source>Synchronization</source> +<target></target> + +<source>Leave as unresolved conflict</source> +<target>ترك كاختلافات من دون حل</target> + <source>File</source> <target>ملف</target> diff --git a/FreeFileSync/Build/Languages/bulgarian.lng b/FreeFileSync/Build/Languages/bulgarian.lng index e4d3bdb7..d1eebb1c 100644 --- a/FreeFileSync/Build/Languages/bulgarian.lng +++ b/FreeFileSync/Build/Languages/bulgarian.lng @@ -44,7 +44,7 @@ <target>Символна връзка %x се изтрива</target> <source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Кошчето е недостъпно за следните папки. Вместо това файловете ще бъдат изтрити безвъзвратно:</target> +<target>Кошчето е недостъпно за следните папки. Вместо това файловете ще бъдат изтрити необратимо:</target> <source>An exception occurred</source> <target>Получи се изключение</target> @@ -65,7 +65,7 @@ <target>Зададен е нееднакъв брой директории отляво и отдясно.</target> <source>The config file must not contain settings at directory pair level when directories are set via command line.</source> -<target>Не може конфигурационния файл да има настройки на ниво двойки директории, ако директориите се задават от команден ред.</target> +<target>Конфигурационният файл не може да съдържа настройки на ниво двойка директории, ако директориите се задават от команден ред.</target> <source>Directories cannot be set for more than one configuration file.</source> <target>Не може да се задават директории за повече от един конфигурационен файл.</target> @@ -86,13 +86,13 @@ <target>директория</target> <source>Path to an alternate GlobalSettings.xml file.</source> -<target>Път към алтернативен файл GlobalSettings.xml.</target> +<target>Път до алтернативен файл GlobalSettings.xml.</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> -<target>Произволен брой FreeFileSync .ffs_gui и/или .ffs_batch конфигурационни файлове.</target> +<target>Всеки брой .ffs_gui и/или .ffs_batch конфигурационни файлове на FreeFileSync.</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> @@ -604,7 +604,7 @@ The command is triggered if: <target>Има нова версия на FreeFileSync:</target> <source>Download now?</source> -<target>Сваляне сега?</target> +<target>Свали сега?</target> <source>&Download</source> <target>Свал&яне</target> @@ -657,11 +657,11 @@ The command is triggered if: <source>Drag && drop</source> <target>Влачи && Пусни</target> -<source>Alternate comparison settings</source> -<target>Алтернативни настройки за сравняване</target> +<source>Local comparison settings</source> +<target>Локални настройки за сравняване</target> -<source>Alternate synchronization settings</source> -<target>Алтернативни настройки за синхронизация</target> +<source>Local synchronization settings</source> +<target>Локални настройки за синхронизация</target> <source>Local filter</source> <target>Локален филтър</target> @@ -672,11 +672,11 @@ The command is triggered if: <source>None</source> <target>Няма</target> -<source>Remove alternate settings</source> -<target>Премахни алтернативните настройки</target> +<source>Remove local settings</source> +<target>Премахни локалните настройки</target> -<source>Clear filter settings</source> -<target>Изчисти настройките на филтъра</target> +<source>Reset local filter</source> +<target>Инициализирай локалния филтър</target> <source>Copy</source> <target>Копирай</target> @@ -685,7 +685,7 @@ The command is triggered if: <target>Вмъкни</target> <source>Local Synchronization Settings</source> -<target>Локални настройки за синхронизация</target> +<target>Локални Настройки за Синхронизация</target> <source>&New</source> <target>&Нов</target> @@ -702,8 +702,8 @@ The command is triggered if: <source>2. &Synchronize</source> <target>2. &Синхронизирай</target> -<source>&Global settings</source> -<target>Гло&бални настройки</target> +<source>&Options</source> +<target>&Опции</target> <source>&Language</source> <target>&Език</target> @@ -751,7 +751,7 @@ The command is triggered if: <target>Намери:</target> <source>Match case</source> -<target>Спазвайки регистъра</target> +<target>Спазвай регистъра</target> <source>Open...</source> <target>Отвори...</target> @@ -790,16 +790,16 @@ The command is triggered if: <target>Общо байтове за копиране</target> <source>Use local settings:</source> -<target>Използвайте локални настройки</target> +<target>Ползвай локални настройки</target> <source>Select a variant:</source> <target>Избор на вариант:</target> <source>Identify equal files by comparing modification time and size.</source> -<target>Определяне на еднаквите файлове, сравнявайки времето на промяна и размера.</target> +<target>Определи еднаквите файлове, сравнявайки времето на промяна и размера.</target> <source>Identify equal files by comparing the file content.</source> -<target>Определяне на еднаквите файлове, сравнявайки файловото съдържание.</target> +<target>Определи еднаквите файлове, сравнявайки файловото съдържание.</target> <source>Symbolic links:</source> <target>Символни връзки:</target> @@ -811,10 +811,10 @@ The command is triggered if: <target>Локални настройки:</target> <source>Include:</source> -<target>Включване:</target> +<target>Включи:</target> <source>Exclude:</source> -<target>Изключване:</target> +<target>Изключи:</target> <source>Show examples</source> <target>Примери</target> @@ -832,10 +832,10 @@ The command is triggered if: <target>Максимум:</target> <source>&Reset</source> -<target>&Инициализиране на настройките</target> +<target>&Инициализирай настройките</target> <source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> -<target>Изберете филтриращи правила за изключване на дадени файлове от синхронизация. Въведете файлови пътища относно съответните им двойки папки.</target> +<target>Изберете филтърни правила за изключване на някои файлове от синхронизация. Въведете файлови пътища относно съответните им двойки папки.</target> <source>Detect moved files</source> <target>Откриване на преместени файлове</target> @@ -852,28 +852,28 @@ The command is triggered if: </target> <source>Detect synchronization directions with the help of database files</source> -<target>Откриване посоката на синхронизация чрез файлове на базата данни</target> +<target>Открий посоката на синхронизация чрез файловете на базата данни</target> <source>Delete files:</source> -<target>Изтриване на файлове:</target> +<target>Изтрий файлове:</target> <source>Permanent</source> -<target>Безвъзвратно</target> +<target>Необратимо</target> <source>Delete or overwrite files permanently</source> -<target>Безвъзвратно изтриване или презапис на файлове</target> +<target>Изтрий или презапиши файловете необратимо</target> <source>Recycle bin</source> <target>Кошче</target> <source>Back up deleted and overwritten files in the recycle bin</source> -<target>Резервиране на изтрити или презаписани файлове в кошчето</target> +<target>Резервирай изтритите или презаписани файлове в кошчето</target> <source>Versioning</source> <target>Версифициране</target> <source>Move files to a user-defined folder</source> -<target>Преместване на файловете в зададена потребителска папка</target> +<target>Премести файловете в зададена потребителска папка</target> <source>Naming convention:</source> <target>Конвенция за преименуване:</target> @@ -900,7 +900,7 @@ The command is triggered if: <target>ОК</target> <source>Start synchronization now?</source> -<target>Започни синхронизация сега?</target> +<target>Почни синхронизация сега?</target> <source>Variant:</source> <target>Вариант:</target> @@ -936,16 +936,16 @@ The command is triggered if: <target>Стоп</target> <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> -<target>Създаване на пакетен файл за автоматична синхронизация. За старт щракнете двукратно върху този файл или задайте планова задача: %x</target> +<target>Създай пакетен файл за автоматична синхронизация. За старт щракнете двукратно върху този файл или задайте планова задача: %x</target> <source>Stop synchronization at first error</source> <target>Спри синхронизацията при първа грешка</target> <source>Run minimized</source> -<target>Изпълнение в минимизиран вид</target> +<target>Изпълнявай в минимизиран вид</target> <source>Save log:</source> -<target>Запазване на протокол:</target> +<target>Запази протокол:</target> <source>Limit:</source> <target>Ограничи:</target> @@ -970,7 +970,7 @@ Copy to a temporary file (*.ffs_tmp) before overwriting target. This guarantees a consistent state even in case of a serious error. </source> <target> -Копиране във временен файл (*.ffs_tmp) преди презапис на целевия файл. +Копирай във временен файл (*.ffs_tmp) преди презапис на целевия файл. Това гарантира цялостност на файла дори в случай на сериозна грешка. </target> @@ -978,19 +978,19 @@ This guarantees a consistent state even in case of a serious error. <target>(препоръчително)</target> <source>Copy locked files</source> -<target>Копиране на заключени файлове</target> +<target>Копирай заключени файлове</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> -<target>Копиране на споделени или заключени файлове с услугата Volume Shadow Copy</target> +<target>Копирай споделени или заключени файлове с услугата Volume Shadow Copy</target> <source>(requires administrator rights)</source> <target>(изисква администраторски права)</target> <source>Copy file access permissions</source> -<target>Копиране правата за достъп на файла</target> +<target>Копирай правата за достъп на файла</target> <source>Transfer file and folder permissions.</source> -<target>Пренос на правата за достъп на файла и папката.</target> +<target>Прехвърли правата за достъп на файла и папката.</target> <source>Automatic retry on error:</source> <target>Автоматично повтаряне при грешка:</target> @@ -1002,7 +1002,7 @@ This guarantees a consistent state even in case of a serious error. <target>Забавяне (сек.):</target> <source>Customize context menu:</source> -<target>Настройка на контекстното меню:</target> +<target>Настрой контекстното меню:</target> <source>Description</source> <target>Описание</target> @@ -1020,7 +1020,7 @@ This guarantees a consistent state even in case of a serious error. <target>Ако харесвате FreeFileSync</target> <source>Donate with PayPal</source> -<target>Дарете чрез PayPal</target> +<target>Дарение чрез PayPal</target> <source>Feedback and suggestions are welcome</source> <target>Забележки и предложения са добре дошли</target> @@ -1038,16 +1038,19 @@ This guarantees a consistent state even in case of a serious error. <target>Много благодарности за локализацията:</target> <source>Save as Batch Job</source> -<target>Запазване като пакетна задача</target> +<target>Запази като пакетна задача</target> <source>Delete Items</source> -<target>Изтриване на елементи</target> +<target>Изтрий елементите</target> -<source>Global Settings</source> -<target>Глобални настройки</target> +<source>Options</source> +<target>Опции</target> <source>Select Time Span</source> -<target>Избор на интервал време</target> +<target>Избери интервала време</target> + +<source>&Preferences...</source> +<target>&Предпочитания...</target> <source>Folder Pairs</source> <target>Двойки папки</target> @@ -1087,8 +1090,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>Трябва ли да бъде ли изпълнена командата %y за един елемент?</pluralform> -<pluralform>Трябва ли да бъде ли изпълнена командата %y за %x елемента?</pluralform> +<pluralform>Трябва ли да бъде изпълнена командата %y за един елемент?</pluralform> +<pluralform>Трябва ли да бъде изпълнена командата %y за %x елемента?</pluralform> </target> <source>&Execute</source> @@ -1122,10 +1125,10 @@ This guarantees a consistent state even in case of a serious error. </target> <source>Set direction:</source> -<target>Задаване на посока:</target> +<target>Задай посока:</target> <source>multiple selection</source> -<target>групов избор</target> +<target>групово маркиране</target> <source>Include via filter:</source> <target>Включи чрез филтъра:</target> @@ -1161,7 +1164,7 @@ This guarantees a consistent state even in case of a serious error. <target>Големи</target> <source>Select time span...</source> -<target>Избор на интервал време...</target> +<target>Избори интервала време...</target> <source>Default view</source> <target>Изглед по подразбиране</target> @@ -1196,6 +1199,9 @@ 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>Show files that exist on left side only</source> <target>Покажи файловете, съществуващи само отляво</target> @@ -1269,7 +1275,7 @@ This guarantees a consistent state even in case of a serious error. <target>Режим на очакване</target> <source>Log off</source> -<target>Изход от сесията</target> +<target>Излез от сесията</target> <source>Shut down</source> <target>Изключи компютъра</target> @@ -1331,47 +1337,50 @@ This guarantees a consistent state even in case of a serious error. <pluralform>Трябва ли следните %x елемента да бъдат изтрити?</pluralform> </target> +<source>Preferences</source> +<target>Предпочитания</target> + <source>Copy NTFS permissions</source> -<target>Копиране NTFS-права за достъп</target> +<target>Копирай NTFS-правата за достъп</target> <source>Integrate external applications into context menu. The following macros are available:</source> -<target>Интегрира външни приложения в контекстното меню. Налични са следните макроси:</target> +<target>Интегрирай външни приложения в контекстното меню. Налични са следните макроси:</target> <source>- full file or folder name</source> -<target>- пълно име на файла или на папката</target> +<target>- пълно име на файла или папката</target> <source>- folder part only</source> <target>- само частта на папката</target> <source>- Other side's counterpart to %item_path%</source> -<target>- съответствието на %item_path% от другата страна</target> +<target>- съответствие от другата страна на %item_path%</target> <source>- Other side's counterpart to %item_folder%</source> -<target>- съответствието на %item_folder% от другата страна</target> +<target>- съответствие от другата страна на %item_folder%</target> <source>Restore all hidden windows and warnings?</source> <target>Да се възстановят ли всички скрити прозорци и предупреждения?</target> <source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> -<target>Определя и разпространява промените върху двете страни. Изтривания, премествания и конфликти се откриват автоматично чрез база данни.</target> +<target>Определи и разпространи промените върху двете страни. Изтривания, премествания и конфликти се откриват автоматично чрез база данни.</target> <source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Създава огледално копие на лявата папка, привеждайки дясната папка в пълно съответствие.</target> +<target>Създай огледално копие на лявата папка, привеждайки дясната папка в съответствие.</target> <source>Copy new and updated files to the right folder.</source> -<target>Копира новите или актуализирани файлове към дясната папка.</target> +<target>Копирай новите и актуализирани файлове към дясната папка.</target> <source>Configure your own synchronization rules.</source> -<target>Дефинира собствени правила за синхронизация.</target> +<target>Дефиниране на свои правила за синхронизация.</target> <source>Exclude</source> -<target>Изключване</target> +<target>Изключи</target> <source>Direct</source> <target>Директно</target> <source>Follow</source> -<target>Следване</target> +<target>Следвай</target> <source>Today</source> <target>Днес</target> @@ -1416,7 +1425,7 @@ This guarantees a consistent state even in case of a serious error. <target>Синхронизиране</target> <source>Leave as unresolved conflict</source> -<target>Остава като нерешен конфликт</target> +<target>Остави като нерешен конфликт</target> <source>File</source> <target>Файл</target> diff --git a/FreeFileSync/Build/Languages/chinese_simple.lng b/FreeFileSync/Build/Languages/chinese_simple.lng index 00305a41..44022f27 100644 --- a/FreeFileSync/Build/Languages/chinese_simple.lng +++ b/FreeFileSync/Build/Languages/chinese_simple.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>语法:</target> -<source>config files</source> -<target>配置文件</target> +<source>global config file:</source> +<target>全局配置文件:</target> + +<source>config files:</source> +<target>配置文件:</target> <source>directory</source> <target>目录</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>指向一个替代的GlobalSettings.xml文件的路径.</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>任意数量的 FreeFileSync .ffs_gui 和/或 .ffs_batch 配置文件.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>任意数量的替代目录中至多有一个配置文件.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>任意数量的替代目录对的最多一个配置文件.</target> <source>Cannot find the following folders:</source> <target>无法找到如下文件夹:</target> @@ -647,11 +653,11 @@ The command is triggered if: <source>Drag && drop</source> <target>拖放</target> -<source>Alternate comparison settings</source> -<target>备用比较设置</target> +<source>Local comparison settings</source> +<target>本地比较设置</target> -<source>Alternate synchronization settings</source> -<target>备用同步设置</target> +<source>Local synchronization settings</source> +<target>本地同步设置</target> <source>Local filter</source> <target>本地过滤器</target> @@ -662,11 +668,11 @@ The command is triggered if: <source>None</source> <target>无</target> -<source>Remove alternate settings</source> -<target>移除替换设置</target> +<source>Remove local settings</source> +<target>移除本地设置</target> -<source>Clear filter settings</source> -<target>清除过滤器设置</target> +<source>Reset local filter</source> +<target>重置本地过滤器</target> <source>Copy</source> <target>复制</target> @@ -674,14 +680,8 @@ The command is triggered if: <source>Paste</source> <target>粘贴</target> -<source>Alternate Comparison Settings</source> -<target>备用比较设置</target> - -<source>Alternate Synchronization Settings</source> -<target>备用同步设置</target> - -<source>Local Filter</source> -<target>本地过滤器</target> +<source>Local Synchronization Settings</source> +<target>本地同步设置</target> <source>&New</source> <target>新建(&N)</target> @@ -698,8 +698,8 @@ The command is triggered if: <source>2. &Synchronize</source> <target>2. 同步(&S)</target> -<source>&Global settings</source> -<target>全局设置(&G)</target> +<source>&Options</source> +<target>选项(&O)</target> <source>&Language</source> <target>切换语言(&L)</target> @@ -722,12 +722,12 @@ The command is triggered if: <source>&Check for new version</source> <target>检查新版本(&C)</target> -<source>Compare</source> -<target>比较</target> - <source>Cancel</source> <target>取消</target> +<source>Compare</source> +<target>比较</target> + <source>Synchronize</source> <target>同步</target> @@ -749,9 +749,21 @@ The command is triggered if: <source>Match case</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> @@ -773,6 +785,9 @@ The command is triggered if: <source>Total bytes to copy</source> <target>要复制的总字节数</target> +<source>Use local settings:</source> +<target>使用本地设置:</target> + <source>Select a variant:</source> <target>选择一个变化:</target> @@ -788,20 +803,35 @@ The command is triggered if: <source>More information</source> <target>更多信息</target> -<source>OK</source> -<target>确定</target> +<source>Local settings:</source> +<target>本地设置:</target> -<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> -<target>识别和传播两侧的变化. 删除, 移动和冲突会使用一个数据库来自动检测.</target> +<source>Include:</source> +<target>包括:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>以适配右侧文件夹来匹配从而创建左侧文件夹的镜像备份.</target> +<source>Exclude:</source> +<target>排除:</target> -<source>Copy new and updated files to the right folder.</source> -<target>复制新的和已更新的文件到右侧文件夹.</target> +<source>Show examples</source> +<target>显示范例</target> -<source>Configure your own synchronization rules.</source> -<target>配置你自己的同步规则.</target> +<source>Time span:</source> +<target>时间跨度:</target> + +<source>File size:</source> +<target>文件大小:</target> + +<source>Minimum:</source> +<target>最小:</target> + +<source>Maximum:</source> +<target>最大:</target> + +<source>&Reset</source> +<target>重置(&R)</target> + +<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> +<target>选择过滤器规则以将某些文件从同步中排除. 输入与相关的文件夹对相对的与文件路径.</target> <source>Detect moved files</source> <target>检测被移动的文件</target> @@ -817,6 +847,9 @@ The command is triggered if: - 不是所有文件系统都支持 </target> +<source>Detect synchronization directions with the help of database files</source> +<target>借助数据库文件来检测同步的方向</target> + <source>Delete files:</source> <target>删除文件:</target> @@ -841,9 +874,6 @@ The command is triggered if: <source>Naming convention:</source> <target>命名规则:</target> -<source>Show examples</source> -<target>显示范例</target> - <source>Handle errors:</source> <target>处理错误:</target> @@ -862,8 +892,8 @@ The command is triggered if: <source>On completion:</source> <target>在完成时:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>借助数据库文件来检测同步的方向</target> +<source>OK</source> +<target>确定</target> <source>Start synchronization now?</source> <target>现在开始同步吗?</target> @@ -925,30 +955,6 @@ The command is triggered if: <source>&Recycle bin</source> <target>回收站(&R)</target> -<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> -<target>选择过滤器规则以将某些文件从同步中排除. 输入与相关的文件夹对相对的与文件路径.</target> - -<source>Include:</source> -<target>包括:</target> - -<source>Exclude:</source> -<target>排除:</target> - -<source>Time span:</source> -<target>时间跨度:</target> - -<source>File size:</source> -<target>文件大小:</target> - -<source>Minimum:</source> -<target>最小:</target> - -<source>Maximum:</source> -<target>最大:</target> - -<source>&Reset</source> -<target>重置(&R)</target> - <source>The following settings are used for all synchronization jobs.</source> <target>如下的设置使用于所有同步作业.</target> @@ -1030,12 +1036,15 @@ This guarantees a consistent state even in case of a serious error. <source>Delete Items</source> <target>删除项目</target> -<source>Global Settings</source> -<target>全局设置</target> +<source>Options</source> +<target>选项</target> <source>Select Time Span</source> <target>选择时间跨度</target> +<source>&Preferences...</source> +<target>首选项(&P)</target> + <source>Folder Pairs</source> <target>文件夹对</target> @@ -1054,12 +1063,6 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>主工具栏</target> -<source>Open...</source> -<target>打开...</target> - -<source>Save</source> -<target>保存</target> - <source>Compare both sides</source> <target>比较两侧</target> @@ -1182,8 +1185,11 @@ This guarantees a consistent state even in case of a serious error. <source>Delete selected configurations</source> <target>删除已选定的配置文件</target> -<source>Filter</source> -<target>过滤器</target> +<source>Synchronization Settings</source> +<target>同步设置</target> + +<source>Reset filter</source> +<target>重置过滤器</target> <source>Show files that exist on left side only</source> <target>显示仅存在左侧的文件</target> @@ -1233,15 +1239,12 @@ This guarantees a consistent state even in case of a serious error. <source>Set as default</source> <target>设置为默认值</target> +<source>Filter</source> +<target>过滤器</target> + <source>All files are in sync</source> <target>所有文件均是同步的</target> -<source>Synchronization Settings</source> -<target>同步设置</target> - -<source>Comparison Settings</source> -<target>比较设置</target> - <source>Cannot find %x</source> <target>找不到 %x</target> @@ -1302,30 +1305,6 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>日志</target> -<source>Today</source> -<target>今天</target> - -<source>This week</source> -<target>本周</target> - -<source>This month</source> -<target>本月</target> - -<source>This year</source> -<target>今年</target> - -<source>Last x days</source> -<target>最后 x 天</target> - -<source>Byte</source> -<target>字节</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1345,14 +1324,8 @@ This guarantees a consistent state even in case of a serious error. <pluralform>是否真的要删除如下 %x 个项目?</pluralform> </target> -<source>Exclude</source> -<target>排除</target> - -<source>Direct</source> -<target>直接</target> - -<source>Follow</source> -<target>跟随</target> +<source>Preferences</source> +<target>首选项</target> <source>Copy NTFS permissions</source> <target>复制NTFS权限</target> @@ -1375,8 +1348,50 @@ This guarantees a consistent state even in case of a serious error. <source>Restore all hidden windows and warnings?</source> <target>要恢复所有隐藏的窗口和警告吗?</target> -<source>Leave as unresolved conflict</source> -<target>遗留为未解决的冲突</target> +<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> +<target>识别和传播两侧的变化. 删除, 移动和冲突会使用一个数据库来自动检测.</target> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>以适配右侧文件夹来匹配从而创建左侧文件夹的镜像备份.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>复制新的和已更新的文件到右侧文件夹.</target> + +<source>Configure your own synchronization rules.</source> +<target>配置你自己的同步规则.</target> + +<source>Exclude</source> +<target>排除</target> + +<source>Direct</source> +<target>直接</target> + +<source>Follow</source> +<target>跟随</target> + +<source>Today</source> +<target>今天</target> + +<source>This week</source> +<target>本周</target> + +<source>This month</source> +<target>本月</target> + +<source>This year</source> +<target>今年</target> + +<source>Last x days</source> +<target>最后 x 天</target> + +<source>Byte</source> +<target>字节</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>替换</target> @@ -1390,6 +1405,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>添加一个时间戳到每个文件名</target> +<source>Comparison</source> +<target>比较</target> + +<source>Synchronization</source> +<target>同步</target> + +<source>Leave as unresolved conflict</source> +<target>遗留为未解决的冲突</target> + <source>File</source> <target>文件</target> diff --git a/FreeFileSync/Build/Languages/chinese_traditional.lng b/FreeFileSync/Build/Languages/chinese_traditional.lng index ae702dbe..4fe0045c 100644 --- a/FreeFileSync/Build/Languages/chinese_traditional.lng +++ b/FreeFileSync/Build/Languages/chinese_traditional.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>語法：</target> -<source>config files</source> +<source>global config file:</source> +<target>整體配置檔案</target> + +<source>config files:</source> <target>配置檔案</target> <source>directory</source> <target>目錄</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>備用的GlobalSettings.xml檔案路徑。</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>FreeFileSync .ffs_gui和/或.ffs_batch配置檔案的任意數量。</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>備用目錄的任意數量中最多有一個配置文件。</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>任意數量的替代配對目錄為最多一個配置檔案。</target> <source>Cannot find the following folders:</source> <target>找不到下列資料夾：</target> @@ -647,11 +653,11 @@ The command is triggered if: <source>Drag && drop</source> <target>拖放</target> -<source>Alternate comparison settings</source> -<target>備用比對設定</target> +<source>Local comparison settings</source> +<target>本機比對設定</target> -<source>Alternate synchronization settings</source> -<target>備用同步設定</target> +<source>Local synchronization settings</source> +<target>本機同步設定</target> <source>Local filter</source> <target>本機篩選器</target> @@ -662,11 +668,11 @@ The command is triggered if: <source>None</source> <target>無</target> -<source>Remove alternate settings</source> -<target>移除備用設定</target> +<source>Remove local settings</source> +<target>移除本機設定</target> -<source>Clear filter settings</source> -<target>清除篩選器設定</target> +<source>Reset local filter</source> +<target>重置本機篩選器</target> <source>Copy</source> <target>複製</target> @@ -674,14 +680,8 @@ The command is triggered if: <source>Paste</source> <target>貼上</target> -<source>Alternate Comparison Settings</source> -<target>備用比對設定</target> - -<source>Alternate Synchronization Settings</source> -<target>備用同步設定</target> - -<source>Local Filter</source> -<target>本機篩選器</target> +<source>Local Synchronization Settings</source> +<target>本機同步設定</target> <source>&New</source> <target>新增(&N)</target> @@ -698,8 +698,8 @@ The command is triggered if: <source>2. &Synchronize</source> <target>2. 同步(&S)</target> -<source>&Global settings</source> -<target>整體設定(&G)</target> +<source>&Options</source> +<target>選項(&O)</target> <source>&Language</source> <target>語言(&L)</target> @@ -722,12 +722,12 @@ The command is triggered if: <source>&Check for new version</source> <target>檢查新版本(&C)</target> -<source>Compare</source> -<target>比對</target> - <source>Cancel</source> <target>取消</target> +<source>Compare</source> +<target>比對</target> + <source>Synchronize</source> <target>同步</target> @@ -749,9 +749,21 @@ The command is triggered if: <source>Match case</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> @@ -773,6 +785,9 @@ The command is triggered if: <source>Total bytes to copy</source> <target>要複製的位元組總數</target> +<source>Use local settings:</source> +<target>使用本機設定：</target> + <source>Select a variant:</source> <target>選擇一個變數：</target> @@ -788,20 +803,35 @@ The command is triggered if: <source>More information</source> <target>詳細資訊</target> -<source>OK</source> -<target>確定</target> +<source>Local settings:</source> +<target>本機設定：</target> -<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> -<target>識別和傳播兩邊的變更。自動檢測刪除、移動和衝突使用的資料庫。</target> +<source>Include:</source> +<target>包括：</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>新建一個鏡像備份的左邊資料夾來調整匹配右邊資料夾。</target> +<source>Exclude:</source> +<target>排除：</target> -<source>Copy new and updated files to the right folder.</source> -<target>將新的和已更新的檔案複製到右邊資料夾。</target> +<source>Show examples</source> +<target>顯示範例</target> -<source>Configure your own synchronization rules.</source> -<target>配置你自己的同步規則。</target> +<source>Time span:</source> +<target>時間間隔：</target> + +<source>File size:</source> +<target>檔案大小：</target> + +<source>Minimum:</source> +<target>最小：</target> + +<source>Maximum:</source> +<target>最大：</target> + +<source>&Reset</source> +<target>重置(&R)</target> + +<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> +<target>選擇從同步中排除某些檔案的篩選器規則。輸入相對於其對應的配對資料夾路徑。</target> <source>Detect moved files</source> <target>檢測被移動的檔案</target> @@ -817,6 +847,9 @@ The command is triggered if: - 不支援所有檔案系統 </target> +<source>Detect synchronization directions with the help of database files</source> +<target>檢測同步方向和資料庫檔案的說明</target> + <source>Delete files:</source> <target>刪除檔案：</target> @@ -841,9 +874,6 @@ The command is triggered if: <source>Naming convention:</source> <target>命名慣例：</target> -<source>Show examples</source> -<target>顯示範例</target> - <source>Handle errors:</source> <target>錯誤處理：</target> @@ -862,8 +892,8 @@ The command is triggered if: <source>On completion:</source> <target>完成後：</target> -<source>Detect synchronization directions with the help of database files</source> -<target>檢測同步方向和資料庫檔案的說明</target> +<source>OK</source> +<target>確定</target> <source>Start synchronization now?</source> <target>現在開始同步？</target> @@ -925,30 +955,6 @@ The command is triggered if: <source>&Recycle bin</source> <target>資源回收筒(&R)</target> -<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> -<target>選擇從同步中排除某些檔案的篩選器規則。輸入相對於其對應的配對資料夾路徑。</target> - -<source>Include:</source> -<target>包括：</target> - -<source>Exclude:</source> -<target>排除：</target> - -<source>Time span:</source> -<target>時間間隔：</target> - -<source>File size:</source> -<target>檔案大小：</target> - -<source>Minimum:</source> -<target>最小：</target> - -<source>Maximum:</source> -<target>最大：</target> - -<source>&Reset</source> -<target>重置(&R)</target> - <source>The following settings are used for all synchronization jobs.</source> <target>以下設定用於所有同步作業。</target> @@ -1033,12 +1039,15 @@ This guarantees a consistent state even in case of a serious error. <source>Delete Items</source> <target>刪除項目</target> -<source>Global Settings</source> -<target>整體設定</target> +<source>Options</source> +<target>選項</target> <source>Select Time Span</source> <target>選擇時間間隔</target> +<source>&Preferences...</source> +<target>偏好設定(&P)</target> + <source>Folder Pairs</source> <target>配對資料夾</target> @@ -1057,12 +1066,6 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>主欄位</target> -<source>Open...</source> -<target>開啟...</target> - -<source>Save</source> -<target>儲存</target> - <source>Compare both sides</source> <target>比對兩邊</target> @@ -1185,8 +1188,11 @@ This guarantees a consistent state even in case of a serious error. <source>Delete selected configurations</source> <target>刪除選定的配置</target> -<source>Filter</source> -<target>篩選器</target> +<source>Synchronization Settings</source> +<target>同步設定</target> + +<source>Reset filter</source> +<target>重置篩選器</target> <source>Show files that exist on left side only</source> <target>顯示只存在於左邊的檔案</target> @@ -1236,15 +1242,12 @@ This guarantees a consistent state even in case of a serious error. <source>Set as default</source> <target>設為預設值</target> +<source>Filter</source> +<target>篩選器</target> + <source>All files are in sync</source> <target>所有檔案都在同步</target> -<source>Synchronization Settings</source> -<target>同步設定</target> - -<source>Comparison Settings</source> -<target>比對設定</target> - <source>Cannot find %x</source> <target>找不到 %x</target> @@ -1305,30 +1308,6 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>日誌</target> -<source>Today</source> -<target>今日</target> - -<source>This week</source> -<target>本週</target> - -<source>This month</source> -<target>本月</target> - -<source>This year</source> -<target>今年</target> - -<source>Last x days</source> -<target>最後 x 天</target> - -<source>Byte</source> -<target>位元組</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1348,14 +1327,8 @@ This guarantees a consistent state even in case of a serious error. <pluralform>您真的要將下列 %x 項目刪除嗎？</pluralform> </target> -<source>Exclude</source> -<target>排除</target> - -<source>Direct</source> -<target>直接</target> - -<source>Follow</source> -<target>遵從</target> +<source>Preferences</source> +<target>偏好設定</target> <source>Copy NTFS permissions</source> <target>複製NTFS權限</target> @@ -1378,8 +1351,50 @@ This guarantees a consistent state even in case of a serious error. <source>Restore all hidden windows and warnings?</source> <target>還原所有隱藏的視窗和警告？</target> -<source>Leave as unresolved conflict</source> -<target>保留給未解決的衝突</target> +<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> +<target>識別和傳播兩邊的變更。自動檢測刪除、移動和衝突使用的資料庫。</target> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>新建一個鏡像備份的左邊資料夾來調整匹配右邊資料夾。</target> + +<source>Copy new and updated files to the right folder.</source> +<target>將新的和已更新的檔案複製到右邊資料夾。</target> + +<source>Configure your own synchronization rules.</source> +<target>配置你自己的同步規則。</target> + +<source>Exclude</source> +<target>排除</target> + +<source>Direct</source> +<target>直接</target> + +<source>Follow</source> +<target>遵從</target> + +<source>Today</source> +<target>今日</target> + +<source>This week</source> +<target>本週</target> + +<source>This month</source> +<target>本月</target> + +<source>This year</source> +<target>今年</target> + +<source>Last x days</source> +<target>最後 x 天</target> + +<source>Byte</source> +<target>位元組</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>取代</target> @@ -1393,6 +1408,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>將時間戳記附加到每個檔案名稱上</target> +<source>Comparison</source> +<target>比對</target> + +<source>Synchronization</source> +<target>同步</target> + +<source>Leave as unresolved conflict</source> +<target>保留給未解決的衝突</target> + <source>File</source> <target>檔案</target> diff --git a/FreeFileSync/Build/Languages/croatian.lng b/FreeFileSync/Build/Languages/croatian.lng index 725c8f46..3af4d0bf 100644 --- a/FreeFileSync/Build/Languages/croatian.lng +++ b/FreeFileSync/Build/Languages/croatian.lng @@ -8,7 +8,7 @@ </header> <source>Both sides have changed since last synchronization.</source> -<target>Obje su strane promjenjene od posljednje sinkronizacije.</target> +<target>Obje strane su promjenjene nakon zadnje sinkronizacije.</target> <source>Cannot determine sync-direction:</source> <target>Ne mogu odrediti smjer sinkronizacije.</target> @@ -17,22 +17,22 @@ <target>Nema promjena od zadnje sinkronizacije.</target> <source>The database entry is not in sync considering current settings.</source> -<target>Unos podataka nije u sinkronizaciji uzevši u obzir trenutne postavke.</target> +<target>Unos baze podataka nije u sinkronizaciji s obzirom na trenutne postavke.</target> <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source> <target>Postavljam zadani sinkronizacijski smjer: Stare datoteke će biti prepisane novim datotekama.</target> <source>Checking recycle bin availability for folder %x...</source> -<target>Provjeravam dosupnost koša za smeće za mapu %x...</target> +<target>Provjeravanje dosupnosti kante za smeće za mapu %x...</target> <source>Moving file %x to the recycle bin</source> -<target>Premještam datoteku %x u koš</target> +<target>Premještnje datoteke %x u koš za smeće</target> <source>Moving folder %x to the recycle bin</source> -<target>Premještam datoteku %x u koš</target> +<target>Premještnje mape %x u koš za smeće</target> <source>Moving symbolic link %x to the recycle bin</source> -<target>Premještam simobličnu poveznicu %x u koš</target> +<target>Premještnje simobličnog linka %x u koš za smeće</target> <source>Deleting file %x</source> <target>Brisanje datoteke %x</target> @@ -41,10 +41,10 @@ <target>Brisanje mape %x</target> <source>Deleting symbolic link %x</source> -<target>Brisanje simboličnih poveznica %x</target> +<target>Brisanje simboličnog linka %x</target> <source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target>Koš nije dosuutpan za sljedeće mape. Zbog toga će datoteke biti trajno obrisane:</target> +<target>Koš za smeće nije dostupna za sljedeće mape. Zbog toga će datoteke biti trajno obrisane:</target> <source>An exception occurred</source> <target>Dogodilo se izuzeće</target> @@ -59,16 +59,16 @@ <target>Ne mogu otvoriti datoteku %x.</target> <source>File %x does not contain a valid configuration.</source> -<target>Datoteka %x ne sadrži valjanu konfiguraciju</target> +<target>Datoteka %x ne sadrži valjane postavke</target> <source>Unequal number of left and right directories specified.</source> -<target>Neravnomjeran broj lijevih i desnih direkotrija specificiran.</target> +<target>Naveden je nejednak broj lijevih i desnih direktorija.</target> <source>The config file must not contain settings at directory pair level when directories are set via command line.</source> -<target>Config datoteka ne smije sadržavati postavke na direktorij par razini ukoliko su direktoriji upisani preko naredbene linije.</target> +<target>Konfiguracijska datoteka ne smije sadržavati postavke na razini para direktorija kada su direktoriji postavljeni putem naredbene linije.</target> <source>Directories cannot be set for more than one configuration file.</source> -<target>Direkotrij nemože biti postavljen za više od jedne konfigracijske datoteke.</target> +<target>Direktoriji ne mogu biti postavljeni za više od jedne konfigracijske datoteke.</target> <source>Command line</source> <target>Naredbena linija</target> @@ -76,41 +76,47 @@ <source>Syntax:</source> <target>Sintaksa:</target> -<source>config files</source> -<target>config datoteke</target> +<source>global config file:</source> +<target>globalna config datoteka:</target> + +<source>config files:</source> +<target>config datoteke:</target> <source>directory</source> <target>direktorij</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Putanja do alternativne GlobalSettings.xml datoteke.</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Bilo koji broj FreeFileSync . ffs_gui i/ili .ffs_batch konfiguracijskih datoteka.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Bilo koji broj alternativnih mapa za najviše jedanu config datoteku.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Bilo koji broj alternativnih parova mapa za najmanje jednu config datoteku.</target> <source>Cannot find the following folders:</source> <target>Ne mogu pronaći slijedeće mape:</target> <source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source> -<target>Možete ignorirati ovu pogrešku te uzeti u obzir svaku mapu praznom. Mape se tada stvaraju automatski tokom sinkronizacije.</target> +<target>Možete ignorirati ovu pogrešku i smatrati da je svaka mapa kao prazna. Mape se tada stvaraju automatski tokom sinkronizacije.</target> <source>A folder input field is empty.</source> -<target>Polje za odabir foldera je prazno.</target> +<target>Polje za odabir mape je prazno.</target> <source>The corresponding folder will be considered as empty.</source> -<target>Odgovarajuća mapa će se smatrati prazna.</target> +<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>File %x has an invalid date.</source> -<target>Datoteka %x ima nevaljan datum.</target> +<target>Datoteka %x ima nevažeći datum.</target> <source>Date:</source> <target>Datum:</target> <source>Files %x have the same date but a different size.</source> -<target>Datoteke %x imaju isti datum ali drugačiju veličinu.</target> +<target>Datoteke %x imaju isti datum ali različitu veličinu.</target> <source>Size:</source> <target>Veličina:</target> @@ -125,16 +131,16 @@ <target>Rješavam simboličku vezu %x</target> <source>Comparing content of files %x</source> -<target>Uspoređujem sadržaj datoteka %x</target> +<target>Uspoređivanje sadržaja datoteka %x</target> <source>Generating file list...</source> -<target>Generiram listu datoteka...</target> +<target>Generiranje popisa datoteka...</target> <source>Starting comparison</source> -<target>Počinjem usporedbu</target> +<target>Pokretanje usporedbe</target> <source>Calculating sync directions...</source> -<target>Izračunavam smjerove sinkronizacije...</target> +<target>Izračunavanje smjerova sinkronizacije...</target> <source>Out of memory.</source> <target>Nedostatak memorije.</target> @@ -158,7 +164,7 @@ <target>Obje strane su jednake</target> <source>Conflict/item cannot be categorized</source> -<target>Sukob/stavka ne može biti razvrstana</target> +<target>Konflikt/stavka ne može biti razvrstana</target> <source>Copy new item to left</source> <target>Kopiraj novu stavku lijevo</target> @@ -167,10 +173,10 @@ <target>Kopiraj novu stavku desno</target> <source>Delete left item</source> -<target>Izbriši lijevu stavku</target> +<target>Obriši lijevu stavku</target> <source>Delete right item</source> -<target>Izbriši desnu stavku</target> +<target>Obriši desnu stavku</target> <source>Move file on left</source> <target>Premjesti datoteku lijevo</target> @@ -194,7 +200,7 @@ <target>Osvježi atribute desno</target> <source>Database file %x is incompatible.</source> -<target>Datoteka baze %x je nekompatibilna</target> +<target>Datoteka baze %x je nekompatibilna.</target> <source>Initial synchronization:</source> <target>Početna sinkronizacija:</target> @@ -212,7 +218,7 @@ <target>Ne mogu čitati datoteku %x.</target> <source>Database files do not share a common session.</source> -<target>Datoteke baze ne dijele zajednički protokol.</target> +<target>Datoteke baze podataka ne dijele zajedničku sesiju.</target> <source>Searching for folder %x...</source> <target>Tražim mapu %x...</target> @@ -246,7 +252,7 @@ <target>Izrađujem datoteku %x</target> <source>Items processed:</source> -<target>Obrađeni elementi:</target> +<target>Obrađene stavke:</target> <source>Items remaining:</source> <target>Preostale stavke:</target> @@ -277,7 +283,7 @@ <target>Greška u analizi datoteke %x, red %y, stupac %z.</target> <source>Cannot set directory lock for %x.</source> -<target>Ne mogu zaključiti mapu %x.</target> +<target>Ne mogu zaključiti mapu za %x.</target> <source>Scanning:</source> <target>Pretražujem:</target> @@ -293,7 +299,7 @@ </target> <source>Encoding extended time information: %x</source> -<target>:Spremam informacije o vremenu %x</target> +<target>Pretvaram informacije o vremenu %x</target> <source>/sec</source> <target>/sek</target> @@ -320,16 +326,16 @@ <target>Ne mogu učitati datoteku %x.</target> <source>Cannot determine volume name for %x.</source> -<target>Ne mogu ustanoviti ime volumen for %x.</target> +<target>Ne mogu utvrditi naziv spremnika za %x.</target> <source>Volume name %x is not part of file path %y.</source> -<target>Ime voumena %x nije dio puta datotke %y.</target> +<target>Naziv spremnika %x nije dio putanje datotke %y.</target> <source>Stop requested: Waiting for current operation to finish...</source> -<target>Zaustavljam naredbu: Čekam trenutni zadatak da se dovrši...</target> +<target>Zaustavljanje zatraženo: Čekam na dovršenje trenutnog zadatka...</target> <source>Unable to create time stamp for versioning:</source> -<target>Nije moguće izraditi vremensku oznaku</target> +<target>Nije moguća izrada vremenske oznake za označavanje:</target> <source>&Open...</source> <target>&Otvori...</target> @@ -356,7 +362,7 @@ <target>Uporaba:</target> <source>1. Select folders to watch.</source> -<target>1. Odaberite mape za nadzirati</target> +<target>1. Odaberite mape za nadziranje.</target> <source>2. Enter a command line.</source> <target>2. Unesite naredbu.</target> @@ -365,10 +371,10 @@ <target>3. Pretisnite 'Start'.</target> <source>To get started just import a .ffs_batch file.</source> -<target>Za započeti uvezite .ffs Slijednu datoteku.</target> +<target>Da biste započeli jednostavno uvezite .ffs_batch datoteku.</target> <source>Folders to watch:</source> -<target>Mape za upotrebu:</target> +<target>Mape za nadziranje:</target> <source>Add folder</source> <target>Dodaj mapu</target> @@ -399,7 +405,7 @@ The command is triggered if: <target> Naredba će biti pokrenuta ako se: - datoteke ili podmape promijene -- nove mape pojave (npr. umetanje USB sticka) +- pojave nove mape (npr. umetanje USB stika) </target> <source>&Start</source> @@ -457,46 +463,46 @@ Naredba će biti pokrenuta ako se: <target>Ažuriraj</target> <source>Custom</source> -<target>Uobičajeno</target> +<target>Prilagođeno</target> <source>Multiple...</source> <target>Mnogostruko...</target> <source>Moving file %x to %y</source> -<target>Premještam datoteku %x u %y</target> +<target>Premještanje datoteke %x u %y</target> <source>Moving folder %x to %y</source> -<target>Premještam mapu %x u %y</target> +<target>Premještanje mape %x u %y</target> <source>Moving symbolic link %x to %y</source> -<target>Premještam simboličnu poveznicu %x u %y</target> +<target>Premještanje simboličnog linka %x u %y</target> <source>Removing old versions...</source> -<target>Uklanjam starije verzije...</target> +<target>Uklanjanje starije verzije...</target> <source>Creating symbolic link %x</source> <target>Izrađujem simboličnu poveznicu %x</target> <source>Creating folder %x</source> -<target>Izrađujem mapu %x</target> +<target>Kreiranje mape %x</target> <source>Overwriting file %x</source> -<target>Prepisujem datoteku %x</target> +<target>Prepisivanje datoteke %x</target> <source>Overwriting symbolic link %x</source> -<target>Prepisujem simboličnu poveznicu %x</target> +<target>Prepisivanje simboličnog linka %x</target> <source>Verifying file %x</source> -<target>Provjeravam datoteku %x</target> +<target>Provjeravanje datoteke %x</target> <source>Updating attributes of %x</source> <target>Obnavljam atribute od %x</target> <source>Creating a Volume Shadow Copy for %x...</source> -<target>Lreiram Volume Shadow Copy za %x...</target> +<target>Kreiranje Volume Shadow Copy za %x...</target> <source>Data verification error: %x and %y have different content.</source> -<target>Greška pri provjeri podataka: %x i %y imaju različit sadržaj.</target> +<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> @@ -508,16 +514,16 @@ Naredba će biti pokrenuta ako se: <target>Odredišna mapa ne može biti prazna.</target> <source>Please enter a target folder for versioning.</source> -<target>Molimo odaberite ciljnu mapu za označavanje</target> +<target>Molimo odaberite odredišnu mapu za označavanje</target> <source>Source folder %x not found.</source> <target>Izvorna mapa %x nije pronađena.</target> <source>The following items have unresolved conflicts and will not be synchronized:</source> -<target>Slijedeće stavke imaju nedefiniranih sukoba te neće biti sinkronizirane:</target> +<target>Slijedeće stavke imaju nerješene konflikte i zato neće biti sinkronizirane:</target> <source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source> -<target>Navedene mape se značajno razlikuju. Prvojerite da li uspoređujete ispravne mape za sinkronizaciju.</target> +<target>Navedene mape se značajno razlikuju. Provjerite da li uspoređujete odgovarajuće mape za sinkronizaciju.</target> <source>Not enough free disk space available in:</source> <target>Nedovoljno prostora na disku:</target> @@ -529,25 +535,25 @@ Naredba će biti pokrenuta ako se: <target>Dostupno:</target> <source>A folder will be modified which is part of multiple folder pairs. Please review synchronization settings.</source> -<target>Mapa će biti uređena koja je dio više pari mapa. Molimo provjerite sinkronizacijske postavke.</target> +<target>Mapa, koja je dio višestrukih parova mapa, biti će promjenjena. Molimo provjerite sinkronizacijske postavke.</target> <source>Synchronizing folder pair:</source> -<target>Par sinkronizirane mape:</target> +<target>Par sinkroniziranja mapa:</target> <source>Generating database...</source> -<target>Izrađujem bazu podataka...</target> +<target>Izrađivanje baze podataka...</target> <source>job name</source> -<target>Ime zadatka</target> +<target>Naziv zadatka</target> <source>Synchronization stopped</source> <target>Sinkronizacija zaustavljena</target> <source>Synchronization completed with errors</source> -<target>Sinkronizacija završena s greškama</target> +<target>Sinkronizacija dovršena s greškama</target> <source>Synchronization completed with warnings</source> -<target>Sinkronizacija završena s upozorenjima</target> +<target>Sinkronizacija dovršena s upozorenjima</target> <source>Nothing to synchronize</source> <target>Ništa za sinkronizirati</target> @@ -571,10 +577,10 @@ Naredba će biti pokrenuta ako se: <target>&Ignoriraj</target> <source>&Switch</source> -<target>&Zamjeni</target> +<target>&Prebaci</target> <source>Switching to FreeFileSync's main window</source> -<target>Prebacujem na glavni prozor FreeFileSync</target> +<target>Prebacivanje na glavni prozor FreeFileSync</target> <source> <pluralform>Automatic retry in 1 second...</pluralform> @@ -596,7 +602,7 @@ Naredba će biti pokrenuta ako se: <target>Ozbiljna Pogreška</target> <source>Check for Program Updates</source> -<target>Provjeriti Nadogradnje Programa</target> +<target>Provjeri za nadogradnje programa</target> <source>A new version of FreeFileSync is available:</source> <target>Nova verzija FreeFileSync je dostupna:</target> @@ -608,7 +614,7 @@ Naredba će biti pokrenuta ako se: <target>&Preuzmi</target> <source>FreeFileSync is up to date.</source> -<target>FreeFileSync je ažuriran.</target> +<target>FreeFileSync je ažuran.</target> <source>Unable to connect to sourceforge.net.</source> <target>Ne mogu se povezati na sourceforge.net.</target> @@ -632,7 +638,7 @@ Naredba će biti pokrenuta ako se: <target>Naziv</target> <source>Relative path</source> -<target>Relativna Putanja</target> +<target>Relativna putanja</target> <source>Base folder</source> <target>Izvorna mapa</target> @@ -655,11 +661,11 @@ Naredba će biti pokrenuta ako se: <source>Drag && drop</source> <target>Povuci && ispusti</target> -<source>Alternate comparison settings</source> -<target>Alternativne postavke usporedbe</target> +<source>Local comparison settings</source> +<target>Lokalne postavke usporedbe</target> -<source>Alternate synchronization settings</source> -<target>Alternativne postavke sinkronizacije</target> +<source>Local synchronization settings</source> +<target>Lokalne postavke sinkronizacije</target> <source>Local filter</source> <target>Lokalni filter</target> @@ -670,11 +676,11 @@ Naredba će biti pokrenuta ako se: <source>None</source> <target>Ništa</target> -<source>Remove alternate settings</source> -<target>Ukloni alternativne postavke</target> +<source>Remove local settings</source> +<target>Ukloni lokalne postavke</target> -<source>Clear filter settings</source> -<target>Počisti postavke filtera</target> +<source>Reset local filter</source> +<target>Resetiranje lokalnog filtera</target> <source>Copy</source> <target>Kopiraj</target> @@ -682,14 +688,8 @@ Naredba će biti pokrenuta ako se: <source>Paste</source> <target>Zalijepi</target> -<source>Alternate Comparison Settings</source> -<target>Alternativne Postavke Usporedbe</target> - -<source>Alternate Synchronization Settings</source> -<target>Alternativne Postavke Sinkronizacije</target> - -<source>Local Filter</source> -<target>Lokalni Filter</target> +<source>Local Synchronization Settings</source> +<target>Lokalne Sinkronizacijske Postavke</target> <source>&New</source> <target>&Novo</target> @@ -706,8 +706,8 @@ Naredba će biti pokrenuta ako se: <source>2. &Synchronize</source> <target>2. &Sinkroniziraj</target> -<source>&Global settings</source> -<target>&Globalne postavke</target> +<source>&Options</source> +<target>&Opcije</target> <source>&Language</source> <target>&Jezik</target> @@ -716,7 +716,7 @@ Naredba će biti pokrenuta ako se: <target>&Pronađi...</target> <source>&Export file list...</source> -<target>&Izvoz liste datoteka...</target> +<target>&Izvoz popisa datoteka...</target> <source>&Tools</source> <target>&Alati</target> @@ -728,22 +728,22 @@ Naredba će biti pokrenuta ako se: <target>Provjeri &automatski jednom tjedno</target> <source>&Check for new version</source> -<target>&Dostupnost nove verzije</target> - -<source>Compare</source> -<target>Usporedi</target> +<target>&Provjeri za novu verziju</target> <source>Cancel</source> <target>Odustani</target> +<source>Compare</source> +<target>Usporedi</target> + <source>Synchronize</source> <target>Sinkroniziraj</target> <source>Add folder pair</source> -<target>Dodaj mapu</target> +<target>Dodaj više mapa</target> <source>Remove folder pair</source> -<target>Odstrani mapu</target> +<target>Ukloni ovu mapu</target> <source>Swap sides</source> <target>Zamjeni strane</target> @@ -757,38 +757,53 @@ Naredba će biti pokrenuta ako se: <source>Match case</source> <target>Identičan naziv</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> +<target>Spremi kao slijedni zadatak</target> + +<source>Save as...</source> +<target>Spremi kao...</target> <source>View type:</source> <target>Vrsta prikaza:</target> <source>Select view:</source> -<target>Prikaz odabira:</target> +<target>Odaberite prikaz:</target> <source>Statistics:</source> <target>Statistika:</target> <source>Number of files and folders that will be created</source> -<target>Broj datoteka i foldera koji će se stvoriti</target> +<target>Broj datoteka i foldera koje će biti izrađene</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 se izbrisati</target> +<target>Broj datoteka i mapa koje će biti obrisane</target> <source>Total bytes to copy</source> <target>Ukupno bajta za kopirati</target> +<source>Use local settings:</source> +<target>Koristi lokalne postavke:</target> + <source>Select a variant:</source> <target>Odaberi opciju:</target> <source>Identify equal files by comparing modification time and size.</source> -<target>Odredi jednake datoteke uspoređujući datum izmjene i veličinu</target> +<target>Ustanovi jednake datoteke uspoređujući vrijeme izmjene i veličinu</target> <source>Identify equal files by comparing the file content.</source> -<target>Odredi jednake datoteke uspoređujući sadržaj datoteke.</target> +<target>Ustanovi jednake datoteke uspoređujući sadržaj datoteke.</target> <source>Symbolic links:</source> <target>Simbolične poveznice:</target> @@ -796,20 +811,35 @@ Naredba će biti pokrenuta ako se: <source>More information</source> <target>Više informacija</target> -<source>OK</source> -<target>U redu</target> +<source>Local settings:</source> +<target>Lokalne postavke:</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.</target> +<source>Include:</source> +<target>Obuhvati</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Izradi zrcalnu pričuvu lijeve mape prilagođavajući desnu mapu da bude jednaka.</target> +<source>Exclude:</source> +<target>Odvojiti:</target> -<source>Copy new and updated files to the right folder.</source> -<target>Kopiraj nove i ažurirane datoteke u desnu mapu.</target> +<source>Show examples</source> +<target>Prikaži primjere</target> -<source>Configure your own synchronization rules.</source> -<target>Postavite vaša vlastita sinkronizacijska pravila.</target> +<source>Time span:</source> +<target>Vremenski raspon:</target> + +<source>File size:</source> +<target>Veličina datoteke:</target> + +<source>Minimum:</source> +<target>Minimum:</target> + +<source>Maximum:</source> +<target>Maksimum:</target> + +<source>&Reset</source> +<target>&Resetiraj</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> <source>Detect moved files</source> <target>Otkrij premještene datoteke</target> @@ -820,11 +850,14 @@ Naredba će biti pokrenuta ako se: - Not supported by all file systems </source> <target> -- Zahtjeva i stvara baznu datoteku +- Zahtjeva i kreira datoteke baze podataka - Otkrivanje aktivno nakon početne sinkronizacije - Nije podržano od svih datotečnih sustava </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Otkrij putanju sinkronizacije pomoću baze podataka</target> + <source>Delete files:</source> <target>Izbriši datoteke:</target> @@ -835,10 +868,10 @@ Naredba će biti pokrenuta ako se: <target>Trajno izbriši ili prepiši datoteke</target> <source>Recycle bin</source> -<target>Koš</target> +<target>Koš za smeće</target> <source>Back up deleted and overwritten files in the recycle bin</source> -<target>Spremi obrisane ili prepisane datoteke u koš</target> +<target>Spremi izbrisane ili prepisane datoteke u koš za smeće</target> <source>Versioning</source> <target>Odabir</target> @@ -847,10 +880,7 @@ Naredba će biti pokrenuta ako se: <target>Premjesti datoteke u mapu određenu od korsnika</target> <source>Naming convention:</source> -<target>Pravilo naziva:</target> - -<source>Show examples</source> -<target>Prikaži primjere</target> +<target>Naziv pravila:</target> <source>Handle errors:</source> <target>Obradi pogreške:</target> @@ -859,7 +889,7 @@ Naredba će biti pokrenuta ako se: <target>Ignoriraj</target> <source>Hide all error and warning messages</source> -<target>Sakrij sve greške i upozorenja</target> +<target>Sakrij sve poruke za greške i upozorenja</target> <source>Pop-up</source> <target>Pop-up</target> @@ -868,10 +898,10 @@ Naredba će biti pokrenuta ako se: <target>Prikaži skočni prozor pri greškama i upozorenjima</target> <source>On completion:</source> -<target>Pri završetku:</target> +<target>Pri dovršetku:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Otkrij putanju sinkronizacije pomoću baze</target> +<source>OK</source> +<target>U redu</target> <source>Start synchronization now?</source> <target>Započeti sinkronizaciju sada?</target> @@ -895,10 +925,10 @@ Naredba će biti pokrenuta ako se: <target>Proteklo vremena:</target> <source>Synchronizing...</source> -<target>Sinkroniziram...</target> +<target>Sinkroniziranje...</target> <source>Minimize to notification area</source> -<target>Spusti u notifikacije</target> +<target>Minimiziraj u područje obavjesti</target> <source>Close</source> <target>Zatvori</target> @@ -910,7 +940,7 @@ Naredba će biti pokrenuta ako se: <target>Zaustavi</target> <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. Za početak, dva-put kliknite na ovu datoteku ili planirajte u planeru zadataka: %x</target> +<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 synchronization at first error</source> <target>Zaustavi sinkronizaciju pri prvoj pogrešci</target> @@ -928,35 +958,11 @@ Naredba će biti pokrenuta ako se: <target>Ograniči maksimalan broj izvješća</target> <source>How can I schedule a batch job?</source> -<target>Kako zakazati Slijedni zadatak?</target> +<target>Kako zakazati slijedni zadatak?</target> <source>&Recycle bin</source> <target>&Koš za smeće</target> -<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> -<target>Odaberite filterska pravila za odvojiti određene datoteke iz sinkronizacije. Unesite putanju datoteka prema njihovim odgovarajućim parovima.</target> - -<source>Include:</source> -<target>Obuhvati</target> - -<source>Exclude:</source> -<target>Odvojiti:</target> - -<source>Time span:</source> -<target>Vremenski raspon:</target> - -<source>File size:</source> -<target>Veličina datoteke:</target> - -<source>Minimum:</source> -<target>Minimum:</target> - -<source>Maximum:</source> -<target>Maksimum:</target> - -<source>&Reset</source> -<target>&Resetiraj</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Ove postavke se koriste za sve sinkronizacijske zadatke</target> @@ -969,7 +975,7 @@ This guarantees a consistent state even in case of a serious error. </source> <target> Kopiraj u privremenu datoteku (*.ffs_tmp) prije prepisivanja ciljne datoteke -To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške +Ovo garantira čvrsto stanje čak u slučaju ozbiljne greške. </target> <source>(recommended)</source> @@ -988,10 +994,10 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <target>Kopiraj datotečna dopuštenja</target> <source>Transfer file and folder permissions.</source> -<target>Dopuštenja za prijenos datoteka i foldera.</target> +<target>Prenesi dopuštenja za datoteke i mape.</target> <source>Automatic retry on error:</source> -<target>Automatski pokušaj pri pogrešci:</target> +<target>Automatski pokušaj ponovo prilikom pogreške:</target> <source>Retry count:</source> <target>Broj pokušaja:</target> @@ -1018,7 +1024,7 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <target>Ako volite FreeFileSync</target> <source>Donate with PayPal</source> -<target>Doniraj s PayPal</target> +<target>Donirajte s PayPal</target> <source>Feedback and suggestions are welcome</source> <target>Povratne informacije i prijedlozi su dobrodošli</target> @@ -1036,19 +1042,22 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <target>Velike zahvale idu:</target> <source>Save as Batch Job</source> -<target>Spremi kao Slijedni zadatak</target> +<target>Spremi kao slijedni zadatak</target> <source>Delete Items</source> <target>Izbriši stavke</target> -<source>Global Settings</source> -<target>Globalne postavke</target> +<source>Options</source> +<target>Opcije</target> <source>Select Time Span</source> <target>Odaberite vremenski raspon</target> +<source>&Preferences...</source> +<target>&Prioriteti...</target> + <source>Folder Pairs</source> -<target>Parovi Foldera</target> +<target>Parovi mapa</target> <source>Find</source> <target>Pronađi</target> @@ -1065,12 +1074,6 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <source>Main Bar</source> <target>Glavna traka</target> -<source>Open...</source> -<target>Otvori...</target> - -<source>Save</source> -<target>Spremi</target> - <source>Compare both sides</source> <target>Usporedi obje strane</target> @@ -1136,10 +1139,10 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <target>višestruki odabir</target> <source>Include via filter:</source> -<target>Pridruži preko filtera:</target> +<target>Uključi kroz filter:</target> <source>Exclude via filter:</source> -<target>Isključi preko filtra:</target> +<target>Isključi kroz filter:</target> <source>Include temporarily</source> <target>Trenutno uključi</target> @@ -1160,16 +1163,16 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <target>Prikaži ikone:</target> <source>Small</source> -<target>Malo</target> +<target>Male</target> <source>Medium</source> <target>Srednje</target> <source>Large</source> -<target>Veliko</target> +<target>Velike</target> <source>Select time span...</source> -<target>Izaberite vremenski raspon...</target> +<target>Odaberite vremenski raspon...</target> <source>Default view</source> <target>Standardni prikaz</target> @@ -1187,7 +1190,7 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <target>Postavke spremljene</target> <source>FreeFileSync batch</source> -<target>FreeFileSync Slijedni zadatak</target> +<target>FreeFileSync slijedni zadatak</target> <source>Do you want to save changes to %x?</source> <target>Da li želite spremiti izmjene za %x?</target> @@ -1201,8 +1204,11 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <source>Delete selected configurations</source> <target>Izbriši odabrane postavke</target> -<source>Filter</source> -<target>Filtriranje</target> +<source>Synchronization Settings</source> +<target>Postavke Sinkronizacije</target> + +<source>Reset filter</source> +<target>Resetiraj filter</target> <source>Show files that exist on left side only</source> <target>Prikaži datoteke koje postoje samo na lijevoj strani</target> @@ -1226,10 +1232,10 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <target>Prikaži sukobe</target> <source>Show files that will be created on the left side</source> -<target>Prikaži datoteke koje će biti napravljene na lijevoj strani</target> +<target>Prikaži datoteke koje će biti kreirane na lijevoj strani</target> <source>Show files that will be created on the right side</source> -<target>Prikaži datoteke koje će biti napravljene na desnoj strani</target> +<target>Prikaži datoteke koje će biti kreirane na desnoj strani</target> <source>Show files that will be deleted on the left side</source> <target>Prikaži datoteke koje će biti izbrisane na lijevoj strani</target> @@ -1247,20 +1253,17 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <target>Prikaži datoteke koje neće biti kopirane</target> <source>Show filtered or temporarily excluded files</source> -<target>Prikaži filtrirane ili privremeno izdvojene datoteke</target> +<target>Prikaži filtrirane ili privremeno odvojene datoteke</target> <source>Set as default</source> <target>Postavi kao zadano</target> +<source>Filter</source> +<target>Filtriranje</target> + <source>All files are in sync</source> <target>Sve datoteke su u sinkronizaciji</target> -<source>Synchronization Settings</source> -<target>Postavke Sinkronizacije</target> - -<source>Comparison Settings</source> -<target>Postavke Usporedbe</target> - <source>Cannot find %x</source> <target>Ne mogu pronaći %x</target> @@ -1268,10 +1271,10 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <target>Zarezom odvojene vrijednosti</target> <source>File list exported</source> -<target>Datotečna lista izvezena</target> +<target>Popis datoteka je izvezen</target> <source>Searching for program updates...</source> -<target>Pretražujem ažuriranja programa...</target> +<target>Pretražujem nadogradnju programa...</target> <source>Close progress dialog</source> <target>Zatvori prozor zadatka</target> @@ -1298,7 +1301,7 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <target>Info</target> <source>Warning</source> -<target>Oprez</target> +<target>Upozorenje</target> <source>Select all</source> <target>Odaberi sve</target> @@ -1307,10 +1310,10 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <target>Pauzirano</target> <source>Initializing...</source> -<target>Učitavam</target> +<target>Započinjem...</target> <source>Completed</source> -<target>Završeno</target> +<target>Dovršeno</target> <source>&Continue</source> <target>&Nastavi</target> @@ -1319,40 +1322,16 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <target>Napredak</target> <source>Log</source> -<target>Dnevnik</target> - -<source>Today</source> -<target>Danas</target> - -<source>This week</source> -<target>Ovaj tjedan</target> - -<source>This month</source> -<target>Ovaj mjesec</target> - -<source>This year</source> -<target>Ove godine</target> - -<source>Last x days</source> -<target>Zadnjih x dana</target> - -<source>Byte</source> -<target>Bajt</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> +<target>Izvješće</target> <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> </source> <target> -<pluralform>Da li stvarno želite premjestiti sljedeću %x stavku u koš?</pluralform> -<pluralform>Da li stvarno želite premjestiti sljedeće %x stavke u koš?</pluralform> -<pluralform>Da li stvarno želite premjestiti sljedećih %x stavki u koš?</pluralform> +<pluralform>Da li zaista želite premjestiti sljedeću %x stavku u koš za smeće?</pluralform> +<pluralform>Da li zaista želite premjestiti sljedeće %x stavke u koš za smeće?</pluralform> +<pluralform>Da li zaista želite premjestiti sljedećih %x stavki u koš za smeće?</pluralform> </target> <source>Move</source> @@ -1363,19 +1342,13 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <pluralform>Do you really want to delete the following %x items?</pluralform> </source> <target> -<pluralform>Da li stvarno želite obrisati sljedeću %x stavku?</pluralform> -<pluralform>Da li stvarno želite obristi sljedeće %x stavke?</pluralform> -<pluralform>Da li stvarno želite obristi sljedećih %x stavki?</pluralform> +<pluralform>Da li zaista želite obrisati sljedeću %x stavku?</pluralform> +<pluralform>Da li zaista želite obristi sljedeće %x stavke?</pluralform> +<pluralform>Da li zaista želite obristi sljedećih %x stavki?</pluralform> </target> -<source>Exclude</source> -<target>Isključi</target> - -<source>Direct</source> -<target>Neposredno</target> - -<source>Follow</source> -<target>Slijedi</target> +<source>Preferences</source> +<target>Prioriteti</target> <source>Copy NTFS permissions</source> <target>Kopiraj NTFS dopuštenja</target> @@ -1384,7 +1357,7 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <target>Integriraj vanjske aplikacije u kontekstni meni. Sljedeći makroi su dostupni:</target> <source>- full file or folder name</source> -<target>- cijelo ime datoteke ili mape</target> +<target>- puni naziv datoteke ili mape</target> <source>- folder part only</source> <target>- samo mapa</target> @@ -1396,10 +1369,52 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <target>- Duplikat s druge strane u %item_folder%</target> <source>Restore all hidden windows and warnings?</source> -<target>Vratiti sve skrivene prozore i upozorenja?</target> +<target>Prikaži sve skrivene prozore i upozorenja?</target> -<source>Leave as unresolved conflict</source> -<target>Ostavi kao neriješeni sukob</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> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Izradi zrcalnu pričuvu lijeve mape prilagođavajući desnu mapu da bude jednaka.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Kopiraj nove i ažurirane datoteke u desnu mapu.</target> + +<source>Configure your own synchronization rules.</source> +<target>Postavite vaša vlastita sinkronizacijska pravila.</target> + +<source>Exclude</source> +<target>Isključi</target> + +<source>Direct</source> +<target>Direktno</target> + +<source>Follow</source> +<target>Slijedi</target> + +<source>Today</source> +<target>Danas</target> + +<source>This week</source> +<target>Ovaj tjedan</target> + +<source>This month</source> +<target>Ovaj mjesec</target> + +<source>This year</source> +<target>Ove godine</target> + +<source>Last x days</source> +<target>Zadnjih x dana</target> + +<source>Byte</source> +<target>Bajt</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>Zamjeni</target> @@ -1413,6 +1428,15 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <source>Append a time stamp to each file name</source> <target>Dodijeli vremensku oznaku za svaki naziv datoteke</target> +<source>Comparison</source> +<target>Usporedba</target> + +<source>Synchronization</source> +<target>Sinkronizacija</target> + +<source>Leave as unresolved conflict</source> +<target>Ostavi kao neriješeni konflikt</target> + <source>File</source> <target>Datoteka</target> @@ -1429,16 +1453,16 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <target>Postotak</target> <source>Cannot monitor directory %x.</source> -<target>Ne mogu posmatrati direktorij %x.</target> +<target>Ne mogu nadzirati direktorij %x.</target> <source>Conversion error:</source> -<target>Greška pri pretvorbi:</target> +<target>Greška prilikom pretvaranja:</target> <source>Cannot delete file %x.</source> <target>Ne mogu izbrisati datoteku %x.</target> <source>The file is locked by another process:</source> -<target>Datoteka je blokirana drugim procesom:</target> +<target>Datoteku koristi drugi proces:</target> <source>Cannot move file %x to %y.</source> <target>Ne mogu premjestiti datoteku %x u %y.</target> @@ -1477,16 +1501,16 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške <target>Ne mogu kopirati datoteku %x na %y.</target> <source>Type of item %x is not supported:</source> -<target>Tip stavke %x koji nije podržan:</target> +<target>Vrsta stavke %x koji nije podržan:</target> <source>Cannot resolve symbolic link %x.</source> -<target>Ne mogu odrediti poveznicu %x.</target> +<target>Ne mogu odrediti simboličnu poveznicu %x.</target> <source>Cannot open directory %x.</source> <target>Ne mogu otvoriti mapu %x.</target> <source>Cannot enumerate directory %x.</source> -<target>Ne mogu izlistati mapu %x.</target> +<target>Ne mogu specificirati direktorij %x.</target> <source>%x TB</source> <target>%x TB</target> @@ -1525,19 +1549,19 @@ To jamči dosljedno stanje čak i u slučaju ozbiljne pogreške </target> <source>Unable to register to receive system messages.</source> -<target>Nije moguće registriranje sistemskih poruka</target> +<target>Nije moguće registriranje za primanje sistemskih poruka</target> <source>Cannot set privilege %x.</source> <target>Ne mogu postaviti prava za %x.</target> <source>Unable to suspend system sleep mode.</source> -<target>Nije moguće obustaviti sistemsko stanje propravnosti</target> +<target>Nije moguće obustaviti sistemsko stanje pripravnosti</target> <source>Cannot change process I/O priorities.</source> <target>Ne može se promjeniti proces I/O prioriteta</target> <source>Unable to move %x to the recycle bin.</source> -<target>Nije moguće prebaciti %x u koš za smeće.</target> +<target>Nije moguće premjestiti %x u koš za smeće.</target> <source>Checking recycle bin failed for folder %x.</source> <target>Provjeravanje koša za smeće neuspješno za mapu %x.</target> diff --git a/FreeFileSync/Build/Languages/czech.lng b/FreeFileSync/Build/Languages/czech.lng index 55c64427..af32dbd8 100644 --- a/FreeFileSync/Build/Languages/czech.lng +++ b/FreeFileSync/Build/Languages/czech.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>Syntaxe:</target> -<source>config files</source> +<source>global config file:</source> +<target>konfigurační soubory</target> + +<source>config files:</source> <target>konfigurační soubory</target> <source>directory</source> <target>adresář</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Cesta k alternativnímu souboru GlobalSettings.xml.</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Libovolný počet konfiguračních souborů FreeFileSync typu .ffs_gui a/nebo .ffs_batch.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Libovolný počet alternativních adresářů na alespoň jednu konfiguraci.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Libovolný počet alternativních párů adresářů na alespoň jednu konfiguraci.</target> <source>Cannot find the following folders:</source> <target>Nelze najít následující složky:</target> @@ -655,11 +661,11 @@ Příkaz je spuštěn když: <source>Drag && drop</source> <target>Přetáhni sem && pusť</target> -<source>Alternate comparison settings</source> -<target>Jiné nastavení porovnání</target> +<source>Local comparison settings</source> +<target>Nastavení porovnání</target> -<source>Alternate synchronization settings</source> -<target>Jiné nastavení synchronizace</target> +<source>Local synchronization settings</source> +<target>Nastavení synchronizace</target> <source>Local filter</source> <target>Místní filtr</target> @@ -670,10 +676,10 @@ Příkaz je spuštěn když: <source>None</source> <target>Žádný</target> -<source>Remove alternate settings</source> -<target>Zrušit jiné nastavení</target> +<source>Remove local settings</source> +<target>Zrušit nastavení</target> -<source>Clear filter settings</source> +<source>Reset local filter</source> <target>Zrušit nastavení filtru</target> <source>Copy</source> @@ -682,14 +688,8 @@ Příkaz je spuštěn když: <source>Paste</source> <target>Vložit</target> -<source>Alternate Comparison Settings</source> -<target>Jiné nastavení porovnání</target> - -<source>Alternate Synchronization Settings</source> -<target>Jiné nastavení synchronizace</target> - -<source>Local Filter</source> -<target>Místní filtr</target> +<source>Local Synchronization Settings</source> +<target>Nastavení porovnání</target> <source>&New</source> <target>&Nový</target> @@ -706,7 +706,7 @@ Příkaz je spuštěn když: <source>2. &Synchronize</source> <target>2. &Synchronizovat</target> -<source>&Global settings</source> +<source>&Options</source> <target>&Nastavení programu</target> <source>&Language</source> @@ -730,12 +730,12 @@ Příkaz je spuštěn když: <source>&Check for new version</source> <target>&Zkontrolovat aktualizace</target> -<source>Compare</source> -<target>Porovnání</target> - <source>Cancel</source> <target>Zrušit</target> +<source>Compare</source> +<target>Porovnání</target> + <source>Synchronize</source> <target>Synchronizace</target> @@ -757,9 +757,21 @@ Příkaz je spuštěn když: <source>Match case</source> <target>Rozlišovat malá a velká písmena</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> + <source>View type:</source> <target>Typ zobrazení:</target> @@ -781,6 +793,9 @@ Příkaz je spuštěn když: <source>Total bytes to copy</source> <target>Celkový objem dat</target> +<source>Use local settings:</source> +<target>Použít nastavení:</target> + <source>Select a variant:</source> <target>Výběr varianty:</target> @@ -796,20 +811,35 @@ Příkaz je spuštěn když: <source>More information</source> <target>Více informací</target> -<source>OK</source> -<target>OK</target> +<source>Local settings:</source> +<target>Nastavení:</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> +<source>Include:</source> +<target>Zahrnout:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Vytvořit zrcadlovou kopii levé složky tak, aby po synchronizci pravá složka přesně odpovídala levé.</target> +<source>Exclude:</source> +<target>Vynechat:</target> -<source>Copy new and updated files to the right folder.</source> -<target>Kopírovat nové a aktualizované soubory do pravé složky.</target> +<source>Show examples</source> +<target>Ukázat příklady</target> -<source>Configure your own synchronization rules.</source> -<target>Nastavení vlastních pravidel synchronizace.</target> +<source>Time span:</source> +<target>Časové rozmezí:</target> + +<source>File size:</source> +<target>Velikost soubor:</target> + +<source>Minimum:</source> +<target>Od:</target> + +<source>Maximum:</source> +<target>Do:</target> + +<source>&Reset</source> +<target>&Smazat</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> <source>Detect moved files</source> <target>Detekce přesunutých souborů</target> @@ -825,6 +855,9 @@ Příkaz je spuštěn když: - není dostupné na všech systémech </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Určit směr synchronizace pomocí databáze</target> + <source>Delete files:</source> <target>Mazání souborů:</target> @@ -849,9 +882,6 @@ Příkaz je spuštěn když: <source>Naming convention:</source> <target>Pojmenování:</target> -<source>Show examples</source> -<target>Ukázat příklady</target> - <source>Handle errors:</source> <target>Zpracování chyb:</target> @@ -870,8 +900,8 @@ Příkaz je spuštěn když: <source>On completion:</source> <target>Po dokončení:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Určit směr synchronizace pomocí databáze</target> +<source>OK</source> +<target>OK</target> <source>Start synchronization now?</source> <target>Začít synchronizovat nyní?</target> @@ -933,30 +963,6 @@ Příkaz je spuštěn když: <source>&Recycle bin</source> <target>&Koš</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> - -<source>Include:</source> -<target>Zahrnout:</target> - -<source>Exclude:</source> -<target>Vynechat:</target> - -<source>Time span:</source> -<target>Časové rozmezí:</target> - -<source>File size:</source> -<target>Velikost soubor:</target> - -<source>Minimum:</source> -<target>Od:</target> - -<source>Maximum:</source> -<target>Do:</target> - -<source>&Reset</source> -<target>&Smazat</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Toto nastavení je platné pro všechny synchronizační úlohy.</target> @@ -1038,12 +1044,15 @@ This guarantees a consistent state even in case of a serious error. <source>Delete Items</source> <target>Smazané položky</target> -<source>Global Settings</source> +<source>Options</source> <target>Nastavení programu</target> <source>Select Time Span</source> <target>Časové rozmezí</target> +<source>&Preferences...</source> +<target>&Předvolby...</target> + <source>Folder Pairs</source> <target>Adresářové páry</target> @@ -1062,12 +1071,6 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>Hlavní lišta</target> -<source>Open...</source> -<target>Otevřít...</target> - -<source>Save</source> -<target>Uložit</target> - <source>Compare both sides</source> <target>Porovnat obě strany</target> @@ -1198,8 +1201,11 @@ This guarantees a consistent state even in case of a serious error. <source>Delete selected configurations</source> <target>Smazat vybrané konfigurace</target> -<source>Filter</source> -<target>Filtr</target> +<source>Synchronization Settings</source> +<target>Nastavení synchronizace</target> + +<source>Reset filter</source> +<target>Zrušit filtr</target> <source>Show files that exist on left side only</source> <target>Zobrazit soubory existující pouze vlevo</target> @@ -1249,15 +1255,12 @@ This guarantees a consistent state even in case of a serious error. <source>Set as default</source> <target>Nastavit jako výchozí</target> +<source>Filter</source> +<target>Filtr</target> + <source>All files are in sync</source> <target>Všechny soubory jsou synchronizovány</target> -<source>Synchronization Settings</source> -<target>Nastavení synchronizace</target> - -<source>Comparison Settings</source> -<target>Nastavení porovnání</target> - <source>Cannot find %x</source> <target>Nelze najít %x</target> @@ -1318,30 +1321,6 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>Záznam zpracování</target> -<source>Today</source> -<target>Dnes</target> - -<source>This week</source> -<target>Tento týden</target> - -<source>This month</source> -<target>Tento měsíc</target> - -<source>This year</source> -<target>Tento rok</target> - -<source>Last x days</source> -<target>dní zpětně</target> - -<source>Byte</source> -<target>Byte</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1365,14 +1344,8 @@ This guarantees a consistent state even in case of a serious error. <pluralform>Opravdu chcete smazat následujících %x položek?</pluralform> </target> -<source>Exclude</source> -<target>Vynechat</target> - -<source>Direct</source> -<target>Zachovat</target> - -<source>Follow</source> -<target>Použít cíl</target> +<source>Preferences</source> +<target>Předvolby</target> <source>Copy NTFS permissions</source> <target>Kopírovat oprávnění NTFS</target> @@ -1395,8 +1368,50 @@ This guarantees a consistent state even in case of a serious error. <source>Restore all hidden windows and warnings?</source> <target>Obnovit všechny skryté dialogy a varování?</target> -<source>Leave as unresolved conflict</source> -<target>Ponechat jako nevyřešený konflikt</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> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Vytvořit zrcadlovou kopii levé složky tak, aby po synchronizci pravá složka přesně odpovídala levé.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Kopírovat nové a aktualizované soubory do pravé složky.</target> + +<source>Configure your own synchronization rules.</source> +<target>Nastavení vlastních pravidel synchronizace.</target> + +<source>Exclude</source> +<target>Vynechat</target> + +<source>Direct</source> +<target>Zachovat</target> + +<source>Follow</source> +<target>Použít cíl</target> + +<source>Today</source> +<target>Dnes</target> + +<source>This week</source> +<target>Tento týden</target> + +<source>This month</source> +<target>Tento měsíc</target> + +<source>This year</source> +<target>Tento rok</target> + +<source>Last x days</source> +<target>dní zpětně</target> + +<source>Byte</source> +<target>Byte</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>Nahradit</target> @@ -1410,6 +1425,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>Přidat časovou značku ke jménu souboru</target> +<source>Comparison</source> +<target>Porovnání</target> + +<source>Synchronization</source> +<target>Synchronizace</target> + +<source>Leave as unresolved conflict</source> +<target>Ponechat jako nevyřešený konflikt</target> + <source>File</source> <target>Soubor</target> diff --git a/FreeFileSync/Build/Languages/danish.lng b/FreeFileSync/Build/Languages/danish.lng index 37e93512..aac7e0a3 100644 --- a/FreeFileSync/Build/Languages/danish.lng +++ b/FreeFileSync/Build/Languages/danish.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>Syntaks:</target> -<source>config files</source> -<target>indstillingsfiler</target> +<source>global config file:</source> +<target>global indstillingsfil</target> + +<source>config files:</source> +<target>indstillingsfiler:</target> <source>directory</source> <target>mappe</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Sti til alternativ GlobalSettings.xml fil.</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Vilkårligt antal FreeFileSync .ffs_gui og/eller .ffs_batch indstillingsfiler.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Vilkårligt antal alternative mappe til højst en indstillingsfil</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Vilkårligt antal alternative mappepar til højst en indstillingsfil</target> <source>Cannot find the following folders:</source> <target>Kan ikke finde følgende mapper:</target> @@ -651,11 +657,11 @@ Kommandoen udføres hvis: <source>Drag && drop</source> <target>Træk emner hertil</target> -<source>Alternate comparison settings</source> -<target>Tilpas analyse</target> +<source>Local comparison settings</source> +<target>Lokale analyseindstillinger</target> -<source>Alternate synchronization settings</source> -<target>Tilpas synkronisering</target> +<source>Local synchronization settings</source> +<target>Lokale synkindstillinger</target> <source>Local filter</source> <target>Lokalt filter</target> @@ -666,11 +672,11 @@ Kommandoen udføres hvis: <source>None</source> <target>Ingen</target> -<source>Remove alternate settings</source> -<target>Fjern tilpassede indstillinger</target> +<source>Remove local settings</source> +<target>Fjern lokale indstillinger</target> -<source>Clear filter settings</source> -<target>Nulstil filter</target> +<source>Reset local filter</source> +<target>Nulstil lokalt filter</target> <source>Copy</source> <target>Kopiér</target> @@ -678,14 +684,8 @@ Kommandoen udføres hvis: <source>Paste</source> <target>Indsæt</target> -<source>Alternate Comparison Settings</source> -<target>Tilpas analyse</target> - -<source>Alternate Synchronization Settings</source> -<target>Tilpas synkronisering</target> - -<source>Local Filter</source> -<target>Lokalt filter</target> +<source>Local Synchronization Settings</source> +<target>Lokale synkindstillinger</target> <source>&New</source> <target>&Ny</target> @@ -702,8 +702,8 @@ Kommandoen udføres hvis: <source>2. &Synchronize</source> <target>2. &Synkroniser</target> -<source>&Global settings</source> -<target>&Programindstillinger</target> +<source>&Options</source> +<target>&Indstillinger</target> <source>&Language</source> <target>&Sprog</target> @@ -726,12 +726,12 @@ Kommandoen udføres hvis: <source>&Check for new version</source> <target>Søg &efter opdatering</target> -<source>Compare</source> -<target>Analysér</target> - <source>Cancel</source> <target>Annuller</target> +<source>Compare</source> +<target>Analysér</target> + <source>Synchronize</source> <target>Synkronisér</target> @@ -753,9 +753,21 @@ Kommandoen udføres hvis: <source>Match case</source> <target>Versalfølsom (a/A)</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> + <source>View type:</source> <target>Visning:</target> @@ -777,6 +789,9 @@ Kommandoen udføres hvis: <source>Total bytes to copy</source> <target>Antal bytes der kopieres</target> +<source>Use local settings:</source> +<target>Brug lokale indstillinger</target> + <source>Select a variant:</source> <target>Vælg metode:</target> @@ -792,20 +807,35 @@ Kommandoen udføres hvis: <source>More information</source> <target>Mere information</target> -<source>OK</source> -<target>OK</target> +<source>Local settings:</source> +<target>Lokale indstillinger:</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> +<source>Include:</source> +<target>Inkludér:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Opret spejling af venstre mappe ved at tilpasse den højre mappe</target> +<source>Exclude:</source> +<target>Ekskludér:</target> -<source>Copy new and updated files to the right folder.</source> -<target>Kopier nye og opdaterede filer til højre mappe.</target> +<source>Show examples</source> +<target>Vis eksempler</target> -<source>Configure your own synchronization rules.</source> -<target>Opret dine egne synkroniseringsregler.</target> +<source>Time span:</source> +<target>Interval:</target> + +<source>File size:</source> +<target>Filstørrelse:</target> + +<source>Minimum:</source> +<target>Minimum:</target> + +<source>Maximum:</source> +<target>Maksimum:</target> + +<source>&Reset</source> +<target>&Nulstil</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> <source>Detect moved files</source> <target>Genkend flyttede filer</target> @@ -821,6 +851,9 @@ Kommandoen udføres hvis: - Understøtter ikke alle filsystemer </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Genkend synkretninger ved hjælp af databasefiler</target> + <source>Delete files:</source> <target>Filsletning:</target> @@ -845,9 +878,6 @@ Kommandoen udføres hvis: <source>Naming convention:</source> <target>Navneregler:</target> -<source>Show examples</source> -<target>Vis eksempler</target> - <source>Handle errors:</source> <target>Fejlhåndtering:</target> @@ -866,8 +896,8 @@ Kommandoen udføres hvis: <source>On completion:</source> <target>Ved gennemført:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Genkend synkretninger ved hjælp af databasefiler</target> +<source>OK</source> +<target>OK</target> <source>Start synchronization now?</source> <target>Synkroniser nu?</target> @@ -929,30 +959,6 @@ Kommandoen udføres hvis: <source>&Recycle bin</source> <target>&Papirkurv</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> - -<source>Include:</source> -<target>Inkludér:</target> - -<source>Exclude:</source> -<target>Ekskludér:</target> - -<source>Time span:</source> -<target>Interval:</target> - -<source>File size:</source> -<target>Filstørrelse:</target> - -<source>Minimum:</source> -<target>Minimum:</target> - -<source>Maximum:</source> -<target>Maksimum:</target> - -<source>&Reset</source> -<target>&Nulstil</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Disse indstillinger gælder alle synkroniseringer.</target> @@ -1034,12 +1040,15 @@ This guarantees a consistent state even in case of a serious error. <source>Delete Items</source> <target>Slet emner</target> -<source>Global Settings</source> -<target>Programindstillinger</target> +<source>Options</source> +<target>Indstillinger</target> <source>Select Time Span</source> <target>Vælg tidsinterval</target> +<source>&Preferences...</source> +<target>I&ndstillinger</target> + <source>Folder Pairs</source> <target>Mappepar</target> @@ -1058,12 +1067,6 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>Hovedlinie</target> -<source>Open...</source> -<target>Åben...</target> - -<source>Save</source> -<target>Gem</target> - <source>Compare both sides</source> <target>Analyser begge sider</target> @@ -1190,8 +1193,11 @@ This guarantees a consistent state even in case of a serious error. <source>Delete selected configurations</source> <target>Slet valgte indstillinger</target> -<source>Filter</source> -<target>Filter</target> +<source>Synchronization Settings</source> +<target>Synkroniseringsindstillinger</target> + +<source>Reset filter</source> +<target>Nulstil filter</target> <source>Show files that exist on left side only</source> <target>Vis filer der kun findes på venstre side</target> @@ -1241,15 +1247,12 @@ This guarantees a consistent state even in case of a serious error. <source>Set as default</source> <target>Sæt som standard</target> +<source>Filter</source> +<target>Filter</target> + <source>All files are in sync</source> <target>Alt er synkroniseret</target> -<source>Synchronization Settings</source> -<target>Synkroniseringsindstillinger</target> - -<source>Comparison Settings</source> -<target>Analyseindstillinger</target> - <source>Cannot find %x</source> <target>Kan ikke finde %x</target> @@ -1310,30 +1313,6 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>Log</target> -<source>Today</source> -<target>Idag</target> - -<source>This week</source> -<target>Denne uge</target> - -<source>This month</source> -<target>Denne måned</target> - -<source>This year</source> -<target>Dette år</target> - -<source>Last x days</source> -<target>Sidste x dage</target> - -<source>Byte</source> -<target>Byte</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1355,14 +1334,8 @@ This guarantees a consistent state even in case of a serious error. <pluralform>Vil du slette følgende %x emner?</pluralform> </target> -<source>Exclude</source> -<target>Ekskludér</target> - -<source>Direct</source> -<target>Direkte</target> - -<source>Follow</source> -<target>Følg</target> +<source>Preferences</source> +<target>Indstillinger</target> <source>Copy NTFS permissions</source> <target>Kopier NTFS tilladelser</target> @@ -1385,8 +1358,50 @@ This guarantees a consistent state even in case of a serious error. <source>Restore all hidden windows and warnings?</source> <target>Gendan skjulte vinduer og advarsler?</target> -<source>Leave as unresolved conflict</source> -<target>Efterlad som uløst konflikt</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> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Opret spejling af venstre mappe ved at tilpasse den højre mappe</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Kopier nye og opdaterede filer til højre mappe.</target> + +<source>Configure your own synchronization rules.</source> +<target>Opret dine egne synkroniseringsregler.</target> + +<source>Exclude</source> +<target>Ekskludér</target> + +<source>Direct</source> +<target>Direkte</target> + +<source>Follow</source> +<target>Følg</target> + +<source>Today</source> +<target>Idag</target> + +<source>This week</source> +<target>Denne uge</target> + +<source>This month</source> +<target>Denne måned</target> + +<source>This year</source> +<target>Dette år</target> + +<source>Last x days</source> +<target>Sidste x dage</target> + +<source>Byte</source> +<target>Byte</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>Erstat</target> @@ -1400,6 +1415,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>Føj tidsstempel til hvert filnavn</target> +<source>Comparison</source> +<target>Analyse</target> + +<source>Synchronization</source> +<target>Synkronisering</target> + +<source>Leave as unresolved conflict</source> +<target>Efterlad som uløst konflikt</target> + <source>File</source> <target>Fil</target> diff --git a/FreeFileSync/Build/Languages/dutch.lng b/FreeFileSync/Build/Languages/dutch.lng index 95974153..01854052 100644 --- a/FreeFileSync/Build/Languages/dutch.lng +++ b/FreeFileSync/Build/Languages/dutch.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>Syntax:</target> -<source>config files</source> -<target>configuratiebestanden</target> +<source>global config file:</source> +<target>Globaal configuratiebestand:</target> + +<source>config files:</source> +<target>configuratiebestanden:</target> <source>directory</source> <target>bestandslocatie</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Pad naar alternatief GlobalSettings.xml bestand.</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Elk aantal FreeFileSync .ffs_gui en/of .ffs_batch configuratiebestanden.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Elk aantal alternatieve bestandslocaties voor een configuratiebestand.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Willekeurig aantal gekoppelde mappen voor één configuratie bestand.</target> <source>Cannot find the following folders:</source> <target>Kan de volgende mappen niet vinden:</target> @@ -526,7 +532,7 @@ De opdracht word geactiveerd als: <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 map paren word aangepast. Kijk alstublieft uw synchronisatie instellingen na.</target> +<target>Een map die onderdeel is van meerdere gekoppelde mappen word aangepast. Kijk alstublieft uw synchronisatie instellingen na.</target> <source>Synchronizing folder pair:</source> <target>Bezig met synchroniseren van folder paar:</target> @@ -651,11 +657,11 @@ De opdracht word geactiveerd als: <source>Drag && drop</source> <target>Drag en drop</target> -<source>Alternate comparison settings</source> -<target>Alternatieve vergelijkings instellingen</target> +<source>Local comparison settings</source> +<target>Lokale vergelijkings instellingen</target> -<source>Alternate synchronization settings</source> -<target>Alternatieve synchronisatie instellingen</target> +<source>Local synchronization settings</source> +<target>Lokale synchronisatie instellingen</target> <source>Local filter</source> <target>Lokale filter</target> @@ -666,11 +672,11 @@ De opdracht word geactiveerd als: <source>None</source> <target>Geen</target> -<source>Remove alternate settings</source> -<target>Verwijder alternatieve instellingen</target> +<source>Remove local settings</source> +<target>Verwijder lokale instellingen</target> -<source>Clear filter settings</source> -<target>Verwijder filterinstellingen</target> +<source>Reset local filter</source> +<target>Reset lokale filter</target> <source>Copy</source> <target>Kopiëren</target> @@ -678,14 +684,8 @@ De opdracht word geactiveerd als: <source>Paste</source> <target>Plakken</target> -<source>Alternate Comparison Settings</source> -<target>Alternatieve vergelijkings instellingen</target> - -<source>Alternate Synchronization Settings</source> -<target>Alternatieve synchronisatie instellingen</target> - -<source>Local Filter</source> -<target>Lokale filter</target> +<source>Local Synchronization Settings</source> +<target>Lokale synchronisatie instellingen</target> <source>&New</source> <target>&Nieuw</target> @@ -702,8 +702,8 @@ De opdracht word geactiveerd als: <source>2. &Synchronize</source> <target>2. &Synchroniseer</target> -<source>&Global settings</source> -<target>&Algemene instellingen</target> +<source>&Options</source> +<target>&Opties</target> <source>&Language</source> <target>&Taal</target> @@ -726,12 +726,12 @@ De opdracht word geactiveerd als: <source>&Check for new version</source> <target>&Controleer voor nieuwe versie</target> -<source>Compare</source> -<target>Vergelijk</target> - <source>Cancel</source> <target>Annuleren</target> +<source>Compare</source> +<target>Vergelijk</target> + <source>Synchronize</source> <target>Synchroniseer</target> @@ -753,9 +753,21 @@ De opdracht word geactiveerd als: <source>Match case</source> <target>Hoofdlettergevoelig</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> + <source>View type:</source> <target>Laat type zien:</target> @@ -777,6 +789,9 @@ De opdracht word geactiveerd als: <source>Total bytes to copy</source> <target>Aantal bytes om te kopiëren</target> +<source>Use local settings:</source> +<target>Gebruik lokale instellingen:</target> + <source>Select a variant:</source> <target>Selecteer een variant:</target> @@ -792,20 +807,35 @@ De opdracht word geactiveerd als: <source>More information</source> <target>Meer informatie</target> -<source>OK</source> -<target>OK</target> +<source>Local settings:</source> +<target>Lokale instellingen:</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> +<source>Include:</source> +<target>Meerekenen:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Maak een spiegelbackup van de linkermap door te zorgen dat de rechtermap gelijk is.</target> +<source>Exclude:</source> +<target>Uitsluiten:</target> -<source>Copy new and updated files to the right folder.</source> -<target>Kopiëer nieuwe en geupdate bestanden naar de rechtermap.</target> +<source>Show examples</source> +<target>Laat voorbeelden zien</target> -<source>Configure your own synchronization rules.</source> -<target>Configureer uw eigen synchronisatieregels.</target> +<source>Time span:</source> +<target>Tijdspanne:</target> + +<source>File size:</source> +<target>Bestandsgrootte:</target> + +<source>Minimum:</source> +<target>Minimum:</target> + +<source>Maximum:</source> +<target>Maximum:</target> + +<source>&Reset</source> +<target>&Reset</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> <source>Detect moved files</source> <target>Detecteer verplaatste bestanden</target> @@ -821,6 +851,9 @@ De opdracht word geactiveerd als: - Niet ondersteund door alle bestandssystemen </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Detecteer synchronisatierichtingen met behulp van databasebestanden</target> + <source>Delete files:</source> <target>Verwijder bestanden:</target> @@ -845,9 +878,6 @@ De opdracht word geactiveerd als: <source>Naming convention:</source> <target>Naamgevingsconventie</target> -<source>Show examples</source> -<target>Laat voorbeelden zien</target> - <source>Handle errors:</source> <target>Fouten afhandelen:</target> @@ -866,8 +896,8 @@ De opdracht word geactiveerd als: <source>On completion:</source> <target>Bij voltooiing:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Detecteer synchronisatierichtingen met behulp van databasebestanden</target> +<source>OK</source> +<target>OK</target> <source>Start synchronization now?</source> <target>Start de synchronisatie nu?</target> @@ -929,30 +959,6 @@ De opdracht word geactiveerd als: <source>&Recycle bin</source> <target>&Prullebak</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> - -<source>Include:</source> -<target>Meerekenen:</target> - -<source>Exclude:</source> -<target>Uitsluiten:</target> - -<source>Time span:</source> -<target>Tijdspanne:</target> - -<source>File size:</source> -<target>Bestandsgrootte:</target> - -<source>Minimum:</source> -<target>Minimum:</target> - -<source>Maximum:</source> -<target>Maximum:</target> - -<source>&Reset</source> -<target>&Reset</target> - <source>The following settings are used for all synchronization jobs.</source> <target>De volgende instellingen worden gebruikt voor alle synchronisaties.</target> @@ -1037,12 +1043,15 @@ Dit garandeert een consistente staat, zelfs in het geval van een serieuze fout. <source>Delete Items</source> <target>Verwijder items</target> -<source>Global Settings</source> -<target>Globale instellingen</target> +<source>Options</source> +<target>Opties</target> <source>Select Time Span</source> <target>Selecteer tijdspanne</target> +<source>&Preferences...</source> +<target>&Voorkeuren...</target> + <source>Folder Pairs</source> <target>Map koppelingen</target> @@ -1061,12 +1070,6 @@ Dit garandeert een consistente staat, zelfs in het geval van een serieuze fout. <source>Main Bar</source> <target>Hoofdbalk</target> -<source>Open...</source> -<target>Open...</target> - -<source>Save</source> -<target>Opslaan</target> - <source>Compare both sides</source> <target>Vergelijk beide zijdes</target> @@ -1193,8 +1196,11 @@ Dit garandeert een consistente staat, zelfs in het geval van een serieuze fout. <source>Delete selected configurations</source> <target>Verwijder geselecteerde configuraties</target> -<source>Filter</source> -<target>Filter</target> +<source>Synchronization Settings</source> +<target>Synchronisatie instellingen</target> + +<source>Reset filter</source> +<target>Reset filter</target> <source>Show files that exist on left side only</source> <target>Toon bestanden die alleen aan de linkerzijde bestaan</target> @@ -1244,15 +1250,12 @@ Dit garandeert een consistente staat, zelfs in het geval van een serieuze fout. <source>Set as default</source> <target>Instellen als standaard</target> +<source>Filter</source> +<target>Filter</target> + <source>All files are in sync</source> <target>Alle bestanden zijn gesynchroniseerd</target> -<source>Synchronization Settings</source> -<target>Synchronisatie instellingen</target> - -<source>Comparison Settings</source> -<target>Vergelijkings instellingen</target> - <source>Cannot find %x</source> <target>Kan %x niet vinden</target> @@ -1313,30 +1316,6 @@ Dit garandeert een consistente staat, zelfs in het geval van een serieuze fout. <source>Log</source> <target>Log</target> -<source>Today</source> -<target>Vandaag</target> - -<source>This week</source> -<target>Deze week</target> - -<source>This month</source> -<target>Deze maand</target> - -<source>This year</source> -<target>Dit jaar</target> - -<source>Last x days</source> -<target>Laatste x dagen</target> - -<source>Byte</source> -<target>Byte</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1358,14 +1337,8 @@ Dit garandeert een consistente staat, zelfs in het geval van een serieuze fout. <pluralform>Wilt u echt de volgende %x items verwijderen?</pluralform> </target> -<source>Exclude</source> -<target>Uitsluiten</target> - -<source>Direct</source> -<target>Direct</target> - -<source>Follow</source> -<target>Volgen</target> +<source>Preferences</source> +<target>Voorkeuren</target> <source>Copy NTFS permissions</source> <target>Kopiëer NTFS permissies</target> @@ -1388,8 +1361,50 @@ Dit garandeert een consistente staat, zelfs in het geval van een serieuze fout. <source>Restore all hidden windows and warnings?</source> <target>Herstel alle verborgen vensters en waarschuwingen?</target> -<source>Leave as unresolved conflict</source> -<target>Beschouw als onopgelost conflict</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> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Maak een spiegelbackup van de linkermap door te zorgen dat de rechtermap gelijk is.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Kopiëer nieuwe en geupdate bestanden naar de rechtermap.</target> + +<source>Configure your own synchronization rules.</source> +<target>Configureer uw eigen synchronisatieregels.</target> + +<source>Exclude</source> +<target>Uitsluiten</target> + +<source>Direct</source> +<target>Direct</target> + +<source>Follow</source> +<target>Volgen</target> + +<source>Today</source> +<target>Vandaag</target> + +<source>This week</source> +<target>Deze week</target> + +<source>This month</source> +<target>Deze maand</target> + +<source>This year</source> +<target>Dit jaar</target> + +<source>Last x days</source> +<target>Laatste x dagen</target> + +<source>Byte</source> +<target>Byte</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>Vervangen</target> @@ -1403,6 +1418,15 @@ Dit garandeert een consistente staat, zelfs in het geval van een serieuze fout. <source>Append a time stamp to each file name</source> <target>Voeg een timestamp toe aan elke bestandsnaam</target> +<source>Comparison</source> +<target>Vergelijkingen</target> + +<source>Synchronization</source> +<target>Synchronisatie</target> + +<source>Leave as unresolved conflict</source> +<target>Beschouw als onopgelost conflict</target> + <source>File</source> <target>Bestand</target> diff --git a/FreeFileSync/Build/Languages/english_uk.lng b/FreeFileSync/Build/Languages/english_uk.lng index 90985d0f..e75f2880 100644 --- a/FreeFileSync/Build/Languages/english_uk.lng +++ b/FreeFileSync/Build/Languages/english_uk.lng @@ -7,39 +7,6 @@ <plural_definition>n == 1 ? 0 : 1</plural_definition> </header> -<source>Synchronization</source> -<target></target> - -<source>Comparison</source> -<target></target> - -<source>Local settings:</source> -<target></target> - -<source>Use local settings:</source> -<target></target> - -<source>Save as...</source> -<target></target> - -<source>Save as GUI job</source> -<target></target> - -<source>Local Synchronization Settings</source> -<target></target> - -<source>Any number of alternative directory pairs for at most one config file.</source> -<target></target> - -<source>Path to an alternate GlobalSettings.xml file.</source> -<target></target> - -<source>config files:</source> -<target></target> - -<source>global config file:</source> -<target></target> - <source>Both sides have changed since last synchronization.</source> <target>Both sides have changed since last synchronisation.</target> @@ -109,12 +76,24 @@ <source>Syntax:</source> <target>Syntax:</target> +<source>global config file:</source> +<target>global config file:</target> + +<source>config files:</source> +<target>config files:</target> + <source>directory</source> <target>directory</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Path to an alternate GlobalSettings.xml file.</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Any number of alternative directory pairs for at most one config file.</target> + <source>Cannot find the following folders:</source> <target>Cannot find the following folders:</target> @@ -678,11 +657,11 @@ The command is triggered if: <source>Drag && drop</source> <target>Drag && drop</target> -<source>Alternate comparison settings</source> -<target>Alternate comparison settings</target> +<source>Local comparison settings</source> +<target>Local comparison settings</target> -<source>Alternate synchronization settings</source> -<target>Alternate synchronisation settings</target> +<source>Local synchronization settings</source> +<target>Local synchronisation settings</target> <source>Local filter</source> <target>Local filter</target> @@ -693,11 +672,11 @@ The command is triggered if: <source>None</source> <target>None</target> -<source>Remove alternate settings</source> -<target>Remove alternate settings</target> +<source>Remove local settings</source> +<target>Remove local settings</target> -<source>Clear filter settings</source> -<target>Clear filter settings</target> +<source>Reset local filter</source> +<target>Reset local filter</target> <source>Copy</source> <target>Copy</target> @@ -705,6 +684,9 @@ The command is triggered if: <source>Paste</source> <target>Paste</target> +<source>Local Synchronization Settings</source> +<target>Local Synchronisation Settings</target> + <source>&New</source> <target>&New</target> @@ -720,8 +702,8 @@ The command is triggered if: <source>2. &Synchronize</source> <target>2. &Synchronise</target> -<source>&Global settings</source> -<target>&Global settings</target> +<source>&Options</source> +<target>&Options</target> <source>&Language</source> <target>&Language</target> @@ -744,12 +726,12 @@ The command is triggered if: <source>&Check for new version</source> <target>&Check for new version</target> -<source>Compare</source> -<target>Compare</target> - <source>Cancel</source> <target>Cancel</target> +<source>Compare</source> +<target>Compare</target> + <source>Synchronize</source> <target>Synchronise</target> @@ -777,9 +759,15 @@ The command is triggered if: <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> + <source>View type:</source> <target>View type:</target> @@ -801,6 +789,9 @@ The command is triggered if: <source>Total bytes to copy</source> <target>Total bytes to copy</target> +<source>Use local settings:</source> +<target>Use local settings:</target> + <source>Select a variant:</source> <target>Select a variant:</target> @@ -816,6 +807,9 @@ The command is triggered if: <source>More information</source> <target>More information</target> +<source>Local settings:</source> +<target>Local settings:</target> + <source>Include:</source> <target>Include:</target> @@ -1049,12 +1043,15 @@ This guarantees a consistent state even in case of a serious error. <source>Delete Items</source> <target>Delete Items</target> -<source>Global Settings</source> -<target>Global Settings</target> +<source>Options</source> +<target>Options</target> <source>Select Time Span</source> <target>Select Time Span</target> +<source>&Preferences...</source> +<target>&Preferences...</target> + <source>Folder Pairs</source> <target>Folder Pairs</target> @@ -1202,6 +1199,9 @@ 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>Show files that exist on left side only</source> <target>Show files that exist on left side only</target> @@ -1337,6 +1337,9 @@ This guarantees a consistent state even in case of a serious error. <pluralform>Do you really want to delete the following %x items?</pluralform> </target> +<source>Preferences</source> +<target>Preferences</target> + <source>Copy NTFS permissions</source> <target>Copy NTFS permissions</target> @@ -1415,6 +1418,12 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>Append a time stamp to each file name</target> +<source>Comparison</source> +<target>Comparison</target> + +<source>Synchronization</source> +<target>Synchronisation</target> + <source>Leave as unresolved conflict</source> <target>Leave as unresolved conflict</target> diff --git a/FreeFileSync/Build/Languages/finnish.lng b/FreeFileSync/Build/Languages/finnish.lng index 4d2bfed9..335ed124 100644 --- a/FreeFileSync/Build/Languages/finnish.lng +++ b/FreeFileSync/Build/Languages/finnish.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>Syntaksi:</target> -<source>config files</source> -<target>määrittelytiedostot</target> +<source>global config file:</source> +<target>yleinen määrittely:</target> + +<source>config files:</source> +<target>määrittelyt:</target> <source>directory</source> <target>hakemisto</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Polku toiseen GlobalSettings.xml tiedostolle.</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Vapaa määrä FreeFileSync .ffs_gui ja/tai .ffs_batch määrittelytiedostoja.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Vapaa määrä eri hakemistoja yhdessä tietyssä määrittelyssä.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Vapaa määrä eri hakemistopareja yhdessä tietyssä määrittelyssä.</target> <source>Cannot find the following folders:</source> <target>Seuraavia hakemistoja ei löydy:</target> @@ -651,11 +657,11 @@ Käsky suoritetaan jos: <source>Drag && drop</source> <target>Vedä ja pudota</target> -<source>Alternate comparison settings</source> -<target>Vaihtoehtoiset asetukset vertailuille</target> +<source>Local comparison settings</source> +<target>Vertaillun paikalliset asetukset</target> -<source>Alternate synchronization settings</source> -<target>Vaihtoehtoiset asetukset täsmäykselle</target> +<source>Local synchronization settings</source> +<target>Täsmäytyksen paikalliset asetukset</target> <source>Local filter</source> <target>Paikallinen suodin</target> @@ -666,11 +672,11 @@ Käsky suoritetaan jos: <source>None</source> <target>Ei ole</target> -<source>Remove alternate settings</source> -<target>Poista vaihtoehtoiset asetukset</target> +<source>Remove local settings</source> +<target>Poista paikalliset asetukset</target> -<source>Clear filter settings</source> -<target>Nollaa suodinasetukset</target> +<source>Reset local filter</source> +<target>Nollaa paikalliset suotimet</target> <source>Copy</source> <target>Monista</target> @@ -678,14 +684,8 @@ Käsky suoritetaan jos: <source>Paste</source> <target>Liitä</target> -<source>Alternate Comparison Settings</source> -<target>Vaihtoehtoiset asetukset vertailuille</target> - -<source>Alternate Synchronization Settings</source> -<target>Vaihtoehtoiset asetukset täsmäykselle</target> - -<source>Local Filter</source> -<target>Paikallinen suodin</target> +<source>Local Synchronization Settings</source> +<target>Täsmäytyksen paikalliset asetukset</target> <source>&New</source> <target>&Uusi</target> @@ -702,8 +702,8 @@ Käsky suoritetaan jos: <source>2. &Synchronize</source> <target>2. &Täsmäytä</target> -<source>&Global settings</source> -<target>&Yleiset asetukset</target> +<source>&Options</source> +<target>&Asetukset</target> <source>&Language</source> <target>&Kieli</target> @@ -726,12 +726,12 @@ Käsky suoritetaan jos: <source>&Check for new version</source> <target>&Hae uusi versio</target> -<source>Compare</source> -<target>Vertaile</target> - <source>Cancel</source> <target>Lopeta</target> +<source>Compare</source> +<target>Vertaile</target> + <source>Synchronize</source> <target>Täsmäytä</target> @@ -753,9 +753,21 @@ Käsky suoritetaan jos: <source>Match case</source> <target>Täsmäytä kirjainkoko</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> + <source>View type:</source> <target>Näytä tyyppi:</target> @@ -777,6 +789,9 @@ Käsky suoritetaan jos: <source>Total bytes to copy</source> <target>Kopioitava määrä tavuja</target> +<source>Use local settings:</source> +<target>Käytä paikallisia asetuksia:</target> + <source>Select a variant:</source> <target>Valitse vaihtoehto:</target> @@ -792,20 +807,35 @@ Käsky suoritetaan jos: <source>More information</source> <target>Lisää tietoa</target> -<source>OK</source> -<target>OK</target> +<source>Local settings:</source> +<target>Paikalliset aseukset:</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> +<source>Include:</source> +<target>Sisällytä:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Luo peilikuva vasemmasta kansiosta muokkaamalla oikeata kansiota samanlaiseksi.</target> +<source>Exclude:</source> +<target>Sulje pois:</target> -<source>Copy new and updated files to the right folder.</source> -<target>Monista uudet ja päivitetyt tiedostot oikealle.</target> +<source>Show examples</source> +<target>Näytä esimerkkejä</target> -<source>Configure your own synchronization rules.</source> -<target>Määritä omat täsmäyssäännöt.</target> +<source>Time span:</source> +<target>Aikajakso:</target> + +<source>File size:</source> +<target>Tiedoston koko:</target> + +<source>Minimum:</source> +<target>Vähintään:</target> + +<source>Maximum:</source> +<target>Enintään:</target> + +<source>&Reset</source> +<target>&Palauta</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> <source>Detect moved files</source> <target>Tunnista siirretyt tiedostot</target> @@ -821,6 +851,9 @@ Käsky suoritetaan jos: - Ei toimi kaikissa tiedostojärjestelmissä </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Tunnista tietokannan avulla täysmäyksen suuntaa</target> + <source>Delete files:</source> <target>Poista tiedosto:</target> @@ -845,9 +878,6 @@ Käsky suoritetaan jos: <source>Naming convention:</source> <target>Nimeämiskäytäntö:</target> -<source>Show examples</source> -<target>Näytä esimerkkejä</target> - <source>Handle errors:</source> <target>Hoida virheet:</target> @@ -866,8 +896,8 @@ Käsky suoritetaan jos: <source>On completion:</source> <target>Toimet kun valmis:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Tunnista tietokannan avulla täysmäyksen suuntaa</target> +<source>OK</source> +<target>OK</target> <source>Start synchronization now?</source> <target>Käynnistetäänkö täsmäytys?</target> @@ -929,30 +959,6 @@ Käsky suoritetaan jos: <source>&Recycle bin</source> <target>&Roskakori</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> - -<source>Include:</source> -<target>Sisällytä:</target> - -<source>Exclude:</source> -<target>Sulje pois:</target> - -<source>Time span:</source> -<target>Aikajakso:</target> - -<source>File size:</source> -<target>Tiedoston koko:</target> - -<source>Minimum:</source> -<target>Vähintään:</target> - -<source>Maximum:</source> -<target>Enintään:</target> - -<source>&Reset</source> -<target>&Palauta</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Näitä asetuksia käytetään kaikkiin täsmäyksiin.</target> @@ -996,7 +1002,7 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <target>Viive (sekunneissa):</target> <source>Customize context menu:</source> -<target>Muokkaa kontekstivalikko:</target> +<target>Muokkaa kontekstivalikkoa:</target> <source>Description</source> <target>Kuvaus</target> @@ -1037,12 +1043,15 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Delete Items</source> <target>Poista kohteet</target> -<source>Global Settings</source> -<target>Yleiset asetukset</target> +<source>Options</source> +<target>Asetukset</target> <source>Select Time Span</source> <target>Valitse aikajakso</target> +<source>&Preferences...</source> +<target>&Ominaisuudet</target> + <source>Folder Pairs</source> <target>Hakemistoparit</target> @@ -1061,12 +1070,6 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Main Bar</source> <target>Pääpalkki</target> -<source>Open...</source> -<target>Avaa...</target> - -<source>Save</source> -<target>Tallenna</target> - <source>Compare both sides</source> <target>Vertaile molempia puolia</target> @@ -1193,8 +1196,11 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Delete selected configurations</source> <target>Poista valitus määrittelyt</target> -<source>Filter</source> -<target>Suodin</target> +<source>Synchronization Settings</source> +<target>Täsmäyksen asetukset</target> + +<source>Reset filter</source> +<target>Nollaa suodin</target> <source>Show files that exist on left side only</source> <target>Näytä vain vasemmalla esiintyvät tiedostot</target> @@ -1244,14 +1250,11 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Set as default</source> <target>Aseta oletukseksi</target> -<source>All files are in sync</source> -<target>Kaikki tiedostot ovat ajan tasalla</target> - -<source>Synchronization Settings</source> -<target>Täsmäyksen asetukset</target> +<source>Filter</source> +<target>Suodin</target> -<source>Comparison Settings</source> -<target>Vertailun asetukset</target> +<source>All files are in sync</source> +<target>Kaikki tiedostot ovat ajantasalla</target> <source>Cannot find %x</source> <target>En löydä %x</target> @@ -1313,30 +1316,6 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Log</source> <target>Loki</target> -<source>Today</source> -<target>Tänään</target> - -<source>This week</source> -<target>Tällä viikolla</target> - -<source>This month</source> -<target>Tässä kuussa</target> - -<source>This year</source> -<target>Tänä vuonna</target> - -<source>Last x days</source> -<target>Viimeiset x päivää</target> - -<source>Byte</source> -<target>tavua</target> - -<source>KB</source> -<target>kt</target> - -<source>MB</source> -<target>Mt</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1358,14 +1337,8 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <pluralform>Haluatko todella poistaa nämä %x kohdetta?</pluralform> </target> -<source>Exclude</source> -<target>Sulje pois</target> - -<source>Direct</source> -<target>Suoraan</target> - -<source>Follow</source> -<target>Seuraa</target> +<source>Preferences</source> +<target>Ominaisuudet</target> <source>Copy NTFS permissions</source> <target>Kopioi NTFS-oikeudet</target> @@ -1388,8 +1361,50 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <source>Restore all hidden windows and warnings?</source> <target>Palauta kaikki piiloitetut ikkunat ja varoitukset?</target> -<source>Leave as unresolved conflict</source> -<target>Jätä ratkaisemattomana ristiriitana</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> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Luo peilikuva vasemmasta kansiosta muokkaamalla oikeata kansiota samanlaiseksi.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Monista uudet ja päivitetyt tiedostot oikealle.</target> + +<source>Configure your own synchronization rules.</source> +<target>Määritä omat täsmäyssäännöt.</target> + +<source>Exclude</source> +<target>Sulje pois</target> + +<source>Direct</source> +<target>Suoraan</target> + +<source>Follow</source> +<target>Seuraa</target> + +<source>Today</source> +<target>Tänään</target> + +<source>This week</source> +<target>Tällä viikolla</target> + +<source>This month</source> +<target>Tässä kuussa</target> + +<source>This year</source> +<target>Tänä vuonna</target> + +<source>Last x days</source> +<target>Viimeiset x päivää</target> + +<source>Byte</source> +<target>tavua</target> + +<source>KB</source> +<target>kt</target> + +<source>MB</source> +<target>Mt</target> <source>Replace</source> <target>Korvaa</target> @@ -1401,7 +1416,16 @@ Tällä varmistetaan eheys, vaikka vakava virhe tapahtuisi. <target>Aikaleima</target> <source>Append a time stamp to each file name</source> -<target>Lisää aikaleima tiedostoihin</target> +<target>Lisää tiedostoihin aikaleimat</target> + +<source>Comparison</source> +<target>Vertailu</target> + +<source>Synchronization</source> +<target>Täsmäytys</target> + +<source>Leave as unresolved conflict</source> +<target>Jätä ratkaisemattomana ristiriitana</target> <source>File</source> <target>Tiedosto</target> diff --git a/FreeFileSync/Build/Languages/french.lng b/FreeFileSync/Build/Languages/french.lng index d8e2b7ac..3b1354e2 100644 --- a/FreeFileSync/Build/Languages/french.lng +++ b/FreeFileSync/Build/Languages/french.lng @@ -7,39 +7,6 @@ <plural_definition>n <= 1 ? 0 : 1</plural_definition> </header> -<source>Synchronization</source> -<target></target> - -<source>Comparison</source> -<target></target> - -<source>Local settings:</source> -<target></target> - -<source>Use local settings:</source> -<target></target> - -<source>Save as...</source> -<target></target> - -<source>Save as GUI job</source> -<target></target> - -<source>Local Synchronization Settings</source> -<target></target> - -<source>Any number of alternative directory pairs for at most one config file.</source> -<target></target> - -<source>Path to an alternate GlobalSettings.xml file.</source> -<target></target> - -<source>config files:</source> -<target></target> - -<source>global config file:</source> -<target></target> - <source>Both sides have changed since last synchronization.</source> <target>Les deux côtés ont changé depuis la dernière synchronisation.</target> @@ -109,12 +76,24 @@ <source>Syntax:</source> <target>Syntaxe :</target> +<source>global config file:</source> +<target>fichier de configuration globale</target> + +<source>config files:</source> +<target>fichier de configuration</target> + <source>directory</source> <target>répertoire</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Chemin d'un fichier GlobalSettings.xml distinct</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>N'importe quel nombre de fichiers FreeFileSync .ffs_gui et/ou .ffs_batch.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>N'importe quel nombre de paires de répertoires distincts pour au plus un fichier de configuration</target> + <source>Cannot find the following folders:</source> <target>Impossible de trouver les dossiers suivants :</target> @@ -678,11 +657,11 @@ La commande est déclenchée si : <source>Drag && drop</source> <target>Glisser && Déposer</target> -<source>Alternate comparison settings</source> -<target>configuration distincte de la comparaison</target> +<source>Local comparison settings</source> +<target>Paramètres de comparaison locaux</target> -<source>Alternate synchronization settings</source> -<target>configuration distincte de la synchronisation</target> +<source>Local synchronization settings</source> +<target>Paramètres de synchronisation locaux</target> <source>Local filter</source> <target>Filtre local</target> @@ -693,11 +672,11 @@ La commande est déclenchée si : <source>None</source> <target>Aucun</target> -<source>Remove alternate settings</source> -<target>Supprimer les paramètres de rechange</target> +<source>Remove local settings</source> +<target>supprimer les paramètres locaux</target> -<source>Clear filter settings</source> -<target>Effacer la configuration du filtrage</target> +<source>Reset local filter</source> +<target>Réinitialiser le filtre local</target> <source>Copy</source> <target>Copier</target> @@ -705,6 +684,9 @@ La commande est déclenchée si : <source>Paste</source> <target>Coller</target> +<source>Local Synchronization Settings</source> +<target>Paramètres de synchronisation locaux</target> + <source>&New</source> <target>&Nouveau</target> @@ -720,8 +702,8 @@ La commande est déclenchée si : <source>2. &Synchronize</source> <target>2. &Synchroniser</target> -<source>&Global settings</source> -<target>&Paramètres généraux</target> +<source>&Options</source> +<target>&Options</target> <source>&Language</source> <target>&Langue</target> @@ -744,12 +726,12 @@ La commande est déclenchée si : <source>&Check for new version</source> <target>&Vérifier les nouvelles versions</target> -<source>Compare</source> -<target>Comparer</target> - <source>Cancel</source> <target>Annuler</target> +<source>Compare</source> +<target>Comparer</target> + <source>Synchronize</source> <target>Synchroniser</target> @@ -777,8 +759,14 @@ La commande est déclenchée si : <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>Enrgistrer en temps que fichier batch</target> +<target>Enregistrer en tant que fichier batch</target> + +<source>Save as...</source> +<target>Enregistrer en tant que...</target> <source>View type:</source> <target>Type de vue :</target> @@ -801,6 +789,9 @@ La commande est déclenchée si : <source>Total bytes to copy</source> <target>Nombre total d'octets à copier</target> +<source>Use local settings:</source> +<target>Utiliser les paramètres locaux</target> + <source>Select a variant:</source> <target>Choisir une variante :</target> @@ -816,6 +807,9 @@ La commande est déclenchée si : <source>More information</source> <target>Plus d'informations</target> +<source>Local settings:</source> +<target>Paramètres locaux</target> + <source>Include:</source> <target>Inclure :</target> @@ -1049,12 +1043,15 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>Delete Items</source> <target>Supprimer les Éléments</target> -<source>Global Settings</source> -<target>Configuration Générale</target> +<source>Options</source> +<target>Options</target> <source>Select Time Span</source> <target>Sélection de l'Intervalle de Temps</target> +<source>&Preferences...</source> +<target>&Préférences...</target> + <source>Folder Pairs</source> <target>Paires de Dossiers</target> @@ -1202,6 +1199,9 @@ 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>Show files that exist on left side only</source> <target>Afficher les fichiers existant seulement à gauche</target> @@ -1337,6 +1337,9 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <pluralform>Voulez-vous vraiment supprimer ces %x éléments ?</pluralform> </target> +<source>Preferences</source> +<target>Préférences</target> + <source>Copy NTFS permissions</source> <target>Copie des droits NTFS</target> @@ -1415,6 +1418,12 @@ Cela garantit la cohérence du système de fichiers en cas d'erreur grave. <source>Append a time stamp to each file name</source> <target>Ajouter un horodatage à chaque nom de fichier</target> +<source>Comparison</source> +<target>Comparaison</target> + +<source>Synchronization</source> +<target>Synchronisation</target> + <source>Leave as unresolved conflict</source> <target>Abandonner en tant que conflit non résolu</target> diff --git a/FreeFileSync/Build/Languages/german.lng b/FreeFileSync/Build/Languages/german.lng index ed93726d..3e22e0cf 100644 --- a/FreeFileSync/Build/Languages/german.lng +++ b/FreeFileSync/Build/Languages/german.lng @@ -657,11 +657,11 @@ Die Befehlszeile wird ausgelöst, wenn: <source>Drag && drop</source> <target>Drag && Drop</target> -<source>Alternate comparison settings</source> -<target>Alternative Vergleichseinstellungen</target> +<source>Local comparison settings</source> +<target>Lokale Vergleichseinstellungen</target> -<source>Alternate synchronization settings</source> -<target>Alternative Synchronisationseinstellungen</target> +<source>Local synchronization settings</source> +<target>Lokale Synchronisationseinstellungen</target> <source>Local filter</source> <target>Lokaler Filter</target> @@ -672,11 +672,11 @@ Die Befehlszeile wird ausgelöst, wenn: <source>None</source> <target>Ohne</target> -<source>Remove alternate settings</source> -<target>Alternative Einstellungen entfernen</target> +<source>Remove local settings</source> +<target>Lokale Einstellungen entfernen</target> -<source>Clear filter settings</source> -<target>Filtereinstellungen löschen</target> +<source>Reset local filter</source> +<target>Lokalen Filter zurücksetzen</target> <source>Copy</source> <target>Kopieren</target> @@ -702,8 +702,8 @@ Die Befehlszeile wird ausgelöst, wenn: <source>2. &Synchronize</source> <target>2. &Synchronisieren</target> -<source>&Global settings</source> -<target>&Globale Einstellungen</target> +<source>&Options</source> +<target>&Optionen</target> <source>&Language</source> <target>&Sprache</target> @@ -1043,12 +1043,15 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. <source>Delete Items</source> <target>Elemente löschen</target> -<source>Global Settings</source> -<target>Globale Einstellungen</target> +<source>Options</source> +<target>Optionen</target> <source>Select Time Span</source> <target>Zeitspanne auswählen</target> +<source>&Preferences...</source> +<target>&Einstellungen</target> + <source>Folder Pairs</source> <target>Ordnerpaare</target> @@ -1196,6 +1199,9 @@ 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>Show files that exist on left side only</source> <target>Nur links existierende Dateien anzeigen</target> @@ -1331,6 +1337,9 @@ Dadurch wird ein konsistenter Datenstand auch im schweren Fehlerfall garantiert. <pluralform>Sollen die folgenden %x Elemente wirklich gelöscht werden?</pluralform> </target> +<source>Preferences</source> +<target>Einstellungen</target> + <source>Copy NTFS permissions</source> <target>NTFS Berechtigungen kopieren</target> diff --git a/FreeFileSync/Build/Languages/greek.lng b/FreeFileSync/Build/Languages/greek.lng index 33b08da6..bd43c21c 100644 --- a/FreeFileSync/Build/Languages/greek.lng +++ b/FreeFileSync/Build/Languages/greek.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>Σύνταξη:</target> -<source>config files</source> -<target>αρχεία διάταξης</target> +<source>global config file:</source> +<target>αρχείο γενικών ρυθμίσεων:</target> + +<source>config files:</source> +<target>αρχεία ρυθμίσεων:</target> <source>directory</source> <target>υποκατάλογος</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Διαδρομή σε ένα εναλλακτικό αρχείο GlobalSettings.xml</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Οποιοσδήποτε αριθμός αρχείων διάταξης .ffs_gui ή/και .ffs_batch του FreeFileSync</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Οποιοσδήποτε αριθμός εναλλακτικών υποκαταλόγων για το πολύ ένα αρχείο διάταξης.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Οποιοσδήποτε αριθμός από εναλλακτικά ζεύγη υποκαταλόγων για το πολύ ένα αρχείο ρυθμίσεων.</target> <source>Cannot find the following folders:</source> <target>Οι ακόλουθοι υποκατάλογοι δεν ήταν δυνατό να βρεθούν:</target> @@ -651,11 +657,11 @@ The command is triggered if: <source>Drag && drop</source> <target>Μεταφορά && Απόθεση</target> -<source>Alternate comparison settings</source> -<target>Διαφοροποιημένες ρυθμίσεις σύγκρισης</target> +<source>Local comparison settings</source> +<target>Τοπικές ρυθμίσεις σύγκρισης</target> -<source>Alternate synchronization settings</source> -<target>Διαφοροποιημένες ρυθμίσεις συγχρονισμού</target> +<source>Local synchronization settings</source> +<target>Τοπικές ρυθμίσεις συγχρονισμού</target> <source>Local filter</source> <target>Τοπικό φίλτρο</target> @@ -666,11 +672,11 @@ The command is triggered if: <source>None</source> <target>Καθόλου</target> -<source>Remove alternate settings</source> -<target>Διαγραφή των διαφοροποιημένων ρυθμίσεων</target> +<source>Remove local settings</source> +<target>Αφαίρεση τοπικών ρυθμίσεων</target> -<source>Clear filter settings</source> -<target>Διαγραφή όλων των ρυθμίσεων φίλτρου</target> +<source>Reset local filter</source> +<target>Αφαίρεση τοπικού φίλτρου</target> <source>Copy</source> <target>Αντιγραφή</target> @@ -678,14 +684,8 @@ The command is triggered if: <source>Paste</source> <target>Επικόλληση</target> -<source>Alternate Comparison Settings</source> -<target>Διαφοροποιημένες Ρυθμίσεις Σύγκρισης</target> - -<source>Alternate Synchronization Settings</source> -<target>Διαφοροποιημένες Ρυθμίσεις Συγχρονισμού</target> - -<source>Local Filter</source> -<target>Τοπικό Φίλτρο</target> +<source>Local Synchronization Settings</source> +<target>Τοπικές Ρυθμίσεις Συγχρονισμού</target> <source>&New</source> <target>&Δημιουργία</target> @@ -702,14 +702,14 @@ The command is triggered if: <source>2. &Synchronize</source> <target>2. Συ&γχρονισμός</target> -<source>&Global settings</source> -<target>Γενικές &ρυθμίσεις</target> +<source>&Options</source> +<target>&Επιλογές</target> <source>&Language</source> <target>&Γλώσσα</target> <source>&Find...</source> -<target>&Εύρεση</target> +<target>Εύ&ρεση</target> <source>&Export file list...</source> <target>Ε&ξαγωγή καταλόγου αρχείων...</target> @@ -726,12 +726,12 @@ The command is triggered if: <source>&Check for new version</source> <target>Έλεγχος για &νέα έκδοση</target> -<source>Compare</source> -<target>Σύγκριση</target> - <source>Cancel</source> <target>Άκυρο</target> +<source>Compare</source> +<target>Σύγκριση</target> + <source>Synchronize</source> <target>Συγχρονισμός</target> @@ -753,9 +753,21 @@ The command is triggered if: <source>Match case</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> @@ -777,6 +789,9 @@ The command is triggered if: <source>Total bytes to copy</source> <target>Συνολικός αριθμός bytes προς αντιγραφή</target> +<source>Use local settings:</source> +<target>Χρήση τοπικών ρυθμίσεων:</target> + <source>Select a variant:</source> <target>Επιλογή μεθόδου:</target> @@ -792,20 +807,35 @@ The command is triggered if: <source>More information</source> <target>Περισσότερες πληροφορίες</target> -<source>OK</source> -<target>OK</target> +<source>Local settings:</source> +<target>Τοπικές ρυθμίσεις:</target> -<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> -<target>Αναγνώριση και εφαρμογή αλλαγών και στις δυο πλευρές. Οι διαγραφές, οι μεταφορές και οι διενέξεις αναγνωρίζονται αυτόματα με τη βοήθεια μιας βάσης δεδομένων.</target> +<source>Include:</source> +<target>Συμπερίληψη:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Τροποποίηση του υποκαταλόγου δεξιά, ώστε να γίνει ακριβές αντίγραφο του υποκαταλόγου αριστερά.</target> +<source>Exclude:</source> +<target>Αποκλεισμός:</target> -<source>Copy new and updated files to the right folder.</source> -<target>Αντιγραφή των νέων και των τροποποιημένων αρχείων στον υποκατάλογο δεξιά.</target> +<source>Show examples</source> +<target>Εμφάνιση παραδειγμάτων</target> -<source>Configure your own synchronization rules.</source> -<target>Ορίστε τους δικούς σας κανόνες συγχρονισμού.</target> +<source>Time span:</source> +<target>Χρονικό εύρος:</target> + +<source>File size:</source> +<target>Μέγεθος αρχείου:</target> + +<source>Minimum:</source> +<target>Ελάχιστο:</target> + +<source>Maximum:</source> +<target>Μέγιστο</target> + +<source>&Reset</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> <source>Detect moved files</source> <target>Ανίχνευση των αρχείων που μεταφέρθηκαν</target> @@ -821,6 +851,9 @@ The command is triggered if: - Δεν υποστηρίζεται από όλα τα συστήματα αρχείων </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Ανίχνευση της κατεύθυνσης συγχρονισμού με τη βοήθεια βάσεων δεδομένων</target> + <source>Delete files:</source> <target>Διαγραφή αρχείων:</target> @@ -845,9 +878,6 @@ The command is triggered if: <source>Naming convention:</source> <target>Τρόπος ονομασίας:</target> -<source>Show examples</source> -<target>Εμφάνιση παραδειγμάτων</target> - <source>Handle errors:</source> <target>Χειρισμός σφαλμάτων:</target> @@ -866,8 +896,8 @@ The command is triggered if: <source>On completion:</source> <target>Μετά την ολοκλήρωση:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Ανίχνευση της κατεύθυνσης συγχρονισμού με τη βοήθεια βάσεων δεδομένων</target> +<source>OK</source> +<target>OK</target> <source>Start synchronization now?</source> <target>Να ξεκινήσει ο συγχρονισμός τώρα;</target> @@ -929,30 +959,6 @@ The command is triggered if: <source>&Recycle bin</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> - -<source>Include:</source> -<target>Συμπερίληψη:</target> - -<source>Exclude:</source> -<target>Αποκλεισμός:</target> - -<source>Time span:</source> -<target>Χρονικό εύρος:</target> - -<source>File size:</source> -<target>Μέγεθος αρχείου:</target> - -<source>Minimum:</source> -<target>Ελάχιστο:</target> - -<source>Maximum:</source> -<target>Μέγιστο</target> - -<source>&Reset</source> -<target>&Επαναφορά</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Οι ακόλουθες ρυθμίσεις χρησιμοποιούνται για όλες τις εργασίες συγχρονισμού.</target> @@ -1037,12 +1043,15 @@ This guarantees a consistent state even in case of a serious error. <source>Delete Items</source> <target>Διαγραφή Στοιχείων</target> -<source>Global Settings</source> -<target>Γενικές Ρυθμίσεις</target> +<source>Options</source> +<target>Επιλογές</target> <source>Select Time Span</source> <target>Επιλογή Χρονικού Εύρους</target> +<source>&Preferences...</source> +<target>&Προτιμήσεις...</target> + <source>Folder Pairs</source> <target>Ζεύγη Υποκαταλόγων</target> @@ -1061,12 +1070,6 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>Κύρια Γραμμή</target> -<source>Open...</source> -<target>Άνοιγμα...</target> - -<source>Save</source> -<target>Αποθήκευση</target> - <source>Compare both sides</source> <target>Σύγκριση των δύο πλευρών</target> @@ -1193,8 +1196,11 @@ This guarantees a consistent state even in case of a serious error. <source>Delete selected configurations</source> <target>Διαγραφή επιλεγμένων διατάξεων</target> -<source>Filter</source> -<target>Φίλτρο</target> +<source>Synchronization Settings</source> +<target>Ρυθμίσεις συγχρονισμού</target> + +<source>Reset filter</source> +<target>Επαναφορά φίλτρου</target> <source>Show files that exist on left side only</source> <target>Εμφάνιση των αρχείων που υπάρχουν μόνο στα αριστερά</target> @@ -1244,15 +1250,12 @@ This guarantees a consistent state even in case of a serious error. <source>Set as default</source> <target>Ορισμός ως προεπιλογής</target> +<source>Filter</source> +<target>Φίλτρο</target> + <source>All files are in sync</source> <target>Όλα τα αρχεία είναι συγχρονισμένα</target> -<source>Synchronization Settings</source> -<target>Ρυθμίσεις συγχρονισμού</target> - -<source>Comparison Settings</source> -<target>Ρυθμίσεις Σύγκρισης</target> - <source>Cannot find %x</source> <target>Δεν μπορεί να βρεθεί το %x</target> @@ -1313,30 +1316,6 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>Καταγραφή</target> -<source>Today</source> -<target>Σήμερα</target> - -<source>This week</source> -<target>Αυτήν την εβδομάδα</target> - -<source>This month</source> -<target>Αυτόν το μήνα</target> - -<source>This year</source> -<target>Αυτό το έτος</target> - -<source>Last x days</source> -<target>Τελευταίες x ημέρες</target> - -<source>Byte</source> -<target>Byte</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1358,14 +1337,8 @@ This guarantees a consistent state even in case of a serious error. <pluralform>Είσαι σίγουρος ότι θέλεις να διαγραφούν τα ακόλουθα %x αντικείμενα;</pluralform> </target> -<source>Exclude</source> -<target>Εξαίρεση</target> - -<source>Direct</source> -<target>Ως δεσμοί</target> - -<source>Follow</source> -<target>Ως περιεχόμενο</target> +<source>Preferences</source> +<target>Προτιμήσεις</target> <source>Copy NTFS permissions</source> <target>Αντιγραφή αδειών προσπέλασης NTFS</target> @@ -1388,8 +1361,50 @@ This guarantees a consistent state even in case of a serious error. <source>Restore all hidden windows and warnings?</source> <target>Να γίνει επαναφορά όλων των κρυμμένων μηνυμάτων και προειδοποιήσεων;</target> -<source>Leave as unresolved conflict</source> -<target>Παράβλεψη ως ανεπίλυτη διένεξη</target> +<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> +<target>Αναγνώριση και εφαρμογή αλλαγών και στις δυο πλευρές. Οι διαγραφές, οι μεταφορές και οι διενέξεις αναγνωρίζονται αυτόματα με τη βοήθεια μιας βάσης δεδομένων.</target> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Τροποποίηση του υποκαταλόγου δεξιά, ώστε να γίνει ακριβές αντίγραφο του υποκαταλόγου αριστερά.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Αντιγραφή των νέων και των τροποποιημένων αρχείων στον υποκατάλογο δεξιά.</target> + +<source>Configure your own synchronization rules.</source> +<target>Ορίστε τους δικούς σας κανόνες συγχρονισμού.</target> + +<source>Exclude</source> +<target>Εξαίρεση</target> + +<source>Direct</source> +<target>Ως δεσμοί</target> + +<source>Follow</source> +<target>Ως περιεχόμενο</target> + +<source>Today</source> +<target>Σήμερα</target> + +<source>This week</source> +<target>Αυτήν την εβδομάδα</target> + +<source>This month</source> +<target>Αυτόν το μήνα</target> + +<source>This year</source> +<target>Αυτό το έτος</target> + +<source>Last x days</source> +<target>Τελευταίες x ημέρες</target> + +<source>Byte</source> +<target>Byte</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>Αντικατάσταση προηγούμενης</target> @@ -1403,6 +1418,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>Προσάρτηση χρονικής σήμανσης στο όνομα κάθε αρχείου</target> +<source>Comparison</source> +<target>Σύγκριση</target> + +<source>Synchronization</source> +<target>Συγχρονισμός</target> + +<source>Leave as unresolved conflict</source> +<target>Παράβλεψη ως ανεπίλυτη διένεξη</target> + <source>File</source> <target>Αρχείο</target> diff --git a/FreeFileSync/Build/Languages/hebrew.lng b/FreeFileSync/Build/Languages/hebrew.lng index 93cedce0..6cc85cf4 100644 --- a/FreeFileSync/Build/Languages/hebrew.lng +++ b/FreeFileSync/Build/Languages/hebrew.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>תחביר:</target> -<source>config files</source> -<target>קבצי קונפיגורציה</target> +<source>global config file:</source> +<target>קבצי תצורה גלובליים</target> + +<source>config files:</source> +<target>קבצי תצורה</target> <source>directory</source> <target>מחיצה</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>נתיב אל קובץ GlobalSettingd.xml אלטרנטיבי</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>כל כמות של קבצי FreeFileSync .ffs_gui ו\או קבצי קונפיגורציה .ffs_batch.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>כל כמות של מחיצות אלטרנטיביות עבור לפחות קובץ קונפיגורציה אחד.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>כל כמות של זוגות מחיצות אלטרנטיביות עבור קובץ תצורה אחד לפחות.</target> <source>Cannot find the following folders:</source> <target>לא יכול למצוא את המחיצות הבאות:</target> @@ -651,11 +657,11 @@ The command is triggered if: <source>Drag && drop</source> <target>גרור &והשלך</target> -<source>Alternate comparison settings</source> -<target>הגדרות השוואה חלופיות</target> +<source>Local comparison settings</source> +<target>הגדרות השוואה מקומיות</target> -<source>Alternate synchronization settings</source> -<target>הגדרות סנכרון חלופיות</target> +<source>Local synchronization settings</source> +<target>הגדרות סינכרון מקומיות</target> <source>Local filter</source> <target>מסנן מקומי</target> @@ -666,11 +672,11 @@ The command is triggered if: <source>None</source> <target>אין</target> -<source>Remove alternate settings</source> -<target>הסר הגדרות תצורה חליפיות</target> +<source>Remove local settings</source> +<target>הסר הגדרות מקומיות</target> -<source>Clear filter settings</source> -<target>נקה בחירת מסנן</target> +<source>Reset local filter</source> +<target>אפס מסנן מקומי</target> <source>Copy</source> <target>העתק</target> @@ -678,14 +684,8 @@ The command is triggered if: <source>Paste</source> <target>הדבק</target> -<source>Alternate Comparison Settings</source> -<target>הגדרות השוואה חלופיות</target> - -<source>Alternate Synchronization Settings</source> -<target>הגדרות סנכרון חלופיות</target> - -<source>Local Filter</source> -<target>מסנן מקומי</target> +<source>Local Synchronization Settings</source> +<target>הגדרות סינכרון מקומיות</target> <source>&New</source> <target>&חדש</target> @@ -702,8 +702,8 @@ The command is triggered if: <source>2. &Synchronize</source> <target>2. &סנכרן</target> -<source>&Global settings</source> -<target>&משתנים גלובליים</target> +<source>&Options</source> +<target>&אפשרויות</target> <source>&Language</source> <target>&שפה</target> @@ -726,12 +726,12 @@ The command is triggered if: <source>&Check for new version</source> <target>&בדוק קיום גירסה חדשה</target> -<source>Compare</source> -<target>השוואה</target> - <source>Cancel</source> <target>בטל</target> +<source>Compare</source> +<target>השוואה</target> + <source>Synchronize</source> <target>סנכרן</target> @@ -753,9 +753,21 @@ The command is triggered if: <source>Match case</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> @@ -777,6 +789,9 @@ The command is triggered if: <source>Total bytes to copy</source> <target>סה"כ בתים להעתיק</target> +<source>Use local settings:</source> +<target>השתמש בהגדרות מקומיות:</target> + <source>Select a variant:</source> <target>בחר גירסה:</target> @@ -792,20 +807,35 @@ The command is triggered if: <source>More information</source> <target>מידע נוסף</target> -<source>OK</source> -<target>אשר</target> +<source>Local settings:</source> +<target>הגדרות מקומיות:</target> -<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> -<target>זהה והפץ שינויים בשני הצדדים. מחיקות העברות וסתירות מתגלים באופן אוטומטי באמצעות מסד נתונים.</target> +<source>Include:</source> +<target>כלול:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>צור גיבוי מראה של התיקיה משמאל באמצעות התאמת התיקיה מימין להתאמה.</target> +<source>Exclude:</source> +<target>לא לכלול:</target> -<source>Copy new and updated files to the right folder.</source> -<target>העתק קבצים חדשים ומעודכנים לתיקייה הימנית.</target> +<source>Show examples</source> +<target>הראה דוגמאות</target> -<source>Configure your own synchronization rules.</source> -<target>סדר את כללי הסנכרון שלך.</target> +<source>Time span:</source> +<target>טווח זמן:</target> + +<source>File size:</source> +<target>גודל קובץ:</target> + +<source>Minimum:</source> +<target>מינימום:</target> + +<source>Maximum:</source> +<target>מקסימום:</target> + +<source>&Reset</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> <source>Detect moved files</source> <target>גלה קבצים מועברים</target> @@ -821,6 +851,9 @@ The command is triggered if: - לא נתמך ע"י כל מערכות הקבצים </target> +<source>Detect synchronization directions with the help of database files</source> +<target>גלה כיווני סינכרון באמצעות קבצי בסיס נתונים</target> + <source>Delete files:</source> <target>מחק קבצים:</target> @@ -845,9 +878,6 @@ The command is triggered if: <source>Naming convention:</source> <target>מוסכמות לקביעת שמות:</target> -<source>Show examples</source> -<target>הראה דוגמאות</target> - <source>Handle errors:</source> <target>טפל בשגיאות:</target> @@ -866,8 +896,8 @@ The command is triggered if: <source>On completion:</source> <target>עם הסיום:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>גלה כיווני סינכרון באמצעות קבצי בסיס נתונים</target> +<source>OK</source> +<target>אשר</target> <source>Start synchronization now?</source> <target>האם להתחיל סנכרון עכשיו?</target> @@ -929,30 +959,6 @@ The command is triggered if: <source>&Recycle bin</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> - -<source>Include:</source> -<target>כלול:</target> - -<source>Exclude:</source> -<target>לא לכלול:</target> - -<source>Time span:</source> -<target>טווח זמן:</target> - -<source>File size:</source> -<target>גודל קובץ:</target> - -<source>Minimum:</source> -<target>מינימום:</target> - -<source>Maximum:</source> -<target>מקסימום:</target> - -<source>&Reset</source> -<target>&אפס</target> - <source>The following settings are used for all synchronization jobs.</source> <target>ההגדרות הבאות משמשות לכל משימות הסנכרון.</target> @@ -1037,12 +1043,15 @@ This guarantees a consistent state even in case of a serious error. <source>Delete Items</source> <target>מחק פריטים</target> -<source>Global Settings</source> -<target>הגדרות גלובליות</target> +<source>Options</source> +<target>אפשרויות</target> <source>Select Time Span</source> <target>בחר טווח זמן</target> +<source>&Preferences...</source> +<target>&העדפות...</target> + <source>Folder Pairs</source> <target>זוגות תיקיות</target> @@ -1061,12 +1070,6 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>סרגל ראשי</target> -<source>Open...</source> -<target>פתח...</target> - -<source>Save</source> -<target>שמור</target> - <source>Compare both sides</source> <target>השווה בין שני הצדדים</target> @@ -1193,8 +1196,11 @@ This guarantees a consistent state even in case of a serious error. <source>Delete selected configurations</source> <target>מחק קופיגורציות שנבחרו</target> -<source>Filter</source> -<target>מסנן</target> +<source>Synchronization Settings</source> +<target>הגדרות סנכרון</target> + +<source>Reset filter</source> +<target>אפס מסנן</target> <source>Show files that exist on left side only</source> <target>הראה קבצים הנמצאים אך ורק בצד ימין</target> @@ -1244,15 +1250,12 @@ This guarantees a consistent state even in case of a serious error. <source>Set as default</source> <target>הגדר כברירת מחדל</target> +<source>Filter</source> +<target>מסנן</target> + <source>All files are in sync</source> <target>כל הקבצים מסונכרנים</target> -<source>Synchronization Settings</source> -<target>הגדרות סנכרון</target> - -<source>Comparison Settings</source> -<target>הגדרות השוואה</target> - <source>Cannot find %x</source> <target>לא מוצא %x</target> @@ -1313,30 +1316,6 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>יומן</target> -<source>Today</source> -<target>היום</target> - -<source>This week</source> -<target>בשבוע הנוכחי</target> - -<source>This month</source> -<target>בחודש הנוכחי</target> - -<source>This year</source> -<target>בשנה הנוכחית</target> - -<source>Last x days</source> -<target>x ימים אחרונים</target> - -<source>Byte</source> -<target>בייט</target> - -<source>KB</source> -<target>קילו-בייט</target> - -<source>MB</source> -<target>מגה-בייט</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1358,14 +1337,8 @@ This guarantees a consistent state even in case of a serious error. <pluralform>האם ברצונך למחוק את הפריטים %x הבאים?</pluralform> </target> -<source>Exclude</source> -<target>אל תכלול</target> - -<source>Direct</source> -<target>כוון</target> - -<source>Follow</source> -<target>עקוב</target> +<source>Preferences</source> +<target>העדפות</target> <source>Copy NTFS permissions</source> <target>העתק הרשאות NTFS</target> @@ -1388,8 +1361,50 @@ This guarantees a consistent state even in case of a serious error. <source>Restore all hidden windows and warnings?</source> <target>האם לשחזר את כל החלונות וההודעות הנסתרות?</target> -<source>Leave as unresolved conflict</source> -<target>השאר כקונפליקט לא מטופל</target> +<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> +<target>זהה והפץ שינויים בשני הצדדים. מחיקות העברות וסתירות מתגלים באופן אוטומטי באמצעות מסד נתונים.</target> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>צור גיבוי מראה של התיקיה משמאל באמצעות התאמת התיקיה מימין להתאמה.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>העתק קבצים חדשים ומעודכנים לתיקייה הימנית.</target> + +<source>Configure your own synchronization rules.</source> +<target>סדר את כללי הסנכרון שלך.</target> + +<source>Exclude</source> +<target>אל תכלול</target> + +<source>Direct</source> +<target>כוון</target> + +<source>Follow</source> +<target>עקוב</target> + +<source>Today</source> +<target>היום</target> + +<source>This week</source> +<target>בשבוע הנוכחי</target> + +<source>This month</source> +<target>בחודש הנוכחי</target> + +<source>This year</source> +<target>בשנה הנוכחית</target> + +<source>Last x days</source> +<target>x ימים אחרונים</target> + +<source>Byte</source> +<target>בייט</target> + +<source>KB</source> +<target>קילו-בייט</target> + +<source>MB</source> +<target>מגה-בייט</target> <source>Replace</source> <target>החלף</target> @@ -1403,6 +1418,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>הוסף חתימת זמן לכל שם קובץ</target> +<source>Comparison</source> +<target>השוואה</target> + +<source>Synchronization</source> +<target>סינכרון</target> + +<source>Leave as unresolved conflict</source> +<target>השאר כקונפליקט לא מטופל</target> + <source>File</source> <target>קובץ</target> diff --git a/FreeFileSync/Build/Languages/hungarian.lng b/FreeFileSync/Build/Languages/hungarian.lng index 9561f690..9be6e899 100644 --- a/FreeFileSync/Build/Languages/hungarian.lng +++ b/FreeFileSync/Build/Languages/hungarian.lng @@ -76,23 +76,29 @@ <source>Syntax:</source> <target>Szintaxis:</target> -<source>config files</source> -<target>konfigurációs fájlok</target> +<source>global config file:</source> +<target>globális konfigurációs fájl:</target> + +<source>config files:</source> +<target>konfigurációs fájlok:</target> <source>directory</source> <target>könyvtár</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Útvonal egy alternatív GlobalSettings.xml fájlhoz.</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Tetszőleges számú .ffs_gui és/vagy .ffs_batch konfigurációs fájl készíthető a FreeFileSync-hez</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Tetszőleges számú alternatív könyvtár legfeljebb egy konfigurációs fájlhoz</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Tetszőleges számú alternatív könyvtár-pár legfeljebb egy konfigurációs fájlban.</target> <source>Cannot find the following folders:</source> <target>A következő könyvtárak nem találhatóak:</target> <source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source> -<target>Figyelmen kívül hagyhatod ezt a hibát, ezzel üresnek tekintve minden egyes könyvtárat. A könytárak ekkor automatikusan létrejönnek a szinkronizálás folyamán.</target> +<target>Figyelmen kívül hagyhatod ezt a hibát, ezzel üresnek tekintve minden egyes könyvtárat. A könyvtárak ekkor automatikusan létrejönnek a szinkronizálás folyamán.</target> <source>A folder input field is empty.</source> <target>A könyvtár beviteli mező üres.</target> @@ -651,11 +657,11 @@ A parancs végrehajtódik, ha: <source>Drag && drop</source> <target>Húzd && Ejtsd</target> -<source>Alternate comparison settings</source> -<target>Megváltoztatja az összehasonlítási beállításokat</target> +<source>Local comparison settings</source> +<target>Helyi összehasonlítási beállítások</target> -<source>Alternate synchronization settings</source> -<target>Megváltoztatja a szinkronizálási beállításokat</target> +<source>Local synchronization settings</source> +<target>Helyi szinkronizálási beállítások</target> <source>Local filter</source> <target>Helyi szűrő</target> @@ -666,11 +672,11 @@ A parancs végrehajtódik, ha: <source>None</source> <target>Egyik sem</target> -<source>Remove alternate settings</source> -<target>Törölje a módosított beállításokat</target> +<source>Remove local settings</source> +<target>Törli a helyi beállításokat</target> -<source>Clear filter settings</source> -<target>Törölje a szűrőbeállításokat</target> +<source>Reset local filter</source> +<target>Visszaállítja a helyi szűrőt</target> <source>Copy</source> <target>Másol</target> @@ -678,14 +684,8 @@ A parancs végrehajtódik, ha: <source>Paste</source> <target>Beilleszt</target> -<source>Alternate Comparison Settings</source> -<target>Megváltoztatja az összehasonlítási beállításokat</target> - -<source>Alternate Synchronization Settings</source> -<target>Megváltoztatja a szinkronizálási beállításokat</target> - -<source>Local Filter</source> -<target>Helyi szűrő</target> +<source>Local Synchronization Settings</source> +<target>Helyi Szinkronizálási Beállítások</target> <source>&New</source> <target>&Új</target> @@ -702,8 +702,8 @@ A parancs végrehajtódik, ha: <source>2. &Synchronize</source> <target>2. &Szinkronizál</target> -<source>&Global settings</source> -<target>&Globális beállítások</target> +<source>&Options</source> +<target>&Beállítások</target> <source>&Language</source> <target>&Nyelv</target> @@ -726,12 +726,12 @@ A parancs végrehajtódik, ha: <source>&Check for new version</source> <target>&Új verzió keresése</target> -<source>Compare</source> -<target>Összehasonlít</target> - <source>Cancel</source> <target>Mégsem</target> +<source>Compare</source> +<target>Összehasonlít</target> + <source>Synchronize</source> <target>Szinkronizál</target> @@ -753,9 +753,21 @@ A parancs végrehajtódik, ha: <source>Match case</source> <target>Kis-/nagybetű megkülönböztetése</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> + <source>View type:</source> <target>Nézet típusa:</target> @@ -777,6 +789,9 @@ A parancs végrehajtódik, ha: <source>Total bytes to copy</source> <target>Összesen másolandó bájtok</target> +<source>Use local settings:</source> +<target>Használja a helyi beállításokat:</target> + <source>Select a variant:</source> <target>Válasszon egy változatot:</target> @@ -792,20 +807,35 @@ A parancs végrehajtódik, ha: <source>More information</source> <target>További információ</target> -<source>OK</source> -<target>OK</target> +<source>Local settings:</source> +<target>Helyi beállítások:</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> +<source>Include:</source> +<target>Bevonva:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>A baloldali könyvtár tükörmásolatát készíti el úgy, hogy a jobb oldali könyvtár egyezzen meg</target> +<source>Exclude:</source> +<target>Kizárva:</target> -<source>Copy new and updated files to the right folder.</source> -<target>Másolja az új és módosult fájlokat a jobb oldali könyvtárba.</target> +<source>Show examples</source> +<target>Mutasson példákat</target> -<source>Configure your own synchronization rules.</source> -<target>Állítsd be a saját szinkronizálási szabályaidat</target> +<source>Time span:</source> +<target>Idősáv (időtartam):</target> + +<source>File size:</source> +<target>Fájl méret:</target> + +<source>Minimum:</source> +<target>Minimum:</target> + +<source>Maximum:</source> +<target>Maximum:</target> + +<source>&Reset</source> +<target>&Visszaállít</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> <source>Detect moved files</source> <target>Érzékelje a mozgatott fájlokat</target> @@ -821,6 +851,9 @@ A parancs végrehajtódik, ha: - Nem minden fájlrendszer támogatja </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Érzékelje a szinkronizálási irányokat az adatbázis-fájlok segítségével</target> + <source>Delete files:</source> <target>Törölje a következő fájlokat:</target> @@ -845,9 +878,6 @@ A parancs végrehajtódik, ha: <source>Naming convention:</source> <target>Elnevezési konvenció:</target> -<source>Show examples</source> -<target>Mutasson példákat</target> - <source>Handle errors:</source> <target>A következő hibák kezelése:</target> @@ -866,8 +896,8 @@ A parancs végrehajtódik, ha: <source>On completion:</source> <target>Végrehajtás alatt:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Érzékelje a szinkronizálási irányokat az adatbázis-fájlok segítségével</target> +<source>OK</source> +<target>OK</target> <source>Start synchronization now?</source> <target>Megkezdje a szinkronizálást?</target> @@ -929,30 +959,6 @@ A parancs végrehajtódik, ha: <source>&Recycle bin</source> <target>Lomtá&r</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> - -<source>Include:</source> -<target>Bevonva:</target> - -<source>Exclude:</source> -<target>Kizárva:</target> - -<source>Time span:</source> -<target>Idősáv (időtartam):</target> - -<source>File size:</source> -<target>Fájl méret:</target> - -<source>Minimum:</source> -<target>Minimum:</target> - -<source>Maximum:</source> -<target>Maximum:</target> - -<source>&Reset</source> -<target>&Visszaállít</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> @@ -1037,12 +1043,15 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Delete Items</source> <target>Törölje az elemeket</target> -<source>Global Settings</source> -<target>Globális beállítások</target> +<source>Options</source> +<target>Beállítások</target> <source>Select Time Span</source> <target>Válassza ki az idősávot (időtartamot)</target> +<source>&Preferences...</source> +<target>&Beállítások...</target> + <source>Folder Pairs</source> <target>Könyvtár-párok</target> @@ -1061,12 +1070,6 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Main Bar</source> <target>Fő sáv</target> -<source>Open...</source> -<target>Megnyit...</target> - -<source>Save</source> -<target>Ment</target> - <source>Compare both sides</source> <target>Vesse össze mindkét oldalt</target> @@ -1193,8 +1196,11 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Delete selected configurations</source> <target>Törölje a kiválasztott beállításokat</target> -<source>Filter</source> -<target>Szűrő</target> +<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>Show files that exist on left side only</source> <target>Mutassa a csak a bal oldalon létező fájlokat</target> @@ -1244,15 +1250,12 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Set as default</source> <target>Beállítás alapértelmezettként</target> +<source>Filter</source> +<target>Szűrő</target> + <source>All files are in sync</source> <target>Az összes fájl szinkronizált</target> -<source>Synchronization Settings</source> -<target>Szinkronizálási beállítások</target> - -<source>Comparison Settings</source> -<target>Összehasonlítási beállítások</target> - <source>Cannot find %x</source> <target>Nem található: %x</target> @@ -1313,30 +1316,6 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Log</source> <target>Napló</target> -<source>Today</source> -<target>Mai</target> - -<source>This week</source> -<target>E heti</target> - -<source>This month</source> -<target>E havi</target> - -<source>This year</source> -<target>Ez évi</target> - -<source>Last x days</source> -<target>Utolsó x nap</target> - -<source>Byte</source> -<target>Bájt</target> - -<source>KB</source> -<target>kB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1358,14 +1337,8 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <pluralform>Valóban törölni akarod a következő %x elemet?</pluralform> </target> -<source>Exclude</source> -<target>Kizár</target> - -<source>Direct</source> -<target>Közvetlen</target> - -<source>Follow</source> -<target>Követ</target> +<source>Preferences</source> +<target>Beállítások</target> <source>Copy NTFS permissions</source> <target>Másolja az NTFS jogosultságokat</target> @@ -1388,8 +1361,50 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Restore all hidden windows and warnings?</source> <target>Visszaállítsa az összes rejtett ablakot és figyelmeztetést?</target> -<source>Leave as unresolved conflict</source> -<target>Hagyja feloldatlan ütközésként</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> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>A baloldali könyvtár tükörmásolatát készíti el úgy, hogy a jobb oldali könyvtár egyezzen meg</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Másolja az új és módosult fájlokat a jobb oldali könyvtárba.</target> + +<source>Configure your own synchronization rules.</source> +<target>Állítsd be a saját szinkronizálási szabályaidat</target> + +<source>Exclude</source> +<target>Kizár</target> + +<source>Direct</source> +<target>Közvetlen</target> + +<source>Follow</source> +<target>Követ</target> + +<source>Today</source> +<target>Mai</target> + +<source>This week</source> +<target>E heti</target> + +<source>This month</source> +<target>E havi</target> + +<source>This year</source> +<target>Ez évi</target> + +<source>Last x days</source> +<target>Utolsó x nap</target> + +<source>Byte</source> +<target>Bájt</target> + +<source>KB</source> +<target>kB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>Felülír</target> @@ -1403,6 +1418,15 @@ Ez garantálja a konzisztens állapotot egy komoly hiba esetén is. <source>Append a time stamp to each file name</source> <target>Minden fájlnévhez adjon egy-egy időbélyeget</target> +<source>Comparison</source> +<target>Összehasonlítás</target> + +<source>Synchronization</source> +<target>Szinkronizálás</target> + +<source>Leave as unresolved conflict</source> +<target>Hagyja feloldatlan ütközésként</target> + <source>File</source> <target>Fájl</target> diff --git a/FreeFileSync/Build/Languages/italian.lng b/FreeFileSync/Build/Languages/italian.lng index 149a1d65..10f8b642 100644 --- a/FreeFileSync/Build/Languages/italian.lng +++ b/FreeFileSync/Build/Languages/italian.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>Sintassi:</target> -<source>config files</source> -<target>file di configurazione</target> +<source>global config file:</source> +<target></target> + +<source>config files:</source> +<target></target> <source>directory</source> <target>directory</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target></target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Qualsiasi numero di FreeFileSync.ffs_gui e/o File di configurazione .ffs_batch.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Qualsiasi numero di directory alternative per al massimo un file di configurazione.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target></target> <source>Cannot find the following folders:</source> <target>Impossibile trovare le seguenti cartelle:</target> @@ -651,11 +657,11 @@ Il comando è attivato se: <source>Drag && drop</source> <target>Trascina</target> -<source>Alternate comparison settings</source> -<target>Impostazioni di Confronto Alternativi</target> +<source>Local comparison settings</source> +<target></target> -<source>Alternate synchronization settings</source> -<target>Impostazioni di Sincronizzazione Alternativi</target> +<source>Local synchronization settings</source> +<target></target> <source>Local filter</source> <target>Filtro Locale</target> @@ -666,11 +672,11 @@ Il comando è attivato se: <source>None</source> <target>Nessuno</target> -<source>Remove alternate settings</source> -<target>Rimuovi impostazioni alternative</target> +<source>Remove local settings</source> +<target></target> -<source>Clear filter settings</source> -<target>Azzera impostazioni filtro</target> +<source>Reset local filter</source> +<target></target> <source>Copy</source> <target>Copia</target> @@ -678,14 +684,8 @@ Il comando è attivato se: <source>Paste</source> <target>Incolla</target> -<source>Alternate Comparison Settings</source> -<target>Impostazioni di Confronto Alternativi</target> - -<source>Alternate Synchronization Settings</source> -<target>Impostazioni di Sincronizzazione Alternativi</target> - -<source>Local Filter</source> -<target>Filtro Locale</target> +<source>Local Synchronization Settings</source> +<target></target> <source>&New</source> <target>&Nuovo</target> @@ -702,8 +702,8 @@ Il comando è attivato se: <source>2. &Synchronize</source> <target>2. &Sincronizza</target> -<source>&Global settings</source> -<target>&Preferenze</target> +<source>&Options</source> +<target></target> <source>&Language</source> <target>&Lingua</target> @@ -726,12 +726,12 @@ Il comando è attivato se: <source>&Check for new version</source> <target>&Controlla nuova versione</target> -<source>Compare</source> -<target>Compara</target> - <source>Cancel</source> <target>Annulla</target> +<source>Compare</source> +<target>Compara</target> + <source>Synchronize</source> <target>Sincronizza</target> @@ -753,9 +753,21 @@ Il comando è attivato se: <source>Match case</source> <target>Corrispondenza</target> +<source>Open...</source> +<target>Apri...</target> + +<source>Save</source> +<target>Salva</target> + +<source>Save as GUI job</source> +<target></target> + <source>Save as batch job</source> <target>Salva come processo batch</target> +<source>Save as...</source> +<target></target> + <source>View type:</source> <target>Visualizza tipo:</target> @@ -777,6 +789,9 @@ Il comando è attivato se: <source>Total bytes to copy</source> <target>Bytes totali da copiare</target> +<source>Use local settings:</source> +<target></target> + <source>Select a variant:</source> <target>Scegli una variante:</target> @@ -792,20 +807,35 @@ Il comando è attivato se: <source>More information</source> <target>Maggiori informazioni</target> -<source>OK</source> -<target>OK</target> +<source>Local settings:</source> +<target></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> +<source>Include:</source> +<target>Includi:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Creare un backup specchio della cartella di sinistra aggiornando la cartella giusta.</target> +<source>Exclude:</source> +<target>Escludi:</target> -<source>Copy new and updated files to the right folder.</source> -<target>Copiare i file nuovi e aggiornati nella cartella destra.</target> +<source>Show examples</source> +<target>Mostra esempi</target> -<source>Configure your own synchronization rules.</source> -<target>Configura le tue regole di sincronizzazione.</target> +<source>Time span:</source> +<target>Intervallo di tempo:</target> + +<source>File size:</source> +<target>Dimensione del file:</target> + +<source>Minimum:</source> +<target>Minimo:</target> + +<source>Maximum:</source> +<target>Massimo:</target> + +<source>&Reset</source> +<target>&Ripristina</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> <source>Detect moved files</source> <target>Rileva file spostati</target> @@ -821,6 +851,9 @@ Il comando è attivato se: - Non supportato da tutti i sistemi </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Rileva indicazioni sincronizzazione con l'aiuto del file di database</target> + <source>Delete files:</source> <target>Eliminare i file:</target> @@ -845,9 +878,6 @@ Il comando è attivato se: <source>Naming convention:</source> <target>Modalità di rinomina:</target> -<source>Show examples</source> -<target>Mostra esempi</target> - <source>Handle errors:</source> <target>Gestire gli errori:</target> @@ -866,8 +896,8 @@ Il comando è attivato se: <source>On completion:</source> <target>Al termine:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Rileva indicazioni sincronizzazione con l'aiuto del file di database</target> +<source>OK</source> +<target>OK</target> <source>Start synchronization now?</source> <target>Avviare la sincronizzazione ora?</target> @@ -929,30 +959,6 @@ Il comando è attivato se: <source>&Recycle bin</source> <target>&Cestino</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> - -<source>Include:</source> -<target>Includi:</target> - -<source>Exclude:</source> -<target>Escludi:</target> - -<source>Time span:</source> -<target>Intervallo di tempo:</target> - -<source>File size:</source> -<target>Dimensione del file:</target> - -<source>Minimum:</source> -<target>Minimo:</target> - -<source>Maximum:</source> -<target>Massimo:</target> - -<source>&Reset</source> -<target>&Ripristina</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> @@ -1037,12 +1043,15 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Delete Items</source> <target>Elimina Elementi</target> -<source>Global Settings</source> -<target>Impostazioni Globali</target> +<source>Options</source> +<target></target> <source>Select Time Span</source> <target>Selezionare Intervallo di Tempo</target> +<source>&Preferences...</source> +<target></target> + <source>Folder Pairs</source> <target>Coppie di Cartelle</target> @@ -1061,12 +1070,6 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Main Bar</source> <target>Barra Principale</target> -<source>Open...</source> -<target>Apri...</target> - -<source>Save</source> -<target>Salva</target> - <source>Compare both sides</source> <target>Confronta entrambi i lati</target> @@ -1193,8 +1196,11 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Delete selected configurations</source> <target>Elimina configurazioni selezionate</target> -<source>Filter</source> -<target>Filtro</target> +<source>Synchronization Settings</source> +<target>Impostazioni di Sincronizzazione</target> + +<source>Reset filter</source> +<target></target> <source>Show files that exist on left side only</source> <target>Mostra file esistenti solo a sinistra</target> @@ -1244,15 +1250,12 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Set as default</source> <target>Imposta come predefinito</target> +<source>Filter</source> +<target>Filtro</target> + <source>All files are in sync</source> <target>Tutti i file sono in sincronia</target> -<source>Synchronization Settings</source> -<target>Impostazioni di Sincronizzazione</target> - -<source>Comparison Settings</source> -<target>Impostazioni di Confronto</target> - <source>Cannot find %x</source> <target>Impossibile trovare %x</target> @@ -1313,30 +1316,6 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Log</source> <target>Log</target> -<source>Today</source> -<target>Oggi</target> - -<source>This week</source> -<target>Questa settimana</target> - -<source>This month</source> -<target>Questo mese</target> - -<source>This year</source> -<target>Quest'anno</target> - -<source>Last x days</source> -<target>Ultimi x giorni</target> - -<source>Byte</source> -<target>Byte</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1358,14 +1337,8 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <pluralform>Vuoi davvero eliminare i seguenti %x oggetti?</pluralform> </target> -<source>Exclude</source> -<target>Escludi</target> - -<source>Direct</source> -<target>Diretto</target> - -<source>Follow</source> -<target>Segui</target> +<source>Preferences</source> +<target></target> <source>Copy NTFS permissions</source> <target>Copia permessi NTFS</target> @@ -1388,8 +1361,50 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Restore all hidden windows and warnings?</source> <target>Ripristina tutte le finestre nascoste e gli avvisi?</target> -<source>Leave as unresolved conflict</source> -<target>Lascia come conflitti irrisolti</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> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Creare un backup specchio della cartella di sinistra aggiornando la cartella giusta.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Copiare i file nuovi e aggiornati nella cartella destra.</target> + +<source>Configure your own synchronization rules.</source> +<target>Configura le tue regole di sincronizzazione.</target> + +<source>Exclude</source> +<target>Escludi</target> + +<source>Direct</source> +<target>Diretto</target> + +<source>Follow</source> +<target>Segui</target> + +<source>Today</source> +<target>Oggi</target> + +<source>This week</source> +<target>Questa settimana</target> + +<source>This month</source> +<target>Questo mese</target> + +<source>This year</source> +<target>Quest'anno</target> + +<source>Last x days</source> +<target>Ultimi x giorni</target> + +<source>Byte</source> +<target>Byte</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>Sostituisci</target> @@ -1403,6 +1418,15 @@ Questo garantisce uno stato consistente anche in caso di errore grave. <source>Append a time stamp to each file name</source> <target>Aggiunge un'impronta per ogni nome di file</target> +<source>Comparison</source> +<target></target> + +<source>Synchronization</source> +<target></target> + +<source>Leave as unresolved conflict</source> +<target>Lascia come conflitti irrisolti</target> + <source>File</source> <target>File</target> diff --git a/FreeFileSync/Build/Languages/japanese.lng b/FreeFileSync/Build/Languages/japanese.lng index b25edf4a..70012102 100644 --- a/FreeFileSync/Build/Languages/japanese.lng +++ b/FreeFileSync/Build/Languages/japanese.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>構文:</target> -<source>config files</source> -<target>構成設定ファイル</target> +<source>global config file:</source> +<target>グローバル構成ファイル</target> + +<source>config files:</source> +<target>構成ファイル</target> <source>directory</source> <target>ディレクトリ</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>代替グローバル設定.xml ファイルのパス</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>任意の数の FreeFileSync 構成設定ファイル(.ffs_gui および/または .ffs_batch).</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>ひとつの構成設定ファイルに対して任意の数の代替ディレクトリ.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>任意の数の代替ディレクトリペア(ひとつの構成ファイル)</target> <source>Cannot find the following folders:</source> <target>以下のフォルダがみつかりません:</target> @@ -647,11 +653,11 @@ The command is triggered if: <source>Drag && drop</source> <target>ドラッグ && ドロップ</target> -<source>Alternate comparison settings</source> -<target>代替比較設定</target> +<source>Local comparison settings</source> +<target>ローカルの比較設定</target> -<source>Alternate synchronization settings</source> -<target>代替同期設定</target> +<source>Local synchronization settings</source> +<target>ローカルの同期設定</target> <source>Local filter</source> <target>ローカル フィルター</target> @@ -662,11 +668,11 @@ The command is triggered if: <source>None</source> <target>なし</target> -<source>Remove alternate settings</source> -<target>代替設定を除去</target> +<source>Remove local settings</source> +<target>ローカルの設定を除去</target> -<source>Clear filter settings</source> -<target>フィルター設定をクリア</target> +<source>Reset local filter</source> +<target>ローカルフィルターをリセット</target> <source>Copy</source> <target>コピー</target> @@ -674,14 +680,8 @@ The command is triggered if: <source>Paste</source> <target>貼り付け</target> -<source>Alternate Comparison Settings</source> -<target>代替比較設定</target> - -<source>Alternate Synchronization Settings</source> -<target>代替同期設定</target> - -<source>Local Filter</source> -<target>ローカル フィルター</target> +<source>Local Synchronization Settings</source> +<target>ローカルの同期設定</target> <source>&New</source> <target>新規(&N)</target> @@ -698,8 +698,8 @@ The command is triggered if: <source>2. &Synchronize</source> <target>2. 同期処理(&S)</target> -<source>&Global settings</source> -<target>全般的な設定(&G)</target> +<source>&Options</source> +<target>設定(&O)</target> <source>&Language</source> <target>使用言語(&L)</target> @@ -722,12 +722,12 @@ The command is triggered if: <source>&Check for new version</source> <target>新バージョンの確認(&C)</target> -<source>Compare</source> -<target>比較</target> - <source>Cancel</source> <target>キャンセル</target> +<source>Compare</source> +<target>比較</target> + <source>Synchronize</source> <target>同期処理</target> @@ -749,9 +749,21 @@ The command is triggered if: <source>Match case</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> @@ -773,6 +785,9 @@ The command is triggered if: <source>Total bytes to copy</source> <target>コピーの合計バイト</target> +<source>Use local settings:</source> +<target>ローカル設定を使用</target> + <source>Select a variant:</source> <target>バリアントを選択:</target> @@ -788,20 +803,35 @@ The command is triggered if: <source>More information</source> <target>更に詳細な情報</target> -<source>OK</source> -<target>OK</target> +<source>Local settings:</source> +<target>ローカル設定:</target> -<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> -<target>変更箇所を識別して両側に変更を反映します。データベースを使用することで、削除/移動/競合などは自動的に検出されます。</target> +<source>Include:</source> +<target>含める:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>右側フォルダにマッチングを適合することで、左側フォルダのミラーリングバックアップを作成します。</target> +<source>Exclude:</source> +<target>除外:</target> -<source>Copy new and updated files to the right folder.</source> -<target>新しい、または更新されたファイルを右側フォルダにコピーします。</target> +<source>Show examples</source> +<target>入力例を表示</target> -<source>Configure your own synchronization rules.</source> -<target>あなたの設定した同期規則を使用します。</target> +<source>Time span:</source> +<target>タイムスパン:</target> + +<source>File size:</source> +<target>ファイルサイズ:</target> + +<source>Minimum:</source> +<target>最小:</target> + +<source>Maximum:</source> +<target>最大:</target> + +<source>&Reset</source> +<target>リセット(&R)</target> + +<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> +<target>同期処理から特定のファイルを除外するためのフィルター規則を選択、対応するそれらフォルダ ペアからの相対ファイルパスを入力します.</target> <source>Detect moved files</source> <target>移動済みのファイルを検出する</target> @@ -817,6 +847,9 @@ The command is triggered if: - すべてのファイルシステムには非対応 </target> +<source>Detect synchronization directions with the help of database files</source> +<target>データベースファイルを利用して、同期の方向を検出します。</target> + <source>Delete files:</source> <target>ファイルの削除:</target> @@ -841,9 +874,6 @@ The command is triggered if: <source>Naming convention:</source> <target>命名規則:</target> -<source>Show examples</source> -<target>入力例を表示</target> - <source>Handle errors:</source> <target>エラーの取り扱い:</target> @@ -862,8 +892,8 @@ The command is triggered if: <source>On completion:</source> <target>完了時の動作:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>データベースファイルを利用して、同期の方向を検出します。</target> +<source>OK</source> +<target>OK</target> <source>Start synchronization now?</source> <target>今すぐ同期を開始しますか?</target> @@ -925,30 +955,6 @@ The command is triggered if: <source>&Recycle bin</source> <target>ゴミ箱(&R)</target> -<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> -<target>同期処理から特定のファイルを除外するためのフィルター規則を選択、対応するそれらフォルダ ペアからの相対ファイルパスを入力します.</target> - -<source>Include:</source> -<target>含める:</target> - -<source>Exclude:</source> -<target>除外:</target> - -<source>Time span:</source> -<target>タイムスパン:</target> - -<source>File size:</source> -<target>ファイルサイズ:</target> - -<source>Minimum:</source> -<target>最小:</target> - -<source>Maximum:</source> -<target>最大:</target> - -<source>&Reset</source> -<target>リセット(&R)</target> - <source>The following settings are used for all synchronization jobs.</source> <target>以下の設定は、すべての同期ジョブで使用されます</target> @@ -1033,12 +1039,15 @@ This guarantees a consistent state even in case of a serious error. <source>Delete Items</source> <target>項目の削除</target> -<source>Global Settings</source> -<target>全般的な設定</target> +<source>Options</source> +<target>設定</target> <source>Select Time Span</source> <target>タイムスパンを選択</target> +<source>&Preferences...</source> +<target>プリファレンス(&P)...</target> + <source>Folder Pairs</source> <target>フォルダ ペア</target> @@ -1057,12 +1066,6 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>メインバー</target> -<source>Open...</source> -<target>開く...</target> - -<source>Save</source> -<target>保存</target> - <source>Compare both sides</source> <target>両方を比較</target> @@ -1185,8 +1188,11 @@ This guarantees a consistent state even in case of a serious error. <source>Delete selected configurations</source> <target>選択された構成設定を削除</target> -<source>Filter</source> -<target>フィルター</target> +<source>Synchronization Settings</source> +<target>同期の設定</target> + +<source>Reset filter</source> +<target>フィルターをリセット</target> <source>Show files that exist on left side only</source> <target>左側のみに存在するファイルを表示</target> @@ -1236,15 +1242,12 @@ This guarantees a consistent state even in case of a serious error. <source>Set as default</source> <target>デフォルトにセット</target> +<source>Filter</source> +<target>フィルター</target> + <source>All files are in sync</source> <target>すべてのファイルを同期</target> -<source>Synchronization Settings</source> -<target>同期の設定</target> - -<source>Comparison Settings</source> -<target>比較の設定</target> - <source>Cannot find %x</source> <target>%x は見つかりません</target> @@ -1305,30 +1308,6 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>ログ</target> -<source>Today</source> -<target>今日</target> - -<source>This week</source> -<target>この週</target> - -<source>This month</source> -<target>この月</target> - -<source>This year</source> -<target>この年</target> - -<source>Last x days</source> -<target>最後の x 日</target> - -<source>Byte</source> -<target>バイト</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1348,14 +1327,8 @@ This guarantees a consistent state even in case of a serious error. <pluralform>本当に以下の %x 個の項目を削除しますか</pluralform> </target> -<source>Exclude</source> -<target>除外</target> - -<source>Direct</source> -<target>ダイレクト</target> - -<source>Follow</source> -<target>考慮する</target> +<source>Preferences</source> +<target>プリファレンス</target> <source>Copy NTFS permissions</source> <target>NTFS パーミッションをコピーする</target> @@ -1378,8 +1351,50 @@ This guarantees a consistent state even in case of a serious error. <source>Restore all hidden windows and warnings?</source> <target>すべての非表示ウィンドウと警告を元に戻しますか?</target> -<source>Leave as unresolved conflict</source> -<target>未解決の競合はそのまま残す</target> +<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> +<target>変更箇所を識別して両側に変更を反映します。データベースを使用することで、削除/移動/競合などは自動的に検出されます。</target> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>右側フォルダにマッチングを適合することで、左側フォルダのミラーリングバックアップを作成します。</target> + +<source>Copy new and updated files to the right folder.</source> +<target>新しい、または更新されたファイルを右側フォルダにコピーします。</target> + +<source>Configure your own synchronization rules.</source> +<target>あなたの設定した同期規則を使用します。</target> + +<source>Exclude</source> +<target>除外</target> + +<source>Direct</source> +<target>ダイレクト</target> + +<source>Follow</source> +<target>考慮する</target> + +<source>Today</source> +<target>今日</target> + +<source>This week</source> +<target>この週</target> + +<source>This month</source> +<target>この月</target> + +<source>This year</source> +<target>この年</target> + +<source>Last x days</source> +<target>最後の x 日</target> + +<source>Byte</source> +<target>バイト</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>置換</target> @@ -1393,6 +1408,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>各ファイル名にタイムスタンプを付加</target> +<source>Comparison</source> +<target>比較</target> + +<source>Synchronization</source> +<target>同期</target> + +<source>Leave as unresolved conflict</source> +<target>未解決の競合はそのまま残す</target> + <source>File</source> <target>ファイル</target> diff --git a/FreeFileSync/Build/Languages/korean.lng b/FreeFileSync/Build/Languages/korean.lng index cfb56922..e4d92ed2 100644 --- a/FreeFileSync/Build/Languages/korean.lng +++ b/FreeFileSync/Build/Languages/korean.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>구문(Syntax):</target> -<source>config files</source> -<target>설정 파일</target> +<source>global config file:</source> +<target>전체 설정 파일:</target> + +<source>config files:</source> +<target>설정 파일:</target> <source>directory</source> <target>디렉토리</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>GlobalSettings.xml 대체 파일에 대한 경로</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>FreeFileSync .ffs_gui 또는 .ffs_batch 설정파일 개수</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>최대 한개 설정파일에 대한 대체 디렉토리 개수</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>최대 1개 설정파일에 대한 대체 디렉토리 페어 개수</target> <source>Cannot find the following folders:</source> <target>다음 폴더를 찾을 수 없습니다:</target> @@ -137,7 +143,7 @@ <target>동기화 방향을 계산 중...</target> <source>Out of memory.</source> -<target>메모리 부족.</target> +<target>메모리 부족</target> <source>Item exists on left side only</source> <target>항목이 좌측에만 존재합니다.</target> @@ -526,7 +532,7 @@ The command is triggered if: <target>다중 폴더 페어의 일부인 폴더가 변경됩니다. 동기화 설정을 재검토하세요.</target> <source>Synchronizing folder pair:</source> -<target>폴더 페어(짝) 동기화 진행 중</target> +<target>폴더 페어 동기화 진행 중</target> <source>Generating database...</source> <target>데이터베이스 생성 중...</target> @@ -647,11 +653,11 @@ The command is triggered if: <source>Drag && drop</source> <target>드래그 앤 드랍(&&) [마우스로 파일 끌어다 놓기]</target> -<source>Alternate comparison settings</source> -<target>비교 설정 변경</target> +<source>Local comparison settings</source> +<target>로컬 비교 설정</target> -<source>Alternate synchronization settings</source> -<target>동기화 설정 변경</target> +<source>Local synchronization settings</source> +<target>로컬 동기화 설정</target> <source>Local filter</source> <target>로컬 필터</target> @@ -662,11 +668,11 @@ The command is triggered if: <source>None</source> <target>아무것도 안 함</target> -<source>Remove alternate settings</source> -<target>대체설정 제거</target> +<source>Remove local settings</source> +<target>로컬 설정 제거</target> -<source>Clear filter settings</source> -<target>필터 설정 지우기</target> +<source>Reset local filter</source> +<target>로컬 필터 재설정(리셋)</target> <source>Copy</source> <target>복사</target> @@ -674,14 +680,8 @@ The command is triggered if: <source>Paste</source> <target>붙여넣기</target> -<source>Alternate Comparison Settings</source> -<target>비교 설정 변경</target> - -<source>Alternate Synchronization Settings</source> -<target>동기화 설정 변경</target> - -<source>Local Filter</source> -<target>로컬 필터</target> +<source>Local Synchronization Settings</source> +<target>로컬 동기화 설정</target> <source>&New</source> <target>신규 작업(&N)</target> @@ -698,8 +698,8 @@ The command is triggered if: <source>2. &Synchronize</source> <target>2. 동기화(&S)</target> -<source>&Global settings</source> -<target>전체 설정(&G)</target> +<source>&Options</source> +<target>옵션(&O)</target> <source>&Language</source> <target>언어 선택(&L)</target> @@ -722,20 +722,20 @@ The command is triggered if: <source>&Check for new version</source> <target>신규 버전 확인(&C)</target> -<source>Compare</source> -<target>비 교</target> - <source>Cancel</source> <target>취소</target> +<source>Compare</source> +<target>비 교</target> + <source>Synchronize</source> <target>동 기 화</target> <source>Add folder pair</source> -<target>폴더 페어(짝) 추가</target> +<target>폴더 페어 추가</target> <source>Remove folder pair</source> -<target>폴더 페어(짝) 제거</target> +<target>폴더 페어 제거</target> <source>Swap sides</source> <target>양측 위치 바꾸기</target> @@ -749,9 +749,21 @@ The command is triggered if: <source>Match case</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> @@ -773,6 +785,9 @@ The command is triggered if: <source>Total bytes to copy</source> <target>복사할 전체 바이트 크기</target> +<source>Use local settings:</source> +<target>로컬 설정 사용:</target> + <source>Select a variant:</source> <target>베어리언트 선택:</target> @@ -788,20 +803,35 @@ The command is triggered if: <source>More information</source> <target>상세 정보</target> -<source>OK</source> -<target>OK</target> +<source>Local settings:</source> +<target>로컬 설정:</target> -<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> -<target>양측 변경사항을 확인하고 전달. 삭제, 이동 및 충돌은 데이터베이스를 통해 자동으로 감지됩니다.</target> +<source>Include:</source> +<target>포함:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>좌측 폴더의 미러 백업을 만듭니다. 우측 폴더는 좌측 폴더와 완전히 일치하게 됩니다.</target> +<source>Exclude:</source> +<target>제외:</target> -<source>Copy new and updated files to the right folder.</source> -<target>신규 또는 업데이트 된 파일을 우측 폴더로 복사</target> +<source>Show examples</source> +<target>예시 보이기</target> -<source>Configure your own synchronization rules.</source> -<target>개인 동기화 규칙 설정</target> +<source>Time span:</source> +<target>시간 간격:</target> + +<source>File size:</source> +<target>파일 크기:</target> + +<source>Minimum:</source> +<target>최소:</target> + +<source>Maximum:</source> +<target>최대:</target> + +<source>&Reset</source> +<target>리셋(&R)</target> + +<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> +<target>동기화에서 특정 파일을 제외시키는 필터 규칙을 선택합니다. 해당 폴더 페어에 대한 상대 파일 경로를 입력하세요.</target> <source>Detect moved files</source> <target>이동 파일 탐지</target> @@ -817,6 +847,9 @@ The command is triggered if: - 모든 파일 시스템에서 지원되지 않음 </target> +<source>Detect synchronization directions with the help of database files</source> +<target>데이터베이스 파일로 동기화 방향 감지</target> + <source>Delete files:</source> <target>파일 삭제:</target> @@ -841,9 +874,6 @@ The command is triggered if: <source>Naming convention:</source> <target>이름 지정:</target> -<source>Show examples</source> -<target>예 보이기</target> - <source>Handle errors:</source> <target>오류 발생시:</target> @@ -862,8 +892,8 @@ The command is triggered if: <source>On completion:</source> <target>완료 시:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>데이터베이스 파일로 동기화 방향 감지</target> +<source>OK</source> +<target>OK</target> <source>Start synchronization now?</source> <target>지금 동기화를 시작하시겠습니까?</target> @@ -925,30 +955,6 @@ The command is triggered if: <source>&Recycle bin</source> <target>휴지통(&R)</target> -<source>Select filter rules to exclude certain files from synchronization. Enter file paths relative to their corresponding folder pair.</source> -<target>동기화에서 특정 파일을 제외시키는 필터 규칙을 선택합니다. 해당 폴더 페어(짝)에 대한 상대 파일 경로를 입력하세요.</target> - -<source>Include:</source> -<target>포함:</target> - -<source>Exclude:</source> -<target>제외:</target> - -<source>Time span:</source> -<target>시간 간격:</target> - -<source>File size:</source> -<target>파일 크기:</target> - -<source>Minimum:</source> -<target>최소:</target> - -<source>Maximum:</source> -<target>최대:</target> - -<source>&Reset</source> -<target>리셋(&R)</target> - <source>The following settings are used for all synchronization jobs.</source> <target>다음 설정은 모든 동기화 작업에 사용됩니다.</target> @@ -1033,14 +1039,17 @@ This guarantees a consistent state even in case of a serious error. <source>Delete Items</source> <target>항목 삭제</target> -<source>Global Settings</source> -<target>전체 설정</target> +<source>Options</source> +<target>옵션</target> <source>Select Time Span</source> <target>시간간격(타임스팬) 선택</target> +<source>&Preferences...</source> +<target>환경설정(&P)</target> + <source>Folder Pairs</source> -<target>폴더 페어(짝)</target> +<target>폴더 페어</target> <source>Find</source> <target>검색</target> @@ -1057,12 +1066,6 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>메인 바</target> -<source>Open...</source> -<target>열기</target> - -<source>Save</source> -<target>저장</target> - <source>Compare both sides</source> <target>양측 비교</target> @@ -1185,8 +1188,11 @@ This guarantees a consistent state even in case of a serious error. <source>Delete selected configurations</source> <target>선택한 구성 삭제</target> -<source>Filter</source> -<target>필터</target> +<source>Synchronization Settings</source> +<target>동기화 설정</target> + +<source>Reset filter</source> +<target>필터 재설정(리셋)</target> <source>Show files that exist on left side only</source> <target>좌측에만 존재하는 파일 표시</target> @@ -1236,15 +1242,12 @@ This guarantees a consistent state even in case of a serious error. <source>Set as default</source> <target>기본 값으로 설정</target> +<source>Filter</source> +<target>필터</target> + <source>All files are in sync</source> <target>모든 파일이 동기화 되었음.</target> -<source>Synchronization Settings</source> -<target>동기화 설정</target> - -<source>Comparison Settings</source> -<target>비교 설정</target> - <source>Cannot find %x</source> <target>%x을(를) 찾을 수 없습니다.</target> @@ -1305,30 +1308,6 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>로그</target> -<source>Today</source> -<target>오늘</target> - -<source>This week</source> -<target>이번 주</target> - -<source>This month</source> -<target>이번 달</target> - -<source>This year</source> -<target>올해</target> - -<source>Last x days</source> -<target>최근 x일</target> - -<source>Byte</source> -<target>바이트</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1348,14 +1327,8 @@ This guarantees a consistent state even in case of a serious error. <pluralform>정말로 다음 %x 항목(들)을 삭제하시겠습니까?</pluralform> </target> -<source>Exclude</source> -<target>제외</target> - -<source>Direct</source> -<target>다이렉트</target> - -<source>Follow</source> -<target>팔로우</target> +<source>Preferences</source> +<target>환경설정</target> <source>Copy NTFS permissions</source> <target>NTFS 권한 복사</target> @@ -1378,8 +1351,50 @@ This guarantees a consistent state even in case of a serious error. <source>Restore all hidden windows and warnings?</source> <target>모든 숨겨진 창 및 경고를 복원하시겠습니까?</target> -<source>Leave as unresolved conflict</source> -<target>미해결 충돌로 놔두기</target> +<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> +<target>양측 변경사항을 확인하고 전달. 삭제, 이동 및 충돌은 데이터베이스를 통해 자동으로 감지됩니다.</target> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>좌측 폴더의 미러 백업을 만듭니다. 우측 폴더는 좌측 폴더와 완전히 일치하게 됩니다.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>신규 또는 업데이트 된 파일을 우측 폴더로 복사</target> + +<source>Configure your own synchronization rules.</source> +<target>개인 동기화 규칙 설정</target> + +<source>Exclude</source> +<target>제외</target> + +<source>Direct</source> +<target>다이렉트</target> + +<source>Follow</source> +<target>팔로우</target> + +<source>Today</source> +<target>오늘</target> + +<source>This week</source> +<target>이번 주</target> + +<source>This month</source> +<target>이번 달</target> + +<source>This year</source> +<target>올해</target> + +<source>Last x days</source> +<target>최근 x일</target> + +<source>Byte</source> +<target>바이트</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>대체</target> @@ -1393,6 +1408,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>각 파일 이름마다 타임 스탬프 추가</target> +<source>Comparison</source> +<target>비 교</target> + +<source>Synchronization</source> +<target>동 기 화</target> + +<source>Leave as unresolved conflict</source> +<target>미해결 충돌로 놔두기</target> + <source>File</source> <target>파일</target> @@ -1406,7 +1430,7 @@ This guarantees a consistent state even in case of a serious error. <target>항목</target> <source>Percentage</source> -<target>백분율(%)</target> +<target>퍼센티지(%)</target> <source>Cannot monitor directory %x.</source> <target>디렉토리 %x을(를) 모니터링 할 수 없습니다.</target> diff --git a/FreeFileSync/Build/Languages/lithuanian.lng b/FreeFileSync/Build/Languages/lithuanian.lng index 462f3bd3..178a8b96 100644 --- a/FreeFileSync/Build/Languages/lithuanian.lng +++ b/FreeFileSync/Build/Languages/lithuanian.lng @@ -7,45 +7,6 @@ <plural_definition>n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2</plural_definition> </header> -<source>Synchronization</source> -<target></target> - -<source>Comparison</source> -<target></target> - -<source>Local settings:</source> -<target></target> - -<source>Select a variant:</source> -<target></target> - -<source>Use local settings:</source> -<target></target> - -<source>Save as...</source> -<target></target> - -<source>Save as GUI job</source> -<target></target> - -<source>Local Synchronization Settings</source> -<target></target> - -<source>Synchronization stopped</source> -<target></target> - -<source>Any number of alternative directory pairs for at most one config file.</source> -<target></target> - -<source>Path to an alternate GlobalSettings.xml file.</source> -<target></target> - -<source>config files:</source> -<target></target> - -<source>global config file:</source> -<target></target> - <source>Both sides have changed since last synchronization.</source> <target>Abi pusės buvo pakeistos nuo paskutinio sinchronizavimo.</target> @@ -115,12 +76,24 @@ <source>Syntax:</source> <target>Sintaksė:</target> +<source>global config file:</source> +<target>bendrinis konfigūracinis failas</target> + +<source>config files:</source> +<target>konfigūracinis failas</target> + <source>directory</source> <target>katalogas</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Kelias iki alternatyvaus GlobalSettings.xml failo</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Neribotas kiekis FreeFileSync .ffs_gui ir/arba .ffs_batch konfigūracinių failų</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Bet koks skaičius alternatyvių katalogų grupuojams tik su vienu konfigūraciniu failu</target> + <source>Cannot find the following folders:</source> <target>Nepavyksta rasti šių aplankų:</target> @@ -338,7 +311,7 @@ <target>Rodyti naršyklėje</target> <source>Open with default application</source> -<target>Atverti su numatyta programa</target> +<target>Atversti su numatyta programa</target> <source>Browse directory</source> <target>Naršyti katalogą</target> @@ -365,7 +338,7 @@ <target>Nepavyko sukurti versijos laiko žymą</target> <source>&Open...</source> -<target>&Atverti...</target> +<target>&Atversti...</target> <source>Save &as...</source> <target>Išsaugoti &kaip...</target> @@ -377,7 +350,7 @@ <target>&Programa</target> <source>&View help</source> -<target>&Rodymo pagalba</target> +<target>&Rodyti pagalbą</target> <source>&About</source> <target>&Apie</target> @@ -573,6 +546,9 @@ Komanda inicijuojama jei: <source>job name</source> <target>Užduoties pavadinimas</target> +<source>Synchronization stopped</source> +<target>Suvienodinimas sustabdytas</target> + <source>Synchronization completed with errors</source> <target>Suvienodinimas baigtas su klaidomis</target> @@ -685,11 +661,11 @@ Komanda inicijuojama jei: <source>Drag && drop</source> <target>Vilkti ir numesti</target> -<source>Alternate comparison settings</source> -<target>Alternatyvaus Palyginimo Parametrai</target> +<source>Local comparison settings</source> +<target>Vietiniai palyginimo parametrai</target> -<source>Alternate synchronization settings</source> -<target>Alternatyvaus Palyginimo Parametrai</target> +<source>Local synchronization settings</source> +<target>Vietiniai suvienodinimo parametrai</target> <source>Local filter</source> <target>Vietinis filtras</target> @@ -700,11 +676,11 @@ Komanda inicijuojama jei: <source>None</source> <target>Tusčia</target> -<source>Remove alternate settings</source> -<target>Pašalinti alternatyvius nustatymus</target> +<source>Remove local settings</source> +<target>Pašalinti vietinius parametrus</target> -<source>Clear filter settings</source> -<target>Išvalyti filtro nustatymus</target> +<source>Reset local filter</source> +<target>Iš naujo nustatyti vietinį filtrą</target> <source>Copy</source> <target>Kopijuoti</target> @@ -712,6 +688,9 @@ Komanda inicijuojama jei: <source>Paste</source> <target>Įklijuoti</target> +<source>Local Synchronization Settings</source> +<target>Vietiniai Suvienodinimo Parametrai</target> + <source>&New</source> <target>&Naujas</target> @@ -722,13 +701,13 @@ Komanda inicijuojama jei: <target>Išsaugoti kaip &užduočių paketą...</target> <source>1. &Compare</source> -<target>1. &Sulyginti</target> +<target>1. &Palyginti</target> <source>2. &Synchronize</source> <target>2. &Suvienodinti</target> -<source>&Global settings</source> -<target>&Bendri nustatymai</target> +<source>&Options</source> +<target>&Parinktys</target> <source>&Language</source> <target>&Kalba</target> @@ -751,12 +730,12 @@ Komanda inicijuojama jei: <source>&Check for new version</source> <target>&Naujasnės versijos tikrinimas</target> -<source>Compare</source> -<target>Sulyginti</target> - <source>Cancel</source> <target>Atšaukti</target> +<source>Compare</source> +<target>Sulyginti</target> + <source>Synchronize</source> <target>Suvienodinti</target> @@ -779,14 +758,20 @@ Komanda inicijuojama jei: <target>Atitikti atveją</target> <source>Open...</source> -<target>Atverti...</target> +<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> + <source>View type:</source> <target>Rodymo būdai</target> @@ -808,6 +793,12 @@ Komanda inicijuojama jei: <source>Total bytes to copy</source> <target>Viso baitų kopijuoti</target> +<source>Use local settings:</source> +<target>Naudoti vietinius nustatymus</target> + +<source>Select a variant:</source> +<target>Pasirinkti variantą</target> + <source>Identify equal files by comparing modification time and size.</source> <target>Sutapatinti vienodus failus lyginant failų modifikavimo laiką ir dydį.</target> @@ -820,6 +811,9 @@ Komanda inicijuojama jei: <source>More information</source> <target>Daugiau informacijos</target> +<source>Local settings:</source> +<target>Vietiniai nustatymai</target> + <source>Include:</source> <target>Įtraukti:</target> @@ -1053,12 +1047,15 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>Delete Items</source> <target>Pašalinti elementai</target> -<source>Global Settings</source> -<target>Bendri parametrai</target> +<source>Options</source> +<target>Parinktys</target> <source>Select Time Span</source> <target>Pasirinkti laiko atkarpą</target> +<source>&Preferences...</source> +<target>&Pirmenybė...</target> + <source>Folder Pairs</source> <target>Sugretinti aplankai</target> @@ -1210,6 +1207,9 @@ 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>Show files that exist on left side only</source> <target>Rodyti failus, kurie egzistuoja tik kairėje pusėje</target> @@ -1347,6 +1347,9 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <pluralform>Ar tikrai norite ištrinti šiuos %x elementų?</pluralform> </target> +<source>Preferences</source> +<target>Pirmenybės</target> + <source>Copy NTFS permissions</source> <target>Kopijuoti NTFS leidimus</target> @@ -1425,6 +1428,12 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <source>Append a time stamp to each file name</source> <target>Pridėti laiko žymę prie kiekvieno failo pavadinimo</target> +<source>Comparison</source> +<target>Palyginimas</target> + +<source>Synchronization</source> +<target>Suvienodinimas</target> + <source>Leave as unresolved conflict</source> <target>Palikti kaip neišpręstą konfliktą</target> @@ -1498,7 +1507,7 @@ Tai garantuos pastovią buseną, netgi įvykus rimtai klaidai. <target>Nepavyko rasti simbolinės nuorodos %x reikšmės</target> <source>Cannot open directory %x.</source> -<target>Nepavyksta atverti direktorijos %x.</target> +<target>Nepavyksta atversti direktorijos %x.</target> <source>Cannot enumerate directory %x.</source> <target>Nepavyksta sunumeruoti direktorijos %x.</target> diff --git a/FreeFileSync/Build/Languages/outdated/norwegian.lng b/FreeFileSync/Build/Languages/norwegian.lng index 7a789c66..6f3c8d07 100644 --- a/FreeFileSync/Build/Languages/outdated/norwegian.lng +++ b/FreeFileSync/Build/Languages/norwegian.lng @@ -1,6 +1,6 @@ <header> <language>Norsk</language> - <translator>xxx</translator> + <translator>bjorn039</translator> <locale>nb_NO</locale> <image>flag_norway.png</image> <plural_count>2</plural_count> @@ -11,97 +11,103 @@ <target>Begge sider er endret siden siste synkronisering.</target> <source>Cannot determine sync-direction:</source> -<target>Kan ikke bestemme synkroniseringsretning:</target> +<target>Kan ikke bestemme retning:</target> <source>No change since last synchronization.</source> <target>Ingen endringer siden siste synkronisering.</target> <source>The database entry is not in sync considering current settings.</source> -<target></target> +<target>Databaseemnet er ikke i synkronisering med de aktuelle innstillinger.</target> <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source> -<target>Stiller inn standard synkroniseringsretning: Gamle filer blir overskrevet med nyere filer.</target> +<target>Setter standardretning: Gamle filer overskrives med nyere.</target> <source>Checking recycle bin availability for folder %x...</source> -<target>Sjekker søppelbøtte for tilgjengelig mappe %x...</target> +<target>Sjekker papirkurvens tilgjengelighet for mappen %x...</target> <source>Moving file %x to the recycle bin</source> -<target></target> +<target>Flytter filen %x til papirkurv</target> <source>Moving folder %x to the recycle bin</source> -<target></target> +<target>Flytter mappen %x til papirkurv</target> <source>Moving symbolic link %x to the recycle bin</source> -<target></target> +<target>Flytter symbolsk link %x til papirkurv</target> <source>Deleting file %x</source> -<target>Sletter fil %x</target> +<target>Sletter filen %x</target> <source>Deleting folder %x</source> -<target>Sletter mappe %x</target> +<target>Sletter mappen %x</target> <source>Deleting symbolic link %x</source> -<target>Sletter symbolsk lenke %x</target> +<target>Sletter symlink %x</target> <source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> -<target></target> +<target>Papirkurven kan ikke brukes til følgende mapper. Filene slettes permanent:</target> <source>An exception occurred</source> -<target>Et avvik har oppstått</target> +<target>Unntagelse oppstod</target> <source>A directory path is expected after %x.</source> -<target></target> +<target>Det forventes en mappestil etter %x.</target> <source>Syntax error</source> -<target></target> +<target>Syntaksfeil</target> <source>Cannot open file %x.</source> -<target></target> +<target>Filen %x kan ikke åpnes.</target> <source>File %x does not contain a valid configuration.</source> -<target>Filen %x inneholder en ugyldig innstilling.</target> +<target>Filen %x inneholder ikke gyldige innstillinger.</target> <source>Unequal number of left and right directories specified.</source> -<target></target> +<target>Det er angitt et ulikt antall høyre og venstre mapper.</target> <source>The config file must not contain settings at directory pair level when directories are set via command line.</source> -<target></target> +<target>Instillingsfilen må ikke indeholde innstillinger på mappepar nivå når mapper er satt via kommando.</target> <source>Directories cannot be set for more than one configuration file.</source> -<target></target> +<target>Mapper kan ikke settes til mere enn en innstillingsfil.</target> <source>Command line</source> -<target>Kommandolinje</target> +<target>Kommando</target> <source>Syntax:</source> -<target></target> +<target>Syntaks:</target> -<source>config files</source> -<target></target> +<source>global config file:</source> +<target>Global konfigureringsfil</target> + +<source>config files:</source> +<target>Konfigurer filer</target> <source>directory</source> -<target></target> +<target>mappe</target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Sti til en alternativ GlobalSettings.xml fil</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> -<target></target> +<target>Vilkårlig antall FreeFileSync .ffs_gui og/eller .ffs_batch indstillingsfiler.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target></target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Et ubegrenset antall alternative kataloger for maksimalt én konfigurasjonsfil</target> <source>Cannot find the following folders:</source> <target>Kan ikke finne følgende mapper:</target> <source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source> -<target></target> +<target>Ignorer denne fil for at betrakte hver mappe som tom. Mapperne blir så automatisk opprettet ved synkronisering.</target> <source>A folder input field is empty.</source> -<target>Et mappefelt er tomt.</target> +<target>Der er ikke valgt noen mapper.</target> <source>The corresponding folder will be considered as empty.</source> -<target></target> +<target>Den tilsvarende mappe betraktes som tom.</target> <source>The following folders have dependent paths. Be careful when setting up synchronization rules:</source> -<target></target> +<target>Følgende mapper har avhengige stier. Vær forsiktig med synkroniseringsreglene:</target> <source>File %x has an invalid date.</source> <target>Filen %x har en ugyldig dato.</target> @@ -110,79 +116,79 @@ <target>Dato:</target> <source>Files %x have the same date but a different size.</source> -<target>Filer %x har den samme datoen, men forskjellig størrelse.</target> +<target>Filene %x har den samme dato men forskjellig størrelse.</target> <source>Size:</source> <target>Størrelse:</target> <source>Content comparison was skipped for excluded files %x.</source> -<target></target> +<target>Innholdsanalyse er utelatt for ekskluderte filer %x</target> <source>Items differ in attributes only</source> -<target>Elementer har kun forskjellige attributter</target> +<target>Enhetene har kun forskjellige attributter</target> <source>Resolving symbolic link %x</source> -<target></target> +<target>Løser symbolsk link %x</target> <source>Comparing content of files %x</source> -<target>Sammenligner innhold til filer %x</target> +<target>Sammenligner innhold av filer %x</target> <source>Generating file list...</source> -<target>Lager filliste...</target> +<target>Oppretter filliste...</target> <source>Starting comparison</source> -<target></target> +<target>Starter analyse</target> <source>Calculating sync directions...</source> -<target></target> +<target>Forbereder synkronisering...</target> <source>Out of memory.</source> -<target>For lite minne.</target> +<target>Ikke nok minne.</target> <source>Item exists on left side only</source> -<target>Element eksisterer kun på venstre side</target> +<target>Emnet finnes kun på venstre side</target> <source>Item exists on right side only</source> -<target>Element eksisterer kun på høyre side</target> +<target>Emnet finnes kun på høyre side</target> <source>Left side is newer</source> -<target>Venstre side er nyere</target> +<target>Venstre er nyest</target> <source>Right side is newer</source> -<target>Høyre side er nyere</target> +<target>Høyre er nyest</target> <source>Items have different content</source> -<target>Elementer har forskjellig innhold</target> +<target>Emnene har forskjellig innhold</target> <source>Both sides are equal</source> <target>Begge sider er like</target> <source>Conflict/item cannot be categorized</source> -<target>Konflikt/element kan ikke kategoriseres</target> +<target>Konflikt/ukjent emne</target> <source>Copy new item to left</source> -<target>Kopier nytt element til venstre</target> +<target>Kopier nytt emne mot venstre</target> <source>Copy new item to right</source> -<target>Kopier nytt element til høyre</target> +<target>Kopier nytt emne mot høyre</target> <source>Delete left item</source> -<target>Slett venstre element</target> +<target>Slett venstre emne</target> <source>Delete right item</source> -<target>Slett høyre element</target> +<target>Slett høyre emne</target> <source>Move file on left</source> -<target>Flytt venstre fil</target> +<target>Flytt filen til venstre</target> <source>Move file on right</source> -<target>Flytt høyre fil</target> +<target>Flytt filen til høyre</target> <source>Overwrite left item</source> -<target>Skriv over venstre element</target> +<target>Overskriv venstre emne</target> <source>Overwrite right item</source> -<target>Skriv over høyre element</target> +<target>Overskriv høyre emne</target> <source>Do nothing</source> <target>Ikke gjør noe</target> @@ -194,70 +200,73 @@ <target>Oppdater attributter til høyre</target> <source>Database file %x is incompatible.</source> -<target>Databasefil %x er inkompatibel.</target> +<target>Databasefilen %x er inkompatibel.</target> <source>Initial synchronization:</source> -<target>Førstegangs synkronisering:</target> +<target>Forbereder synkronisering:</target> <source>Database file %x does not yet exist.</source> -<target>Databasefil %x finnes ikke ennå.</target> +<target>Databasefilen %x finnes ikke.</target> <source>Database file is corrupt:</source> -<target>Databasefilen er korrupt</target> +<target>Databasefilen er ødelagt:</target> <source>Cannot write file %x.</source> -<target>Kan ikke skrive fil %x.</target> +<target>Kan ikke opprette filen %x.</target> <source>Cannot read file %x.</source> -<target>Kan ikke lese fil %x.</target> +<target>Kan ikke lese filen %x.</target> <source>Database files do not share a common session.</source> -<target>Databasefiler deler ikke en felles synkroniseringsøkt.</target> +<target>Databasefiler kan ikke dele handling.</target> <source>Searching for folder %x...</source> <target>Søker etter mappen %x...</target> <source>Cannot read file attributes of %x.</source> -<target>Kan ikke lese filattributter fra %x.</target> +<target>Kan ikke lese filattributterne på %x.</target> <source>Cannot get process information.</source> <target>Kan ikke hente prosessinformasjon.</target> <source>Waiting while directory is locked:</source> -<target></target> +<target>Venter mens mappe låses:</target> <source>Lock owner:</source> -<target></target> +<target>Låsens eier</target> <source> <pluralform>1 sec</pluralform> <pluralform>%x sec</pluralform> </source> <target> -<pluralform>1 sekund</pluralform> -<pluralform>%x sekunder</pluralform> +<pluralform>1 sek</pluralform> +<pluralform>%x sek</pluralform> </target> <source>Detecting abandoned lock...</source> -<target></target> +<target>Finner etterlatt lås...</target> <source>Creating file %x</source> -<target>Oppretter fil %x</target> +<target>Oppretter filen %x</target> <source>Items processed:</source> -<target>Elementer behandlet:</target> +<target>Emner behandlet:</target> <source>Items remaining:</source> -<target>Gjenværende elementer:</target> +<target>Gjenstående emner:</target> <source>Total time:</source> -<target>Total tid:</target> +<target>Samlet tid:</target> <source> <pluralform>1 byte</pluralform> <pluralform>%x bytes</pluralform> </source> -<target></target> +<target> +<pluralform>1 byte</pluralform> +<pluralform>%x byte</pluralform> +</target> <source>%x MB</source> <target>%x MB</target> @@ -269,10 +278,10 @@ <target>%x GB</target> <source>Error parsing file %x, row %y, column %z.</source> -<target>Feil ved analysering av fil %x, rekke %y, kolonne %z.</target> +<target>Behandlingsfeil i filen %x, rekke %y, kolonne %z.</target> <source>Cannot set directory lock for %x.</source> -<target></target> +<target>Kan ikke låse mappen %x.</target> <source>Scanning:</source> <target>Skanner:</target> @@ -281,46 +290,49 @@ <pluralform>1 thread</pluralform> <pluralform>%x threads</pluralform> </source> -<target></target> +<target> +<pluralform>1 tråd</pluralform> +<pluralform>%x tråder</pluralform> +</target> <source>Encoding extended time information: %x</source> -<target>Koder utvided tidsinformasjon: %x</target> +<target>Oppretter udvidet tidsinformasjon: %x</target> <source>/sec</source> -<target>/sekund</target> +<target>/sek</target> <source>%x items/sec</source> -<target></target> +<target>%x emner/sek</target> <source>Show in Explorer</source> -<target>Vis i utforsker</target> +<target>Åpne filplasering</target> <source>Open with default application</source> <target>Åpne med standardprogram</target> <source>Browse directory</source> -<target>Utforsk mappe</target> +<target>Gjennomse mappe</target> <source>Cannot access the Volume Shadow Copy Service.</source> -<target></target> +<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-versjon til å opprette skyggekopier på dette systemet.</target> +<target>Bruk FreeFileSync 64-bit til at lage VSS kopier på dette system.</target> <source>Cannot load file %x.</source> -<target>Kan ikke laste filen %x.</target> +<target>Kan ikke lese filen %x.</target> <source>Cannot determine volume name for %x.</source> -<target></target> +<target>Kan ikke bestemme volumnavn for %x.</target> <source>Volume name %x is not part of file path %y.</source> -<target></target> +<target>Volumnavnet %x er ikke en del av filstien %y.</target> <source>Stop requested: Waiting for current operation to finish...</source> -<target></target> +<target>Avbrytelse: Venter til aktuell oppgave avsluttes...</target> <source>Unable to create time stamp for versioning:</source> -<target></target> +<target>Kan ikke opprette tidsstempel til versionering:</target> <source>&Open...</source> <target>&Åpne...</target> @@ -332,55 +344,55 @@ <target>&Avslutt</target> <source>&Program</source> -<target>&Program</target> +<target>&Filer</target> <source>&View help</source> -<target></target> +<target>&Åpne hjelp</target> <source>&About</source> -<target>&Om programmet</target> +<target>&Om</target> <source>&Help</source> <target>&Hjelp</target> <source>Usage:</source> -<target>Bruk:</target> +<target>Gjør slik:</target> <source>1. Select folders to watch.</source> -<target>1. Velg mapper å overvåke.</target> +<target>1. Velg mapper til jobben.</target> <source>2. Enter a command line.</source> -<target>2. Skriv en kommandolinje.</target> +<target>2. Angi en kommando.</target> <source>3. Press 'Start'.</source> -<target>3. Trykk 'Start'.</target> +<target>3. Klikk 'Start'.</target> <source>To get started just import a .ffs_batch file.</source> -<target>Importer en .ffs_batch-fil for å komme i gang</target> +<target>Importer en .ffs_batchfil (Filer > Åpne...) for å komme igang.</target> <source>Folders to watch:</source> -<target></target> +<target>Jobbens mapper:</target> <source>Add folder</source> -<target>Legg til mappe</target> +<target>Tilføy mappe</target> <source>Remove folder</source> <target>Fjern mappe</target> <source>Browse</source> -<target>Bla gjennom</target> +<target><Søk</target> <source>Select a folder</source> <target>Velg en mappe</target> <source>Idle time (in seconds):</source> -<target></target> +<target>PC ikke brukt i (sek)</target> <source>Idle time between last detected change and execution of command</source> -<target>Inaktiv tid mellom forrige endring og utførelse av kommando</target> +<target>Tid mellom sist funnet endring og utførelse</target> <source>Command line:</source> -<target></target> +<target>Kommando:</target> <source> The command is triggered if: @@ -388,139 +400,139 @@ The command is triggered if: - new folders arrive (e.g. USB stick insert) </source> <target> -Kommandoen utløses hvis: -- filer eller mapper endres -- nye mapper legges til (f.eks. en USB-pinne kobles til) +Kommandoen udføres hvis: +- filer eller undermapper endres +- nye mapper finnes (f.eks USB nøkkel) </target> <source>&Start</source> -<target></target> +<target>&Start</target> <source>About</source> <target>Om</target> <source>Build: %x</source> -<target>Build: %x</target> +<target>Utgitt: %x</target> <source>All files</source> <target>Alle filer</target> <source>Automated Synchronization</source> -<target></target> +<target>Automatisk synkronisering</target> <source>Directory monitoring active</source> -<target></target> +<target>Mappeovervåkning aktiv</target> <source>Waiting until all directories are available...</source> -<target></target> +<target>Venter til alle mapper er tilgjengelige...</target> <source>Error</source> <target>Feil</target> <source>&Restore</source> -<target>&Gjenopprett</target> +<target>&Vis vinduer</target> <source>&Show error</source> -<target></target> +<target>&Vis feil</target> <source>&Exit</source> -<target>&Avslutt</target> +<target>&Lukk</target> <source>Incorrect command line:</source> -<target></target> +<target>Ugyldig kommando:</target> <source>&Retry</source> <target>&Prøv igjen</target> <source>File content</source> -<target>Filinnhold</target> +<target>Innhold</target> <source>File time and size</source> -<target>Filtid og størrelse</target> +<target>Størrelse og tid</target> <source>Two way</source> <target>Toveis</target> <source>Mirror</source> -<target>Speile</target> +<target>Speiling</target> <source>Update</source> -<target>Oppdatere</target> +<target>Oppdater</target> <source>Custom</source> -<target>Brukerdefinert</target> +<target>Tilpasset</target> <source>Multiple...</source> <target>Flere...</target> <source>Moving file %x to %y</source> -<target>Flytter fil %x til %y</target> +<target>Flytter filen %x til %y</target> <source>Moving folder %x to %y</source> -<target>Flytter mappe %x til %y</target> +<target>Flytter mappen %x til %y</target> <source>Moving symbolic link %x to %y</source> -<target>Flytter symbolsk lenke %x til %y</target> +<target>Flytter symlinken %x til %y</target> <source>Removing old versions...</source> -<target>Fjerner gamle versjoner...</target> +<target>Fjerner gamle utgaver...</target> <source>Creating symbolic link %x</source> -<target>Oppretter symbolsk lenke %x</target> +<target>Oppretter symlinken %x</target> <source>Creating folder %x</source> -<target>Oppretter mappe %x</target> +<target>Oppretter mappen %x</target> <source>Overwriting file %x</source> -<target>Overskriver fil %x</target> +<target>Overskriver filen %x</target> <source>Overwriting symbolic link %x</source> -<target>Overskriver symbolsk lenke %x</target> +<target>Overskriver symlinken %x</target> <source>Verifying file %x</source> -<target>Verifiserer fil %x</target> +<target>Verifiserer filen %x</target> <source>Updating attributes of %x</source> -<target>Oppdaterer attributter til %x</target> +<target>Oppdaterer attributter for %x</target> <source>Creating a Volume Shadow Copy for %x...</source> -<target></target> +<target>Oppretter VSS kopi for %x...</target> <source>Data verification error: %x and %y have different content.</source> -<target></target> +<target>Godkjennelsesfeil: %x og %y har forskellig innhold</target> <source>Cannot find %x.</source> <target>Kan ikke finne %x.</target> <source>Target folder %x already existing.</source> -<target>Målmappe %x eksisterer allerede.</target> +<target>Destinasjonsmappen %x finnes allerede.</target> <source>Target folder input field must not be empty.</source> -<target>Feltet for målmappe kan ikke være tomt.</target> +<target>Destinasjonsmappen skal angis.</target> <source>Please enter a target folder for versioning.</source> -<target></target> +<target>Angi mappe til versionering.</target> <source>Source folder %x not found.</source> -<target>Kildemappe %x finnes ikke.</target> +<target>Kildemappen %x ble ikke funnet.</target> <source>The following items have unresolved conflicts and will not be synchronized:</source> -<target>De følgende elementene har uoppklarte konflikter og vil ikke bli synkroniserte:</target> +<target>Følgende emner 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></target> +<target>Følgende mapper har markante forskeller. Kontroller at du synkroniserer de rigtige mapper</target> <source>Not enough free disk space available in:</source> -<target>Ikke nok ledig diskplass tilgjengelig på:</target> +<target>Ikke nok ledig diskplass på:</target> <source>Required:</source> -<target>Nødvendig:</target> +<target>Krav:</target> <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>En mappe vil endres som er en del av flere mappepar. Se over innstillingene for synkronisering.</target> +<target>Der endres en mappe som tilhører flere mappepar. Kontroller dine synkroniseringsinnstillinger.</target> <source>Synchronizing folder pair:</source> <target>Synkroniserer mappepar:</target> @@ -529,34 +541,34 @@ Kommandoen utløses hvis: <target>Oppretter database...</target> <source>job name</source> -<target></target> +<target>Jobbnavn</target> <source>Synchronization stopped</source> -<target></target> +<target>Synkronisering avbrudt</target> <source>Synchronization completed with errors</source> -<target>Synkronisering fullført med feil</target> +<target>Synkronisering gjennomført med feil</target> <source>Synchronization completed with warnings</source> -<target>Synkronisering fullført med advarsler</target> +<target>Synkronisering gjennomført med advarsel</target> <source>Nothing to synchronize</source> -<target>Ikke noe å synkronisere</target> +<target>Alt er synkronisert</target> <source>Synchronization completed successfully</source> -<target>Synkdonisering fullført</target> +<target>Synkronisering gjennomført</target> <source>Saving log file %x...</source> -<target>Lagrer loggfil %x...</target> +<target>Lagrer rapport %x...</target> <source>Stopped</source> -<target></target> +<target>Avbrudt</target> <source>You can switch to FreeFileSync's main window to resolve this issue.</source> -<target></target> +<target>Skift til FreeFileSyncs hovedvindu for at løse problemet.</target> <source>&Don't show this warning again</source> -<target></target> +<target>&Vis ikke igen</target> <source>&Ignore</source> <target>&Ignorer</target> @@ -565,64 +577,67 @@ Kommandoen utløses hvis: <target>&Skift</target> <source>Switching to FreeFileSync's main window</source> -<target></target> +<target>Skifter til hovedvinduet</target> <source> <pluralform>Automatic retry in 1 second...</pluralform> <pluralform>Automatic retry in %x seconds...</pluralform> </source> -<target></target> +<target> +<pluralform>Prøver igjen om 1 sekund...</pluralform> +<pluralform>Prøver igjen om %x sekunder...</pluralform> +</target> <source>&Ignore subsequent errors</source> -<target></target> +<target>&Ignorer etterfølgende feil</target> <source>Retrying operation...</source> -<target></target> +<target>Prøver igen...</target> <source>Serious Error</source> -<target></target> +<target>Kritisk feil</target> <source>Check for Program Updates</source> -<target></target> +<target>Søk etter oppdatering</target> <source>A new version of FreeFileSync is available:</source> -<target>En ny versjon av FreeFileSync er tilgjengelig</target> +<target>Oppdatering tilgjengelig:</target> <source>Download now?</source> -<target>Laste ned nå?</target> +<target>Last ned nå?</target> <source>&Download</source> -<target></target> +<target>&Last ned</target> <source>FreeFileSync is up to date.</source> <target>FreeFileSync er oppdatert.</target> <source>Unable to connect to sourceforge.net.</source> -<target>Kan ikke koble til sourceforge.net.</target> +<target>Kan ikke kontakte sourceforge.net.</target> <source>Cannot find current FreeFileSync version number online. Do you want to check manually?</source> -<target></target> +<target>Kunne ikke finne FreeFileSync's versjonsnummer online. Vil du kontrollere manuelt?</target> <source>&Check</source> -<target></target> +<target>&Kontroller</target> <source>Symlink</source> -<target>Symbolsk lenke</target> +<target>Symlink</target> <source>Folder</source> <target>Mappe</target> <source>Full path</source> -<target>Full bane</target> +<target>Full sti</target> <source>Name</source> <target>Navn</target> <source>Relative path</source> -<target>Relativ bane</target> +<target>Relativ sti</target> <source>Base folder</source> -<target>Grunnmappe</target> +<target>Hovedmappe</target> <source>Size</source> <target>Størrelse</target> @@ -631,52 +646,46 @@ Kommandoen utløses hvis: <target>Dato</target> <source>Extension</source> -<target>Filendelse</target> +<target>Filtype</target> <source>Category</source> -<target>Kategori</target> +<target>Status</target> <source>Action</source> <target>Handling</target> <source>Drag && drop</source> -<target>Dra && slipp</target> +<target>Trekk emner hit</target> -<source>Alternate comparison settings</source> -<target></target> +<source>Local comparison settings</source> +<target>Lokale sammenlignings-instillinger</target> -<source>Alternate synchronization settings</source> -<target></target> +<source>Local synchronization settings</source> +<target>Lokale synkroniserings-instillinger</target> <source>Local filter</source> -<target></target> +<target>Lokalt filter</target> <source>Active</source> -<target></target> +<target>Aktiv</target> <source>None</source> -<target></target> +<target>Ingen</target> -<source>Remove alternate settings</source> -<target>Fjern alternative innstillinger</target> +<source>Remove local settings</source> +<target>Fjern lokale instillinger</target> -<source>Clear filter settings</source> -<target>Fjern filterinnstillinger</target> +<source>Reset local filter</source> +<target>Tilbakestill lokalt filter</target> <source>Copy</source> -<target>Kopier</target> +<target>Kopiér</target> <source>Paste</source> -<target></target> - -<source>Alternate Comparison Settings</source> -<target></target> +<target>Lim inn</target> -<source>Alternate Synchronization Settings</source> -<target></target> - -<source>Local Filter</source> -<target></target> +<source>Local Synchronization Settings</source> +<target>Lokale synkroniseringsinstillinger</target> <source>&New</source> <target>&Ny</target> @@ -685,131 +694,168 @@ Kommandoen utløses hvis: <target>&Lagre</target> <source>Save as &batch job...</source> -<target>Lagre som &sammensatt jobb...</target> +<target>Lagre som &batchfil</target> <source>1. &Compare</source> -<target>1. Sammen&lign</target> +<target>1. &Analyser</target> <source>2. &Synchronize</source> <target>2. &Synkroniser</target> -<source>&Global settings</source> -<target>&Felles innstillinger</target> +<source>&Options</source> +<target>&Valg</target> <source>&Language</source> <target>&Språk</target> <source>&Find...</source> -<target></target> +<target>&Søk</target> <source>&Export file list...</source> <target>&Eksporter filliste...</target> <source>&Tools</source> -<target></target> +<target>&Verktøy</target> <source>&Check now</source> -<target></target> +<target>&Søk nå</target> <source>Check &automatically once a week</source> -<target></target> +<target>Søk &automatisk en gang i uken</target> <source>&Check for new version</source> -<target></target> - -<source>Compare</source> -<target>Sammenlign</target> +<target>&Søk etter oppdatering</target> <source>Cancel</source> -<target>Avbryt</target> +<target>Annuller</target> + +<source>Compare</source> +<target>Analysér</target> <source>Synchronize</source> -<target>Synkroniser</target> +<target>Synkronisér</target> <source>Add folder pair</source> -<target>Legg til mappepar</target> +<target>Tilføy mappepar</target> <source>Remove folder pair</source> <target>Fjern mappepar</target> <source>Swap sides</source> -<target>Bytt sider</target> +<target>Bytt side</target> <source>Close search bar</source> -<target></target> +<target>Lukk søkelinje</target> <source>Find:</source> -<target></target> +<target>Søk:</target> <source>Match case</source> -<target>Skill mellom store og små bokstaver</target> +<target>Treffølsomhet (a/A)</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 sammensatt oppgave</target> +<target>Lagre som batchfil</target> + +<source>Save as...</source> +<target>Lagre som</target> <source>View type:</source> -<target></target> +<target>Visning:</target> <source>Select view:</source> -<target></target> +<target>Velg visning:</target> <source>Statistics:</source> -<target></target> +<target>Statistikk:</target> <source>Number of files and folders that will be created</source> -<target>Antall filer og mapper som vil opprettes</target> +<target>Antall filer og mapper som vil bli opprettet</target> <source>Number of files that will be overwritten</source> -<target>Antall filer som blir overskrevet</target> +<target>Antall filer som overskrives</target> <source>Number of files and folders that will be deleted</source> -<target>Antall filer og mapper som vil slettes</target> +<target>Antall filer og mapper som slettes</target> <source>Total bytes to copy</source> -<target>Mengde bytes å kopiere</target> +<target>Antal bytes som kopieres</target> + +<source>Use local settings:</source> +<target>Bruk lokale instillinger</target> <source>Select a variant:</source> -<target></target> +<target>Velg metode:</target> <source>Identify equal files by comparing modification time and size.</source> -<target></target> +<target>Gjennkjenn like filer etter filtid og størrelse.</target> <source>Identify equal files by comparing the file content.</source> -<target></target> +<target>Gjennkjenn like filer etter innhold.</target> <source>Symbolic links:</source> -<target></target> +<target>Symbolsk link:</target> <source>More information</source> -<target></target> +<target>Mer informasjon</target> -<source>OK</source> -<target>OK</target> +<source>Local settings:</source> +<target>Lokale instillinger</target> -<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> -<target></target> +<source>Include:</source> +<target>Inkludér:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target></target> +<source>Exclude:</source> +<target>Ekskludér:</target> -<source>Copy new and updated files to the right folder.</source> -<target></target> +<source>Show examples</source> +<target>Vis eksempler</target> -<source>Configure your own synchronization rules.</source> -<target>Still inn dine egne synkroniseringsregler.</target> +<source>Time span:</source> +<target>Intervall:</target> + +<source>File size:</source> +<target>Filstørrelse:</target> + +<source>Minimum:</source> +<target>Minimum:</target> + +<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> <source>Detect moved files</source> -<target></target> +<target>Gjennkjenn flyttede filer</target> <source> - Requires and creates database files - Detection active after initial sync - Not supported by all file systems </source> -<target></target> +<target> +- Krever og oppretter databasefiler +- Gjennkjennelse aktiv etter første synk +- Understøtter ikke alle filsystemer +</target> + +<source>Detect synchronization directions with the help of database files</source> +<target>Gjennkjenn synkretninger ved hjelp av databasefiler</target> <source>Delete files:</source> -<target></target> +<target>Slett filer:</target> <source>Permanent</source> <target>Permanent</target> @@ -818,25 +864,22 @@ Kommandoen utløses hvis: <target>Slett eller overskriv filer permanent</target> <source>Recycle bin</source> -<target></target> +<target>Papirkurv</target> <source>Back up deleted and overwritten files in the recycle bin</source> -<target></target> +<target>Backup slettede og overskrevne filer i papirkurven</target> <source>Versioning</source> -<target>Versjonshåndtering</target> +<target>Versionering</target> <source>Move files to a user-defined folder</source> -<target></target> +<target>Flytt filer til brukerdefinert mappe</target> <source>Naming convention:</source> -<target>Navnekonvensjon:</target> - -<source>Show examples</source> -<target></target> +<target>Navneregler:</target> <source>Handle errors:</source> -<target></target> +<target>Feilhåndtering:</target> <source>Ignore</source> <target>Ignorer</target> @@ -845,43 +888,43 @@ Kommandoen utløses hvis: <target>Skjul feilmeldinger og advarsler</target> <source>Pop-up</source> -<target>Pop-up</target> +<target>Melding</target> <source>Show pop-up on errors or warnings</source> -<target>Vis pop-upvindu ved feil eller advarsler</target> +<target>Vis feilmeldinger og advarsler</target> <source>On completion:</source> -<target></target> +<target>Når gjennomført:</target> -<source>Detect synchronization directions with the help of database files</source> -<target></target> +<source>OK</source> +<target>OK</target> <source>Start synchronization now?</source> -<target></target> +<target>Synkroniser nå?</target> <source>Variant:</source> -<target></target> +<target>Jobbtype:</target> <source>&Don't show this dialog again</source> -<target></target> +<target>&Ikke vis igjen</target> <source>Items found:</source> -<target>Elementer funnet:</target> +<target>Emner funnet:</target> <source>Speed:</source> <target>Hastighet:</target> <source>Time remaining:</source> -<target>Gjenstående tid:</target> +<target>Resterende tid:</target> <source>Time elapsed:</source> -<target>Tid gått:</target> +<target>Brukt tid:</target> <source>Synchronizing...</source> <target>Synkroniserer...</target> <source>Minimize to notification area</source> -<target></target> +<target>Minimér til systemfeltet</target> <source>Close</source> <target>Lukk</target> @@ -890,151 +933,130 @@ Kommandoen utløses hvis: <target>&Pause</target> <source>Stop</source> -<target></target> +<target>Stopp</target> <source>Create a batch file for unattended synchronization. To start, double-click this file or schedule in a task planner: %x</source> -<target></target> +<target>Oppret batchfil til automatisk synkronisering. Start ved aå dobbeltklikke på filen eller planlegg via oppgaveplanlegger: %x</target> <source>Stop synchronization at first error</source> -<target></target> +<target>Stopp synkronisering ved første feil</target> <source>Run minimized</source> -<target></target> +<target>Kjør minimert</target> <source>Save log:</source> -<target></target> +<target>Lagre logg:</target> <source>Limit:</source> -<target></target> +<target>Grense:</target> <source>Limit maximum number of log files</source> -<target>Begrens maks antall loggfiler</target> +<target>Begrens antall rapporter</target> <source>How can I schedule a batch job?</source> -<target></target> +<target>Hvordan opprettes en batchfil?</target> <source>&Recycle bin</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> - -<source>Include:</source> -<target></target> - -<source>Exclude:</source> -<target></target> - -<source>Time span:</source> -<target></target> - -<source>File size:</source> -<target></target> - -<source>Minimum:</source> -<target></target> - -<source>Maximum:</source> -<target></target> - -<source>&Reset</source> -<target></target> +<target>&Papirkurv</target> <source>The following settings are used for all synchronization jobs.</source> -<target></target> +<target>Disse innstillinger gjelder alle synkroniseringer.</target> <source>Fail-safe file copy</source> -<target>Trygg filkopi</target> +<target>Sikker filkopiering</target> <source> Copy to a temporary file (*.ffs_tmp) before overwriting target. This guarantees a consistent state even in case of a serious error. </source> -<target></target> +<target>Kopiér til midlertidig fil (*.ffs_tmp) før overskriving. Sikrer prosessen ved alvorlige feil.</target> <source>(recommended)</source> -<target></target> +<target>(anbefalt)</target> <source>Copy locked files</source> <target>Kopier låste filer</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> -<target></target> +<target>Kopiér delte eller låste filer med VSS kopiering.</target> <source>(requires administrator rights)</source> -<target></target> +<target>(administrator)</target> <source>Copy file access permissions</source> -<target>Kopier filadgangstillatelser</target> +<target>Kopier adgangstillatelser</target> <source>Transfer file and folder permissions.</source> -<target></target> +<target>Overfør fil og mappetillatelser.</target> <source>Automatic retry on error:</source> -<target></target> +<target>Antall forsøk ved feil:</target> <source>Retry count:</source> -<target></target> +<target>Antall forsøk:</target> <source>Delay (in seconds):</source> -<target></target> +<target>Forsinkelse (sek):</target> <source>Customize context menu:</source> -<target></target> +<target>Tilpass kontekstmeny:</target> <source>Description</source> <target>Beskrivelse</target> <source>Restore hidden windows</source> -<target></target> +<target>Åpne skjulte vinduer</target> <source>&Default</source> <target>&Standard</target> <source>Source code written in C++ using:</source> -<target>Kildekode skrevet i C++ med hjelp fra:</target> +<target>Kildekoden er skrevet i C++ med Hjelp fra:</target> <source>If you like FreeFileSync</source> <target>Hvis du liker FreeFileSync</target> <source>Donate with PayPal</source> -<target>Doner med PayPal</target> +<target>Donér med PayPal</target> <source>Feedback and suggestions are welcome</source> -<target>Tilbakemelding og forslag er velkomne</target> +<target>Kritikk og forslag er ønsket</target> <source>Homepage</source> <target>Hjemmeside</target> <source>Email</source> -<target>E-post</target> +<target>Email</target> <source>Published under the GNU General Public License</source> <target>Utgitt under GNU General Public Licence</target> <source>Many thanks for localization:</source> -<target>Mange takk for lokalisering:</target> +<target>Takk for oversettelse:</target> <source>Save as Batch Job</source> -<target></target> +<target>Lagre som batchfil</target> <source>Delete Items</source> -<target></target> +<target>Slett emner</target> -<source>Global Settings</source> -<target></target> +<source>Options</source> +<target>Valg</target> <source>Select Time Span</source> -<target></target> +<target>Velg tidsintervall</target> + +<source>&Preferences...</source> +<target>&Egenskaper</target> <source>Folder Pairs</source> -<target></target> +<target>Mappepar</target> <source>Find</source> <target>Søk</target> <source>View Settings</source> -<target></target> +<target>Visninger</target> <source>Overview</source> <target>Oversikt</target> @@ -1043,37 +1065,34 @@ This guarantees a consistent state even in case of a serious error. <target>Innstilling</target> <source>Main Bar</source> -<target></target> - -<source>Open...</source> -<target>Åpne...</target> - -<source>Save</source> -<target>Lagre</target> +<target>Hovedlinje</target> <source>Compare both sides</source> -<target>Sammenlign begge sider</target> +<target>Analyser begge sider</target> <source>Comparison settings</source> -<target>Innstillinger for sammenligning</target> +<target>Analyseinnstillinger</target> <source>Synchronization settings</source> -<target>Innstillinger for synkronisering</target> +<target>Synkroniseringsinnstillinger</target> <source>Start synchronization</source> <target>Start synkronisering</target> <source>Confirm</source> -<target></target> +<target>Bekreft</target> <source> <pluralform>Do you really want to execute the command %y for one item?</pluralform> <pluralform>Do you really want to execute the command %y for %x items?</pluralform> </source> -<target></target> +<target> +<pluralform>Vil du kjøre kommandoen %y for 1 emne?</pluralform> +<pluralform>Vil du kjøre kommandoen %y for %x emner?</pluralform> +</target> <source>&Execute</source> -<target></target> +<target>&Utfør</target> <source> <pluralform>1 directory</pluralform> @@ -1097,19 +1116,22 @@ This guarantees a consistent state even in case of a serious error. <pluralform>Showing %y of 1 row</pluralform> <pluralform>Showing %y of %x rows</pluralform> </source> -<target></target> +<target> +<pluralform>Viser %y af 1 rekke</pluralform> +<pluralform>Viser %y af %x rekker</pluralform> +</target> <source>Set direction:</source> -<target>Still inn retningen:</target> +<target>Retning:</target> <source>multiple selection</source> -<target>flervalg</target> +<target>velg flere</target> <source>Include via filter:</source> -<target></target> +<target>Inkludér via filter:</target> <source>Exclude via filter:</source> -<target>Ekskluder via filter:</target> +<target>Ekskluder m. filter:</target> <source>Include temporarily</source> <target>Inkluder midlertidig</target> @@ -1121,7 +1143,7 @@ This guarantees a consistent state even in case of a serious error. <target>Slett</target> <source>Include all</source> -<target>Inkluder alle</target> +<target>Velg alle</target> <source>Exclude all</source> <target>Ekskluder alle</target> @@ -1133,13 +1155,13 @@ This guarantees a consistent state even in case of a serious error. <target>Små</target> <source>Medium</source> -<target>Middels</target> +<target>Medium</target> <source>Large</source> <target>Store</target> <source>Select time span...</source> -<target>Velg tidsområde...</target> +<target>Velg tidsinterval...</target> <source>Default view</source> <target>Standardvisning</target> @@ -1148,103 +1170,103 @@ This guarantees a consistent state even in case of a serious error. <target>Vis "%x"</target> <source>Last session</source> -<target>Siste økt</target> +<target>Siste oppgave</target> <source>Folder Comparison and Synchronization</source> -<target>Mappesammenligning og synkronisering</target> +<target>Mappeanalyse og synkronisering</target> <source>Configuration saved</source> -<target>Innstilling lagret</target> +<target>Lagrede instillinger</target> <source>FreeFileSync batch</source> -<target>FreeFileSync batch</target> +<target>FreeFileSync batchfil</target> <source>Do you want to save changes to %x?</source> -<target>Vil du lagre endringene til %x?</target> +<target>Vil du lagre endringer i %x?</target> <source>Never save &changes</source> -<target></target> +<target>&Aldri lagre endringer</target> <source>Do&n't save</source> <target>&Ikke lagre</target> <source>Delete selected configurations</source> -<target></target> +<target>Slett valgte innstillinger</target> -<source>Filter</source> -<target>Filter</target> +<source>Synchronization Settings</source> +<target>Synkroniseringsinnstillinger</target> + +<source>Reset filter</source> +<target>Tilbakestill filter</target> <source>Show files that exist on left side only</source> -<target>Vis filer som bare finnes på venstre side</target> +<target>Vis filer som kun finnes på venstre side</target> <source>Show files that exist on right side only</source> -<target>Vis filer som bare finnes på høyre side</target> +<target>Vis filer som kun finnes på høyre side</target> <source>Show files that are newer on left</source> -<target>Vis filer som er nyere til venstre</target> +<target>Vis nyere filer på venstre side</target> <source>Show files that are newer on right</source> -<target>Vis filer som er nyere til høyre</target> +<target>Vis nyere filer på høyre side</target> <source>Show files that are equal</source> -<target>Vis filer som er like</target> +<target>Vis like filer</target> <source>Show files that are different</source> -<target>Vis filer som er forskjellige</target> +<target>Vis ulike filer</target> <source>Show conflicts</source> <target>Vis konflikter</target> <source>Show files that will be created on the left side</source> -<target>Vis filer som blir opprettet på venstre side</target> +<target>Vis filer som opprettes på venstre side</target> <source>Show files that will be created on the right side</source> -<target>Vis filer som blir opprettet på høyre side</target> +<target>Vis filer som opprettes på høyre side</target> <source>Show files that will be deleted on the left side</source> -<target>Vis filer som blir slettet på venstre side</target> +<target>Vis filer som slettes på venstre side</target> <source>Show files that will be deleted on the right side</source> -<target>Vis filer som blir slettet på høyre side</target> +<target>Vis filer som slettes på høyre side</target> <source>Show files that will be overwritten on left side</source> -<target>Vis filer som blir overskrevet på venstre side</target> +<target>Vis filer som overskrives på venstre side</target> <source>Show files that will be overwritten on right side</source> -<target>Vis filer som blir overskrevet på høyre side</target> +<target>Vis filer som overskrives på høyre side</target> <source>Show files that won't be copied</source> -<target>Vis filer som ikke blir kopiert</target> +<target>Vis filer som ikke kopieres</target> <source>Show filtered or temporarily excluded files</source> <target>Vis filtrerte eller midlertidig ekskluderte filer</target> <source>Set as default</source> -<target>Set som standard</target> - -<source>All files are in sync</source> -<target></target> +<target>Sett som standard</target> -<source>Synchronization Settings</source> -<target></target> +<source>Filter</source> +<target>Filter</target> -<source>Comparison Settings</source> -<target></target> +<source>All files are in sync</source> +<target>Alt er synkronisert</target> <source>Cannot find %x</source> <target>Kan ikke finne %x</target> <source>Comma-separated values</source> -<target></target> +<target>Kommaoppdelte verdier</target> <source>File list exported</source> -<target>Filliste eksportert</target> +<target>Fillisten ble eksportert</target> <source>Searching for program updates...</source> -<target></target> +<target>Søker etter oppdatering...</target> <source>Close progress dialog</source> -<target>Lukk status vindu</target> +<target>Lukk dialogen</target> <source>Standby</source> <target>Standby</target> @@ -1253,16 +1275,16 @@ This guarantees a consistent state even in case of a serious error. <target>Logg av</target> <source>Shut down</source> -<target>Slå av maskinen</target> +<target>Avslutt</target> <source>Hibernate</source> -<target>Sett i dvalemodus</target> +<target>Dvale</target> <source>Scanning...</source> <target>Skanner...</target> <source>Comparing content...</source> -<target>Sammenligner innhold...</target> +<target>Analyserer innhold...</target> <source>Info</source> <target>Info</target> @@ -1271,121 +1293,148 @@ This guarantees a consistent state even in case of a serious error. <target>Advarsel</target> <source>Select all</source> -<target></target> +<target>Velg alt</target> <source>Paused</source> <target>Pauset</target> <source>Initializing...</source> -<target>Initialiserer...</target> +<target>Forbereder...</target> <source>Completed</source> -<target>Fullført</target> +<target>Gjennomført</target> <source>&Continue</source> -<target></target> +<target>&Fortsett</target> <source>Progress</source> -<target></target> +<target>Fremskritt</target> <source>Log</source> -<target></target> - -<source>Today</source> -<target>Idag</target> - -<source>This week</source> -<target>Denne uke</target> - -<source>This month</source> -<target>Denne måned</target> - -<source>This year</source> -<target>Dette år</target> - -<source>Last x days</source> -<target>Siste x dager</target> - -<source>Byte</source> -<target>Byte</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> +<target>Logg</target> <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> </source> -<target></target> +<target> +<pluralform>Vil du flytte følgende emne til papirkurven?</pluralform> +<pluralform>Vil du flytte følgende %x emner til papirkurven?</pluralform> +</target> <source>Move</source> -<target></target> +<target>Flytt</target> <source> <pluralform>Do you really want to delete the following item?</pluralform> <pluralform>Do you really want to delete the following %x items?</pluralform> </source> -<target></target> - -<source>Exclude</source> -<target>Ekskluder</target> - -<source>Direct</source> -<target>Direkte</target> +<target> +<pluralform>Vil du slette følgende emne?</pluralform> +<pluralform>Vil du slette følgende %x emner?</pluralform> +</target> -<source>Follow</source> -<target>Følg</target> +<source>Preferences</source> +<target>Egenskaper</target> <source>Copy NTFS permissions</source> -<target>Kopier NTFS-tillatelser</target> +<target>Kopier NTFS tillatelser</target> <source>Integrate external applications into context menu. The following macros are available:</source> -<target>Integrer eksterne programmer i høyreklikkmeny. Følgende makroer er tilgjengelige:</target> +<target>Integrer eksterne programmer i kontekstmeny. Bruk følgende makroer:</target> <source>- full file or folder name</source> -<target>- full fil- eller mappenavn</target> +<target>Komplett fil- eller mappenavn</target> <source>- folder part only</source> -<target>- kun mapper</target> +<target>Kun mappedelen</target> <source>- Other side's counterpart to %item_path%</source> -<target>- Den andre sidens motpart til %item_path%</target> +<target>Motsatt sides motstykke til %item_path%</target> <source>- Other side's counterpart to %item_folder%</source> -<target>- Den andre sidens motpart til %item_folder%</target> +<target>Motsatt sides motstykke til %item_folder%</target> <source>Restore all hidden windows and warnings?</source> -<target></target> +<target>Åpne alle skjulte vinduer og advarsler?</target> -<source>Leave as unresolved conflict</source> -<target>Etterlat som uløste konflikter</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> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Oppret speiling av venstre mappe ved å tilpasse den høyre mappe</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Kopier nye og oppdaterte filer til høyre mappe.</target> + +<source>Configure your own synchronization rules.</source> +<target>Oppret dine egne synkroniseringsregler.</target> + +<source>Exclude</source> +<target>Ekskludér</target> + +<source>Direct</source> +<target>Direkte</target> + +<source>Follow</source> +<target>Følg</target> + +<source>Today</source> +<target>I dag</target> + +<source>This week</source> +<target>Denne uke</target> + +<source>This month</source> +<target>Denne måned</target> + +<source>This year</source> +<target>Dette år</target> + +<source>Last x days</source> +<target>Siste x dager</target> + +<source>Byte</source> +<target>Byte</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> -<target>Erstatt</target> +<target>Erstat</target> <source>Move files and replace if existing</source> -<target>Flytt filer og erstatt hvis eksisterer</target> +<target>Flytt fil og erstatt eventuelt eksisterende</target> <source>Time stamp</source> -<target></target> +<target>Tidsstempel</target> <source>Append a time stamp to each file name</source> -<target></target> +<target>Legg til tidsstempel til hvert filnavn</target> + +<source>Comparison</source> +<target>Sammenligning</target> + +<source>Synchronization</source> +<target>Synkronisering</target> + +<source>Leave as unresolved conflict</source> +<target>Etterlat som uløst konflikt</target> <source>File</source> <target>Fil</target> <source>YYYY-MM-DD hhmmss</source> -<target>ÅÅÅÅ-MM-DD ttmmss</target> +<target>YYYY-MM-DD hhmmss</target> <source>Files</source> <target>Filer</target> <source>Items</source> -<target></target> +<target>Emner</target> <source>Percentage</source> <target>Prosent</target> @@ -1412,25 +1461,25 @@ This guarantees a consistent state even in case of a serious error. <target>Kan ikke skrive filattributter til %x.</target> <source>Cannot write modification time of %x.</source> -<target>Kan ikke skrive endringstid til %x.</target> +<target>Kan ikke oppdatere tidsendring på %x.</target> <source>Cannot read security context of %x.</source> -<target>Kan ikke lese sikkerhetskontekst til %x.</target> +<target>Kan ikke lese sikkerhetsinnstillinger på %x.</target> <source>Cannot write security context of %x.</source> -<target>Kan ikke skrive sikkerhetskontekst til %x.</target> +<target>Kan ikke skrive sikkerhetsinnstillinger til %x.</target> <source>Cannot read permissions of %x.</source> -<target>Kan ikke lese tillatelser til %x.</target> +<target>Kan ikke lese tillatelsene på %x.</target> <source>Cannot write permissions of %x.</source> -<target>Kan ikke skrive tillatelser til %x.</target> +<target>Kan ikke skrive tillatelsene til %x.</target> <source>Cannot create directory %x.</source> <target>Kan ikke opprette mappen %x.</target> <source>Cannot create symbolic link %x.</source> -<target></target> +<target>Kan ikke opprette symbolsk link %x.</target> <source>Cannot find system function %x.</source> <target>Kan ikke finne systemfunksjonen %x.</target> @@ -1439,16 +1488,16 @@ This guarantees a consistent state even in case of a serious error. <target>Kan ikke kopiere filen %x til %y.</target> <source>Type of item %x is not supported:</source> -<target>Type element %x er ikke støttet:</target> +<target>Filtypen %x støttes ikke:</target> <source>Cannot resolve symbolic link %x.</source> -<target>Kan ikke følge symbolsk lenke %x.</target> +<target>Kan ikke følge symlinken %x.</target> <source>Cannot open directory %x.</source> -<target>Kan ikke åpne mappe %x.</target> +<target>Kan ikke åpne mappen %x.</target> <source>Cannot enumerate directory %x.</source> -<target>Kan ikke gjennomgå mappe %x.</target> +<target>Kan ikke telle mappen %x.</target> <source>%x TB</source> <target>%x TB</target> @@ -1484,32 +1533,32 @@ This guarantees a consistent state even in case of a serious error. </target> <source>Unable to register to receive system messages.</source> -<target></target> +<target>Kunne ikke registrere mottakelse av systembesjkeder.</target> <source>Cannot set privilege %x.</source> -<target>Kan ikke sette privilegie %x.</target> +<target>Kan ikke sette %x privilegier.</target> <source>Unable to suspend system sleep mode.</source> -<target></target> +<target>Kunne ikke oppheve standby.</target> <source>Cannot change process I/O priorities.</source> -<target>Kan ikke endre I/O prioriet på prosess</target> +<target>Kan ikke endre I/O prioriteter.</target> <source>Unable to move %x to the recycle bin.</source> -<target></target> +<target>Kunne ikke flytte %x til papirkurv.</target> <source>Checking recycle bin failed for folder %x.</source> -<target></target> +<target>Sjekk papirkurv-feil for mappen %x</target> <source>Cannot determine final path for %x.</source> -<target></target> +<target>Kan ikke bestemme endelig sti for %x</target> <source>Error Code %x:</source> -<target>Feil kode %x:</target> +<target>Feilkode %x:</target> <source>Cannot read the following XML elements:</source> -<target>Kan ikke lese følgende XML-elementer:</target> +<target>Kan ikke lese følgende XML emner:</target> <source>Configuration file %x loaded partially only.</source> -<target>Innstillingsfilen %x bare delvis lastet.</target> +<target>Configureringsfilen %x er delvis innlastet</target> diff --git a/FreeFileSync/Build/Languages/polish.lng b/FreeFileSync/Build/Languages/polish.lng index fa0e36f9..e6a46560 100644 --- a/FreeFileSync/Build/Languages/polish.lng +++ b/FreeFileSync/Build/Languages/polish.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>Składnia:</target> -<source>config files</source> -<target>pliki konfiguracyjne</target> +<source>global config file:</source> +<target>globalny plik konfiguracyjny:</target> + +<source>config files:</source> +<target>pliki konfiguracyjne:</target> <source>directory</source> <target>katalog</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Alternatywna ścieżka do pliku GlobalSettings.xml.</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Dowolna ilość plików konfiguracyjnych FreeFileSync .ffs_gui/.ffs_batch.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Dowolna liczba katalogów w przypadku użycia jednego pliku konfiguracyjnego.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Dowolna liczba alternatywnych par katalogów dla najwyżej jednego pliku konfiguracyjnego.</target> <source>Cannot find the following folders:</source> <target>Nie można znaleźć następujących katalogów:</target> @@ -655,11 +661,11 @@ Komenda jest wykonywana gdy: <source>Drag && drop</source> <target>Drag && Drop</target> -<source>Alternate comparison settings</source> -<target>Alternatywne ustawienia porównywania</target> +<source>Local comparison settings</source> +<target>Lokalne ustawienia porównywania</target> -<source>Alternate synchronization settings</source> -<target>Alternatywne ustawienia synchronizacji</target> +<source>Local synchronization settings</source> +<target>Lokalne ustawienia synchronizacji</target> <source>Local filter</source> <target>Filtr lokalny</target> @@ -670,11 +676,11 @@ Komenda jest wykonywana gdy: <source>None</source> <target>Żaden</target> -<source>Remove alternate settings</source> -<target>Usuń alternatywne ustawienia</target> +<source>Remove local settings</source> +<target>Usuń lokalne ustawienia</target> -<source>Clear filter settings</source> -<target>Wyczyść ustawienia filtra</target> +<source>Reset local filter</source> +<target>Resetuj lokalny filtr</target> <source>Copy</source> <target>Kopiuj</target> @@ -682,14 +688,8 @@ Komenda jest wykonywana gdy: <source>Paste</source> <target>Wklej</target> -<source>Alternate Comparison Settings</source> -<target>Alternatywne ustawienia porównywania</target> - -<source>Alternate Synchronization Settings</source> -<target>Alternatywne ustawienia synchronizacji</target> - -<source>Local Filter</source> -<target>Filtr lokalny</target> +<source>Local Synchronization Settings</source> +<target>Lokalne Ustawienia Synchronizacji</target> <source>&New</source> <target>&Nowy</target> @@ -706,8 +706,8 @@ Komenda jest wykonywana gdy: <source>2. &Synchronize</source> <target>2. &Synchronizuj</target> -<source>&Global settings</source> -<target>&Ustawienia programu</target> +<source>&Options</source> +<target>&Opcje</target> <source>&Language</source> <target>&Język</target> @@ -730,12 +730,12 @@ Komenda jest wykonywana gdy: <source>&Check for new version</source> <target>Sprawdź &nową wersję</target> -<source>Compare</source> -<target>Porównaj</target> - <source>Cancel</source> <target>Anuluj</target> +<source>Compare</source> +<target>Porównaj</target> + <source>Synchronize</source> <target>Synchronizuj</target> @@ -757,9 +757,21 @@ Komenda jest wykonywana gdy: <source>Match case</source> <target>Uwzględnij wielkość liter</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> + <source>View type:</source> <target>Typ widoku:</target> @@ -781,6 +793,9 @@ Komenda jest wykonywana gdy: <source>Total bytes to copy</source> <target>Całkowity rozmiar do skopiowania</target> +<source>Use local settings:</source> +<target>Korzystaj z ustawień lokalnych:</target> + <source>Select a variant:</source> <target>Określ wariant:</target> @@ -796,20 +811,35 @@ Komenda jest wykonywana gdy: <source>More information</source> <target>Więcej informacji</target> -<source>OK</source> -<target>OK</target> +<source>Local settings:</source> +<target>Ustawienia lokalne:</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> +<source>Include:</source> +<target>Dołącz:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Utwórz lustrzaną kopię lewego katalogu. Cała zawartość prawego katalogu będzie usunięta bądź nadpisana zawartością lewego katalogu.</target> +<source>Exclude:</source> +<target>Wyklucz:</target> -<source>Copy new and updated files to the right folder.</source> -<target>Kopiuj nowe i zmodyfikowane pliki do prawego katalogu.</target> +<source>Show examples</source> +<target>Przykład</target> -<source>Configure your own synchronization rules.</source> -<target>Skonfiguruj swoje własne reguły synchronizacji.</target> +<source>Time span:</source> +<target>Przedział czasu:</target> + +<source>File size:</source> +<target>Rozmiar pliku:</target> + +<source>Minimum:</source> +<target>Minimalny:</target> + +<source>Maximum:</source> +<target>Maksymalny:</target> + +<source>&Reset</source> +<target>&Resetuj</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> <source>Detect moved files</source> <target>Wykryj przeniesione pliki.</target> @@ -825,6 +855,9 @@ Komenda jest wykonywana gdy: - Niewspierany przez wszystkie systemy plików </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Kierunki synchronizacji określane są przy pomocy bazy danych</target> + <source>Delete files:</source> <target>Usuwanie plików:</target> @@ -849,9 +882,6 @@ Komenda jest wykonywana gdy: <source>Naming convention:</source> <target>Konwencja nazewnictwa:</target> -<source>Show examples</source> -<target>Przykład</target> - <source>Handle errors:</source> <target>Obsługa błędów:</target> @@ -870,8 +900,8 @@ Komenda jest wykonywana gdy: <source>On completion:</source> <target>Po zakończeniu:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Kierunki synchronizacji określane są przy pomocy bazy danych</target> +<source>OK</source> +<target>OK</target> <source>Start synchronization now?</source> <target>Rozpocząć teraz synchronizację?</target> @@ -933,30 +963,6 @@ Komenda jest wykonywana gdy: <source>&Recycle bin</source> <target>&Kosz systemowy</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> - -<source>Include:</source> -<target>Dołącz:</target> - -<source>Exclude:</source> -<target>Wyklucz:</target> - -<source>Time span:</source> -<target>Przedział czasu:</target> - -<source>File size:</source> -<target>Rozmiar pliku:</target> - -<source>Minimum:</source> -<target>Minimalny:</target> - -<source>Maximum:</source> -<target>Maksymalny:</target> - -<source>&Reset</source> -<target>&Resetuj</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Następujące ustawienia stosowane są do wszystkich zadań synchronizacji.</target> @@ -1041,12 +1047,15 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Delete Items</source> <target>Usuń elementy</target> -<source>Global Settings</source> -<target>Ustawienia ogólne</target> +<source>Options</source> +<target>Opcje</target> <source>Select Time Span</source> <target>Określ</target> +<source>&Preferences...</source> +<target>&Preferencje...</target> + <source>Folder Pairs</source> <target>Pary katalogów</target> @@ -1065,12 +1074,6 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Main Bar</source> <target>Główny pasek</target> -<source>Open...</source> -<target>Otwórz...</target> - -<source>Save</source> -<target>Zapisz</target> - <source>Compare both sides</source> <target>Porównaj foldery</target> @@ -1201,8 +1204,11 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Delete selected configurations</source> <target>Usuń wybrane konfiguracje</target> -<source>Filter</source> -<target>Filtr</target> +<source>Synchronization Settings</source> +<target>Ustawienia synchronizacji</target> + +<source>Reset filter</source> +<target>Resetuj filtr</target> <source>Show files that exist on left side only</source> <target>Pokaż pliki istniejące tylko po lewej stronie</target> @@ -1252,15 +1258,12 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Set as default</source> <target>Zapisz jako domyślne</target> +<source>Filter</source> +<target>Filtr</target> + <source>All files are in sync</source> <target>Pliki zsynchronizowane</target> -<source>Synchronization Settings</source> -<target>Ustawienia synchronizacji</target> - -<source>Comparison Settings</source> -<target>Ustawienia porównywania</target> - <source>Cannot find %x</source> <target>Nie można znaleźć %x</target> @@ -1321,30 +1324,6 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Log</source> <target>Log</target> -<source>Today</source> -<target>Dzisiaj</target> - -<source>This week</source> -<target>W tym tygodniu</target> - -<source>This month</source> -<target>W tym miesiącu</target> - -<source>This year</source> -<target>W tym roku</target> - -<source>Last x days</source> -<target>Ostatnie x dni</target> - -<source>Byte</source> -<target>Bajtów</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1368,14 +1347,8 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <pluralform>Czy na pewno chcesz usunąć %x następujących elementów?</pluralform> </target> -<source>Exclude</source> -<target>Wyklucz</target> - -<source>Direct</source> -<target>Bezpośrednio</target> - -<source>Follow</source> -<target>Podążaj</target> +<source>Preferences</source> +<target>Preferencje</target> <source>Copy NTFS permissions</source> <target>Kopiuj uprawnienia NTFS</target> @@ -1398,8 +1371,50 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Restore all hidden windows and warnings?</source> <target>Przywrócić wszystkie ukryte dialogi?</target> -<source>Leave as unresolved conflict</source> -<target>Zostaw jako nierozwiązany konflikt</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> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Utwórz lustrzaną kopię lewego katalogu. Cała zawartość prawego katalogu będzie usunięta bądź nadpisana zawartością lewego katalogu.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Kopiuj nowe i zmodyfikowane pliki do prawego katalogu.</target> + +<source>Configure your own synchronization rules.</source> +<target>Skonfiguruj swoje własne reguły synchronizacji.</target> + +<source>Exclude</source> +<target>Wyklucz</target> + +<source>Direct</source> +<target>Bezpośrednio</target> + +<source>Follow</source> +<target>Podążaj</target> + +<source>Today</source> +<target>Dzisiaj</target> + +<source>This week</source> +<target>W tym tygodniu</target> + +<source>This month</source> +<target>W tym miesiącu</target> + +<source>This year</source> +<target>W tym roku</target> + +<source>Last x days</source> +<target>Ostatnie x dni</target> + +<source>Byte</source> +<target>Bajtów</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>Zamień</target> @@ -1413,6 +1428,15 @@ program kopiuje zawartość do pliku tymczasowego (*.ffs_tmp), a następnie nadp <source>Append a time stamp to each file name</source> <target>Dołącz datę do nazwy każdego pliku</target> +<source>Comparison</source> +<target>Porównanie</target> + +<source>Synchronization</source> +<target>Synchronizacja</target> + +<source>Leave as unresolved conflict</source> +<target>Zostaw jako nierozwiązany konflikt</target> + <source>File</source> <target>Plik</target> diff --git a/FreeFileSync/Build/Languages/portuguese.lng b/FreeFileSync/Build/Languages/portuguese.lng index f6e15a74..5636a968 100644 --- a/FreeFileSync/Build/Languages/portuguese.lng +++ b/FreeFileSync/Build/Languages/portuguese.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>Sintaxe:</target> -<source>config files</source> -<target>ficheiros de configuração</target> +<source>global config file:</source> +<target>ficheiro configuração global:</target> + +<source>config files:</source> +<target>ficheiros configuração:</target> <source>directory</source> <target>directório</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Caminho para o ficheiro GlobalSettings.xml alternativo.</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Qualquer número de ficheiros de configuração .ffs_gui e/ou .ffs_batch do FreeFileSync.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Qualquer número de directórios alternativos para apenas um ficheiro de configuração.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Qualquer número de pares de directórios alternativos para apenas um ficheiro de configuração.</target> <source>Cannot find the following folders:</source> <target>Não é possível encontrar as seguintes pastas:</target> @@ -651,11 +657,11 @@ O comando é executado se: <source>Drag && drop</source> <target>Arrastar && Largar</target> -<source>Alternate comparison settings</source> -<target>Definições de comparação alternativas</target> +<source>Local comparison settings</source> +<target>Opções locais de comparação</target> -<source>Alternate synchronization settings</source> -<target>Definições de sincronização alternativas</target> +<source>Local synchronization settings</source> +<target>Opções locais de sincronização</target> <source>Local filter</source> <target>Filtro local</target> @@ -666,11 +672,11 @@ O comando é executado se: <source>None</source> <target>Nenhum</target> -<source>Remove alternate settings</source> -<target>Remover opções alternativas</target> +<source>Remove local settings</source> +<target>Apagar opções locais</target> -<source>Clear filter settings</source> -<target>Limpar opções do filtro</target> +<source>Reset local filter</source> +<target>Limpar filtro local</target> <source>Copy</source> <target>Copiar</target> @@ -678,14 +684,8 @@ O comando é executado se: <source>Paste</source> <target>Colar</target> -<source>Alternate Comparison Settings</source> -<target>Definições de comparação alternativas</target> - -<source>Alternate Synchronization Settings</source> -<target>Definições de sincronização alternativas</target> - -<source>Local Filter</source> -<target>Filtro local</target> +<source>Local Synchronization Settings</source> +<target>Opções Locais Sincronização</target> <source>&New</source> <target>&Novo</target> @@ -702,7 +702,7 @@ O comando é executado se: <source>2. &Synchronize</source> <target>2. &Sincronizar</target> -<source>&Global settings</source> +<source>&Options</source> <target>&Opções</target> <source>&Language</source> @@ -726,12 +726,12 @@ O comando é executado se: <source>&Check for new version</source> <target>&Procurar por actualizações</target> -<source>Compare</source> -<target>Comparar</target> - <source>Cancel</source> <target>Cancelar</target> +<source>Compare</source> +<target>Comparar</target> + <source>Synchronize</source> <target>Sincronizar</target> @@ -753,8 +753,20 @@ O comando é executado se: <source>Match case</source> <target>Correspondência</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 batch</target> +<target>Guardar como sincronização batch</target> + +<source>Save as...</source> +<target>Guardar como...</target> <source>View type:</source> <target>Tipo de vista:</target> @@ -777,6 +789,9 @@ O comando é executado se: <source>Total bytes to copy</source> <target>Total em bytes a copiar</target> +<source>Use local settings:</source> +<target>Usar opções locais:</target> + <source>Select a variant:</source> <target>Seleccionar uma variante:</target> @@ -792,20 +807,35 @@ O comando é executado se: <source>More information</source> <target>Mais informação</target> -<source>OK</source> -<target>OK</target> +<source>Local settings:</source> +<target>Opções locais:</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> +<source>Include:</source> +<target>Incluir:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Criar uma cópia exacta da pasta à esquerda, adaptando a da direita para coincidir.</target> +<source>Exclude:</source> +<target>Excluir:</target> -<source>Copy new and updated files to the right folder.</source> -<target>Copiar ficheiros novos e actualizados para a pasta à direita.</target> +<source>Show examples</source> +<target>Mostrar exemplos</target> -<source>Configure your own synchronization rules.</source> -<target>Configure as suas regras de sincronização.</target> +<source>Time span:</source> +<target>Intervalo de tempo:</target> + +<source>File size:</source> +<target>Tamanho ficheiro:</target> + +<source>Minimum:</source> +<target>Mínimo:</target> + +<source>Maximum:</source> +<target>Máximo</target> + +<source>&Reset</source> +<target>&Reiniciar</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> <source>Detect moved files</source> <target>Detectar ficheiros movidos</target> @@ -821,6 +851,9 @@ O comando é executado se: - Não é suportado por todos os sistemas de ficheiros </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Detectar a direcção de sincronização com a ajuda de base de dados</target> + <source>Delete files:</source> <target>Eliminar ficheiros:</target> @@ -845,9 +878,6 @@ O comando é executado se: <source>Naming convention:</source> <target>Convenção de nomes:</target> -<source>Show examples</source> -<target>Mostrar exemplos</target> - <source>Handle errors:</source> <target>Tratar erros:</target> @@ -866,8 +896,8 @@ O comando é executado se: <source>On completion:</source> <target>Ao completar:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Detectar a direcção de sincronização com a ajuda de base de dados</target> +<source>OK</source> +<target>OK</target> <source>Start synchronization now?</source> <target>Iniciar sincronização agora?</target> @@ -929,30 +959,6 @@ O comando é executado se: <source>&Recycle bin</source> <target>&Reciclagem</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> - -<source>Include:</source> -<target>Incluir:</target> - -<source>Exclude:</source> -<target>Excluir:</target> - -<source>Time span:</source> -<target>Intervalo de tempo:</target> - -<source>File size:</source> -<target>Tamanho ficheiro:</target> - -<source>Minimum:</source> -<target>Mínimo:</target> - -<source>Maximum:</source> -<target>Máximo</target> - -<source>&Reset</source> -<target>&Reiniciar</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> @@ -1037,12 +1043,15 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Delete Items</source> <target>Eliminar Itens</target> -<source>Global Settings</source> -<target>Opções Globais</target> +<source>Options</source> +<target>Opções</target> <source>Select Time Span</source> <target>Seleccionar Intervalo de Tempo</target> +<source>&Preferences...</source> +<target>&Preferências...</target> + <source>Folder Pairs</source> <target>Par de Pastas</target> @@ -1061,12 +1070,6 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Main Bar</source> <target>Barra principal</target> -<source>Open...</source> -<target>Abrir...</target> - -<source>Save</source> -<target>Guardar</target> - <source>Compare both sides</source> <target>Comparar listas</target> @@ -1193,8 +1196,11 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Delete selected configurations</source> <target>Eliminar configurações seleccionadas</target> -<source>Filter</source> -<target>Filtro</target> +<source>Synchronization Settings</source> +<target>Definições de Sincronização</target> + +<source>Reset filter</source> +<target>Limpar filtro</target> <source>Show files that exist on left side only</source> <target>Mostrar ficheiros existentes somente à esquerda</target> @@ -1244,15 +1250,12 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Set as default</source> <target>Definir como padrão</target> +<source>Filter</source> +<target>Filtro</target> + <source>All files are in sync</source> <target>Todos os ficheiros estão sincronizados</target> -<source>Synchronization Settings</source> -<target>Definições de Sincronização</target> - -<source>Comparison Settings</source> -<target>Definições de Comparação</target> - <source>Cannot find %x</source> <target>Não é possível descobrir %x</target> @@ -1313,30 +1316,6 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Log</source> <target>Registo</target> -<source>Today</source> -<target>Hoje</target> - -<source>This week</source> -<target>Esta semana</target> - -<source>This month</source> -<target>Este mês</target> - -<source>This year</source> -<target>Este ano</target> - -<source>Last x days</source> -<target>Últimos x dias</target> - -<source>Byte</source> -<target>Byte</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1358,14 +1337,8 @@ Isto garante um estado consistente mesmo em caso de falha grave. <pluralform>Deseja mesmo eliminar os seguintes %x itens?</pluralform> </target> -<source>Exclude</source> -<target>Excluir</target> - -<source>Direct</source> -<target>Direto</target> - -<source>Follow</source> -<target>Seguir</target> +<source>Preferences</source> +<target>Preferências</target> <source>Copy NTFS permissions</source> <target>Copiar permissões NTFS</target> @@ -1388,8 +1361,50 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Restore all hidden windows and warnings?</source> <target>Restaurar todas as janelas e avisos escondidos?</target> -<source>Leave as unresolved conflict</source> -<target>Deixar como conflito</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> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Criar uma cópia exacta da pasta à esquerda, adaptando a da direita para coincidir.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Copiar ficheiros novos e actualizados para a pasta à direita.</target> + +<source>Configure your own synchronization rules.</source> +<target>Configure as suas regras de sincronização.</target> + +<source>Exclude</source> +<target>Excluir</target> + +<source>Direct</source> +<target>Direto</target> + +<source>Follow</source> +<target>Seguir</target> + +<source>Today</source> +<target>Hoje</target> + +<source>This week</source> +<target>Esta semana</target> + +<source>This month</source> +<target>Este mês</target> + +<source>This year</source> +<target>Este ano</target> + +<source>Last x days</source> +<target>Últimos x dias</target> + +<source>Byte</source> +<target>Byte</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>Substituir</target> @@ -1403,6 +1418,15 @@ Isto garante um estado consistente mesmo em caso de falha grave. <source>Append a time stamp to each file name</source> <target>Adicione data/hora ao nome de cada ficheiro</target> +<source>Comparison</source> +<target>Comparação</target> + +<source>Synchronization</source> +<target>Sincronização</target> + +<source>Leave as unresolved conflict</source> +<target>Deixar como conflito</target> + <source>File</source> <target>Ficheiro</target> diff --git a/FreeFileSync/Build/Languages/portuguese_br.lng b/FreeFileSync/Build/Languages/portuguese_br.lng index f63eb801..5febf0a3 100644 --- a/FreeFileSync/Build/Languages/portuguese_br.lng +++ b/FreeFileSync/Build/Languages/portuguese_br.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>Sintaxe:</target> -<source>config files</source> -<target>arquivos de configuração</target> +<source>global config file:</source> +<target>arquivo de configuração global:</target> + +<source>config files:</source> +<target>arquivos de configuração:</target> <source>directory</source> <target>diretório</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Caminho para um arquivo GlobalSettings.xml alternativo.</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Qualquer número de arquivos FreeFileSync .ffs e/ou de tarefa em lote .ffs_batch.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Qualquer número de alternativas de diretórios para pelo menos um arquivo de configuração.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Qualquer número de pares alternativos de diretórios para no máximo um arquivo de configuração.</target> <source>Cannot find the following folders:</source> <target>Não foi possível localizar as seguintes pastas:</target> @@ -651,11 +657,11 @@ O comando é disparado se: <source>Drag && drop</source> <target>Arrastar && Soltar</target> -<source>Alternate comparison settings</source> -<target>Configurações alternativas de comparação</target> +<source>Local comparison settings</source> +<target>Configurações de comparação local</target> -<source>Alternate synchronization settings</source> -<target>Configurações alternativas de sincronização</target> +<source>Local synchronization settings</source> +<target>Configurações de sincronização local</target> <source>Local filter</source> <target>Filtro local</target> @@ -666,11 +672,11 @@ O comando é disparado se: <source>None</source> <target>Nenhum</target> -<source>Remove alternate settings</source> -<target>Remover configurações alternativas</target> +<source>Remove local settings</source> +<target>Remover configurações locais</target> -<source>Clear filter settings</source> -<target>Limpar configurações do filtro</target> +<source>Reset local filter</source> +<target>Limpar filtro local</target> <source>Copy</source> <target>Copiar</target> @@ -678,14 +684,8 @@ O comando é disparado se: <source>Paste</source> <target>Colar</target> -<source>Alternate Comparison Settings</source> -<target>Configurações Alternativas de Comparação</target> - -<source>Alternate Synchronization Settings</source> -<target>Configurações Alternativas de Sincronização</target> - -<source>Local Filter</source> -<target>Filtro Local</target> +<source>Local Synchronization Settings</source> +<target>Configurações de Sincronização Local</target> <source>&New</source> <target>&Novo</target> @@ -702,8 +702,8 @@ O comando é disparado se: <source>2. &Synchronize</source> <target>2. S&incronizar</target> -<source>&Global settings</source> -<target>&Configurações</target> +<source>&Options</source> +<target>&Opções</target> <source>&Language</source> <target>&Idioma</target> @@ -726,12 +726,12 @@ O comando é disparado se: <source>&Check for new version</source> <target>&Verificar se existe nova versão</target> -<source>Compare</source> -<target>Comparar</target> - <source>Cancel</source> <target>Cancelar</target> +<source>Compare</source> +<target>Comparar</target> + <source>Synchronize</source> <target>Sincronizar</target> @@ -753,9 +753,21 @@ O comando é disparado se: <source>Match case</source> <target>Diferenciar maiúsculas e minúsculas</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> + <source>View type:</source> <target>Tipo de visualização:</target> @@ -777,6 +789,9 @@ O comando é disparado se: <source>Total bytes to copy</source> <target>Bytes totais a serem copiados</target> +<source>Use local settings:</source> +<target>Usar configurações locais:</target> + <source>Select a variant:</source> <target>Selecione uma variante:</target> @@ -792,20 +807,35 @@ O comando é disparado se: <source>More information</source> <target>Mais informação</target> -<source>OK</source> -<target>OK</target> +<source>Local settings:</source> +<target>Configurações locais:</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> +<source>Include:</source> +<target>Incluir:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Cria uma cópia espelho da pasta da esquerda adaptando a pasta da direita para igualar.</target> +<source>Exclude:</source> +<target>Excluir:</target> -<source>Copy new and updated files to the right folder.</source> -<target>Copia arquivos novos ou atualizados para a pasta da direita.</target> +<source>Show examples</source> +<target>Mostrar exemplos</target> -<source>Configure your own synchronization rules.</source> -<target>Configure as suas próprias regras de sincronização.</target> +<source>Time span:</source> +<target>Intervalo de tempo:</target> + +<source>File size:</source> +<target>Tamanho do arquivo:</target> + +<source>Minimum:</source> +<target>Mínimo:</target> + +<source>Maximum:</source> +<target>Máximo:</target> + +<source>&Reset</source> +<target>&Limpar tudo</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> <source>Detect moved files</source> <target>Detectar arquivos movidos</target> @@ -821,6 +851,9 @@ O comando é disparado se: - Não suportado por todos os sistemas de arquivo </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Detecta a direção de sincronização com a ajuda do arquivo de banco de dados</target> + <source>Delete files:</source> <target>Apagar arquivos:</target> @@ -845,9 +878,6 @@ O comando é disparado se: <source>Naming convention:</source> <target>Convenção de nomenclatura:</target> -<source>Show examples</source> -<target>Mostrar exemplos</target> - <source>Handle errors:</source> <target>Tratamento de erros:</target> @@ -866,8 +896,8 @@ O comando é disparado se: <source>On completion:</source> <target>Ao finalizar:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Detecta a direção de sincronização com a ajuda do arquivo de banco de dados</target> +<source>OK</source> +<target>OK</target> <source>Start synchronization now?</source> <target>Iniciar sincronização agora?</target> @@ -929,30 +959,6 @@ O comando é disparado se: <source>&Recycle bin</source> <target>&Lixeira</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 sincrinização. Entre com os caminhos relativos dos pares de pastas correspondentes.</target> - -<source>Include:</source> -<target>Incluir:</target> - -<source>Exclude:</source> -<target>Excluir:</target> - -<source>Time span:</source> -<target>Intervalo de tempo:</target> - -<source>File size:</source> -<target>Tamanho do arquivo:</target> - -<source>Minimum:</source> -<target>Mínimo:</target> - -<source>Maximum:</source> -<target>Máximo:</target> - -<source>&Reset</source> -<target>&Limpar tudo</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> @@ -1037,12 +1043,15 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Delete Items</source> <target>Apagar Itens</target> -<source>Global Settings</source> -<target>Configurações</target> +<source>Options</source> +<target>Opções</target> <source>Select Time Span</source> <target>Selecionar Intervalo de Tempo</target> +<source>&Preferences...</source> +<target>&Preferências...</target> + <source>Folder Pairs</source> <target>Pares de Pastas</target> @@ -1061,12 +1070,6 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Main Bar</source> <target>Barra Principal</target> -<source>Open...</source> -<target>Abrir...</target> - -<source>Save</source> -<target>Salvar</target> - <source>Compare both sides</source> <target>Comparar os dois lados</target> @@ -1193,8 +1196,11 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Delete selected configurations</source> <target>Apagar configurações selecionadas</target> -<source>Filter</source> -<target>Filtro</target> +<source>Synchronization Settings</source> +<target>Configurações de Sincronização</target> + +<source>Reset filter</source> +<target>Limpar filtro</target> <source>Show files that exist on left side only</source> <target>Mostrar arquivos que existem somente à esquerda</target> @@ -1244,15 +1250,12 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Set as default</source> <target>Definir como padrão</target> +<source>Filter</source> +<target>Filtro</target> + <source>All files are in sync</source> <target>Todos os arquivos estão em sincronia</target> -<source>Synchronization Settings</source> -<target>Configurações de Sincronização</target> - -<source>Comparison Settings</source> -<target>Configurações de Comparação</target> - <source>Cannot find %x</source> <target>Não foi possível localizar %x</target> @@ -1313,30 +1316,6 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Log</source> <target>Log</target> -<source>Today</source> -<target>Hoje</target> - -<source>This week</source> -<target>Esta semana</target> - -<source>This month</source> -<target>Este mês</target> - -<source>This year</source> -<target>Este ano</target> - -<source>Last x days</source> -<target>Últimos x dias</target> - -<source>Byte</source> -<target>Byte</target> - -<source>KB</source> -<target>kB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1358,14 +1337,8 @@ Isto garante um estado consistente mesmo em caso de erro grave. <pluralform>Você realmente deseja apagar os seguintes %x itens?</pluralform> </target> -<source>Exclude</source> -<target>Excluir</target> - -<source>Direct</source> -<target>Direto</target> - -<source>Follow</source> -<target>Seguir</target> +<source>Preferences</source> +<target>Preferências</target> <source>Copy NTFS permissions</source> <target>Copiar permissões NTFS</target> @@ -1388,8 +1361,50 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Restore all hidden windows and warnings?</source> <target>Restaurar todos as janelas e avisos ocultados?</target> -<source>Leave as unresolved conflict</source> -<target>Deixar como conflito não resolvido</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> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Cria uma cópia espelho da pasta da esquerda adaptando a pasta da direita para igualar.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Copia arquivos novos ou atualizados para a pasta da direita.</target> + +<source>Configure your own synchronization rules.</source> +<target>Configure as suas próprias regras de sincronização.</target> + +<source>Exclude</source> +<target>Excluir</target> + +<source>Direct</source> +<target>Direto</target> + +<source>Follow</source> +<target>Seguir</target> + +<source>Today</source> +<target>Hoje</target> + +<source>This week</source> +<target>Esta semana</target> + +<source>This month</source> +<target>Este mês</target> + +<source>This year</source> +<target>Este ano</target> + +<source>Last x days</source> +<target>Últimos x dias</target> + +<source>Byte</source> +<target>Byte</target> + +<source>KB</source> +<target>kB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>Substituir</target> @@ -1403,6 +1418,15 @@ Isto garante um estado consistente mesmo em caso de erro grave. <source>Append a time stamp to each file name</source> <target>Coloca uma estampa de tempo para cada nome de arquivo</target> +<source>Comparison</source> +<target>Comparação</target> + +<source>Synchronization</source> +<target>Sincronização</target> + +<source>Leave as unresolved conflict</source> +<target>Deixar como conflito não resolvido</target> + <source>File</source> <target>Arquivo</target> diff --git a/FreeFileSync/Build/Languages/romanian.lng b/FreeFileSync/Build/Languages/romanian.lng index 2f654052..8e5302bb 100644 --- a/FreeFileSync/Build/Languages/romanian.lng +++ b/FreeFileSync/Build/Languages/romanian.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>Sintaxă:</target> -<source>config files</source> -<target>file de configurare</target> +<source>global config file:</source> +<target>filă de configurare globală:</target> + +<source>config files:</source> +<target>file de configurare:</target> <source>directory</source> <target>dosar</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Calea către o filă GlobalSettings.xml alternativă.</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Orice număr de file de configurare pentru FreeFileSync, de tipul .ffs_gui sau/și .ffs_batch.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Orice număr de dosare alternative pentru cel mult o filă de configurare.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Orice număr de perechi alternative de dosare pentru cel mult o filă de configurare.</target> <source>Cannot find the following folders:</source> <target>Nu pot găsi dosarele următoare:</target> @@ -655,11 +661,11 @@ Comanda este declanșată dacă: <source>Drag && drop</source> <target>Trage și pune un dosar mai jos sau explorează către el</target> -<source>Alternate comparison settings</source> -<target>Setări alternative de comparare</target> +<source>Local comparison settings</source> +<target>Setările locale de comparare</target> -<source>Alternate synchronization settings</source> -<target>Setări alternative de sincronizare</target> +<source>Local synchronization settings</source> +<target>Setările locale de sincronizare</target> <source>Local filter</source> <target>Filtru local</target> @@ -670,11 +676,11 @@ Comanda este declanșată dacă: <source>None</source> <target>Nimic</target> -<source>Remove alternate settings</source> -<target>Înlătură setările alternative</target> +<source>Remove local settings</source> +<target>Înlătură setările locale</target> -<source>Clear filter settings</source> -<target>Curăță Setările Filtrului</target> +<source>Reset local filter</source> +<target>Resetează filtrul local</target> <source>Copy</source> <target>Copiază</target> @@ -682,14 +688,8 @@ Comanda este declanșată dacă: <source>Paste</source> <target>Lipește</target> -<source>Alternate Comparison Settings</source> -<target>Setări Alternative de Comparare</target> - -<source>Alternate Synchronization Settings</source> -<target>Setări Alternative de Sincronizare</target> - -<source>Local Filter</source> -<target>Filtru Local</target> +<source>Local Synchronization Settings</source> +<target>Setările Locale de Sincronizare</target> <source>&New</source> <target>Configurație &Nouă</target> @@ -706,8 +706,8 @@ Comanda este declanșată dacă: <source>2. &Synchronize</source> <target>2. &Sincronizează</target> -<source>&Global settings</source> -<target>&Setări Globale</target> +<source>&Options</source> +<target>&Opțiuni</target> <source>&Language</source> <target>&Limbă</target> @@ -730,12 +730,12 @@ Comanda este declanșată dacă: <source>&Check for new version</source> <target>Caută &Versiune Nouă</target> -<source>Compare</source> -<target>Compară</target> - <source>Cancel</source> <target>Anulează</target> +<source>Compare</source> +<target>Compară</target> + <source>Synchronize</source> <target>Sincronizează</target> @@ -757,8 +757,20 @@ Comanda este declanșată dacă: <source>Match case</source> <target>Potrivește cu caseta literelor (MAJ/min)</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</target> +<target>Salvează ca Sarcină Set [*.ffs_batch]</target> + +<source>Save as...</source> +<target>Salvează ca...</target> <source>View type:</source> <target>Tipul de Vedere:</target> @@ -781,6 +793,9 @@ Comanda este declanșată dacă: <source>Total bytes to copy</source> <target>Numărul total de baiți copiați</target> +<source>Use local settings:</source> +<target>Folosește setările locale</target> + <source>Select a variant:</source> <target>Selectează o variantă:</target> @@ -796,20 +811,35 @@ Comanda este declanșată dacă: <source>More information</source> <target>Mai multe informații</target> -<source>OK</source> -<target>OK</target> +<source>Local settings:</source> +<target>Setări Locale:</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> +<source>Include:</source> +<target>Incluse:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Creează o conservare [backup] în oglindă a dosarului stîng prin adaptarea dosarului drept pînă la potrivirea exactă cu cel stîng.</target> +<source>Exclude:</source> +<target>Excluse:</target> -<source>Copy new and updated files to the right folder.</source> -<target>Copiază filele noi și cele actualizate în dosarul drept.</target> +<source>Show examples</source> +<target>Arată exemple</target> -<source>Configure your own synchronization rules.</source> -<target>Reguli de sincronizare definite de utilizator pentru fiecare situație.</target> +<source>Time span:</source> +<target>Intervalul de Timp:</target> + +<source>File size:</source> +<target>Mărimea Filei:</target> + +<source>Minimum:</source> +<target>Minim:</target> + +<source>Maximum:</source> +<target>Maxim:</target> + +<source>&Reset</source> +<target>&Resetează</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> <source>Detect moved files</source> <target>Detectează filele mutate</target> @@ -825,6 +855,9 @@ Comanda este declanșată dacă: - Nesuportat de toate sistemele de file </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Detectează direcțiile de sincronizare cu ajutorul filelor bază de date</target> + <source>Delete files:</source> <target>Ștergerea Filelor:</target> @@ -849,9 +882,6 @@ Comanda este declanșată dacă: <source>Naming convention:</source> <target>Convenție de numire:</target> -<source>Show examples</source> -<target>Arată exemple</target> - <source>Handle errors:</source> <target>Gestionarea Erorilor:</target> @@ -870,8 +900,8 @@ Comanda este declanșată dacă: <source>On completion:</source> <target>La terminare:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Detectează direcțiile de sincronizare cu ajutorul filelor bază de date</target> +<source>OK</source> +<target>OK</target> <source>Start synchronization now?</source> <target>Pornesc sincronizarea acum?</target> @@ -922,7 +952,7 @@ Comanda este declanșată dacă: <target>Salvează jurnalul:</target> <source>Limit:</source> -<target>Limitare:</target> +<target>Limită:</target> <source>Limit maximum number of log files</source> <target>Limitează numărul maxim de file jurnal</target> @@ -933,30 +963,6 @@ Comanda este declanșată dacă: <source>&Recycle bin</source> <target>&Reciclator</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> - -<source>Include:</source> -<target>Incluse:</target> - -<source>Exclude:</source> -<target>Excluse:</target> - -<source>Time span:</source> -<target>Intervalul de Timp:</target> - -<source>File size:</source> -<target>Mărimea Filei:</target> - -<source>Minimum:</source> -<target>Minim:</target> - -<source>Maximum:</source> -<target>Maxim:</target> - -<source>&Reset</source> -<target>&Resetează</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> @@ -1041,12 +1047,15 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Delete Items</source> <target>Șterge Elementele</target> -<source>Global Settings</source> -<target>Setări Globale</target> +<source>Options</source> +<target>Opțiuni</target> <source>Select Time Span</source> <target>Selectează Intervalul de Timp</target> +<source>&Preferences...</source> +<target>&Preferințe...</target> + <source>Folder Pairs</source> <target>Perechi de Dosare</target> @@ -1065,12 +1074,6 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Main Bar</source> <target>Bara Principală</target> -<source>Open...</source> -<target>Deschide...</target> - -<source>Save</source> -<target>Salvează</target> - <source>Compare both sides</source> <target>Compară Părțile Stîngă și Dreaptă</target> @@ -1201,8 +1204,11 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Delete selected configurations</source> <target>Șterge Configurațiile Selectate</target> -<source>Filter</source> -<target>Filtru</target> +<source>Synchronization Settings</source> +<target>Setările Sincronizării</target> + +<source>Reset filter</source> +<target>Resetează Filtrul</target> <source>Show files that exist on left side only</source> <target>Arată filele care există doar în stînga</target> @@ -1252,15 +1258,12 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Set as default</source> <target>Setează ca implicit</target> +<source>Filter</source> +<target>Filtru</target> + <source>All files are in sync</source> <target>Toate filele sînt sincronizate</target> -<source>Synchronization Settings</source> -<target>Setările Sincronizării</target> - -<source>Comparison Settings</source> -<target>Setările Comparării</target> - <source>Cannot find %x</source> <target>Nu pot găsi %x</target> @@ -1321,30 +1324,6 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Log</source> <target>Jurnal</target> -<source>Today</source> -<target>Azi</target> - -<source>This week</source> -<target>Săptămîna asta</target> - -<source>This month</source> -<target>Luna asta</target> - -<source>This year</source> -<target>Anul ăsta</target> - -<source>Last x days</source> -<target>Ultimele x zile</target> - -<source>Byte</source> -<target>Baiți</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1368,14 +1347,8 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <pluralform>Sigur vrei să ștergi definitiv următoarele %x de elemente?</pluralform> </target> -<source>Exclude</source> -<target>Exclude</target> - -<source>Direct</source> -<target>Direcționează</target> - -<source>Follow</source> -<target>Urmărește</target> +<source>Preferences</source> +<target>Preferințe</target> <source>Copy NTFS permissions</source> <target>Copiază permisiunile NTFS</target> @@ -1398,8 +1371,50 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Restore all hidden windows and warnings?</source> <target>Restaurezi toate ferestrele și avertismentele ascunse?</target> -<source>Leave as unresolved conflict</source> -<target>Lasă ca conflict nerezolvat</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> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Creează o conservare [backup] în oglindă a dosarului stîng prin adaptarea dosarului drept pînă la potrivirea exactă cu cel stîng.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Copiază filele noi și cele actualizate în dosarul drept.</target> + +<source>Configure your own synchronization rules.</source> +<target>Reguli de sincronizare definite de utilizator pentru fiecare situație.</target> + +<source>Exclude</source> +<target>Exclude</target> + +<source>Direct</source> +<target>Direcționează</target> + +<source>Follow</source> +<target>Urmărește</target> + +<source>Today</source> +<target>Azi</target> + +<source>This week</source> +<target>Săptămîna asta</target> + +<source>This month</source> +<target>Luna asta</target> + +<source>This year</source> +<target>Anul ăsta</target> + +<source>Last x days</source> +<target>Ultimele x zile</target> + +<source>Byte</source> +<target>Baiți</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>Înlocuiește</target> @@ -1413,6 +1428,15 @@ Aceasta garantează consecvența stării filelor chiar și în cazul apariției <source>Append a time stamp to each file name</source> <target>Adaugă un marcaj temporal la numele fiecărei file</target> +<source>Comparison</source> +<target>Comparare</target> + +<source>Synchronization</source> +<target>Sincronizare</target> + +<source>Leave as unresolved conflict</source> +<target>Lasă ca conflict nerezolvat</target> + <source>File</source> <target>Filă</target> diff --git a/FreeFileSync/Build/Languages/russian.lng b/FreeFileSync/Build/Languages/russian.lng index 303359c2..bb35b592 100644 --- a/FreeFileSync/Build/Languages/russian.lng +++ b/FreeFileSync/Build/Languages/russian.lng @@ -7,39 +7,6 @@ <plural_definition>n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<11 || n%100>14) ? 1 : 2</plural_definition> </header> -<source>Synchronization</source> -<target></target> - -<source>Comparison</source> -<target></target> - -<source>Local settings:</source> -<target></target> - -<source>Use local settings:</source> -<target></target> - -<source>Save as...</source> -<target></target> - -<source>Save as GUI job</source> -<target></target> - -<source>Local Synchronization Settings</source> -<target></target> - -<source>Any number of alternative directory pairs for at most one config file.</source> -<target></target> - -<source>Path to an alternate GlobalSettings.xml file.</source> -<target></target> - -<source>config files:</source> -<target></target> - -<source>global config file:</source> -<target></target> - <source>Both sides have changed since last synchronization.</source> <target>Со времени последней синхронизации с обеих сторон произошли изменения.</target> @@ -112,12 +79,24 @@ <source>Syntax:</source> <target>Синтаксис:</target> +<source>global config file:</source> +<target>глобальный конфигурационный файл:</target> + +<source>config files:</source> +<target>конфигурационный файл:</target> + <source>directory</source> <target>папка</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Путь к альтернативному файлу GlobalSettings.xml.</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Любое количество FreeFileSync .ffs_gui и/или .ffs_batch конфигурационных файлов.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Любое количество альтернативных пар папок для не более одного конфигурационного файла.</target> + <source>Cannot find the following folders:</source> <target>Невозможно найти следующие папки:</target> @@ -688,11 +667,11 @@ The command is triggered if: <source>Drag && drop</source> <target>Drag && drop</target> -<source>Alternate comparison settings</source> -<target>Альтернативные настройки сравнения</target> +<source>Local comparison settings</source> +<target>Локальные настройки сравнения</target> -<source>Alternate synchronization settings</source> -<target>Альтернативные настройки синхронизации</target> +<source>Local synchronization settings</source> +<target>Локальные настройки синхронизации</target> <source>Local filter</source> <target>Локальный фильтр</target> @@ -703,11 +682,11 @@ The command is triggered if: <source>None</source> <target>неактивный</target> -<source>Remove alternate settings</source> -<target>Удалить альтернативные настройки</target> +<source>Remove local settings</source> +<target>Удалить локальные настройки</target> -<source>Clear filter settings</source> -<target>Очистить настройки фильтра</target> +<source>Reset local filter</source> +<target>Сбросить локальный фильтр</target> <source>Copy</source> <target>Копировать</target> @@ -715,6 +694,9 @@ The command is triggered if: <source>Paste</source> <target>Вставить</target> +<source>Local Synchronization Settings</source> +<target>Локальные настройки синхронизации</target> + <source>&New</source> <target>&Новая</target> @@ -730,8 +712,8 @@ The command is triggered if: <source>2. &Synchronize</source> <target>2. С&инхронизировать</target> -<source>&Global settings</source> -<target>&Глобальные настройки</target> +<source>&Options</source> +<target>&Настройки</target> <source>&Language</source> <target>&Язык</target> @@ -754,12 +736,12 @@ The command is triggered if: <source>&Check for new version</source> <target>&Проверка обновлений</target> -<source>Compare</source> -<target>Сравнить</target> - <source>Cancel</source> <target>Отмена</target> +<source>Compare</source> +<target>Сравнить</target> + <source>Synchronize</source> <target>Синхронизировать</target> @@ -787,9 +769,15 @@ The command is triggered if: <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> + <source>View type:</source> <target>Тип просмотра:</target> @@ -811,6 +799,9 @@ The command is triggered if: <source>Total bytes to copy</source> <target>Всего байт для копирования</target> +<source>Use local settings:</source> +<target>Использовать локальные настройки:</target> + <source>Select a variant:</source> <target>Выберите вариант:</target> @@ -826,6 +817,9 @@ The command is triggered if: <source>More information</source> <target>Подробнее</target> +<source>Local settings:</source> +<target>Локальные настройки:</target> + <source>Include:</source> <target>Включить:</target> @@ -1063,12 +1057,15 @@ This guarantees a consistent state even in case of a serious error. <source>Delete Items</source> <target>Удаление элементов</target> -<source>Global Settings</source> -<target>Глобальные настройки</target> +<source>Options</source> +<target>Настройки</target> <source>Select Time Span</source> <target>Выбор промежутка времени</target> +<source>&Preferences...</source> +<target>&Предпочтения...</target> + <source>Folder Pairs</source> <target>Пары папок для синхронизации</target> @@ -1082,7 +1079,7 @@ This guarantees a consistent state even in case of a serious error. <target>Главная</target> <source>Configuration</source> -<target>Настройки</target> +<target>Конфигурация</target> <source>Main Bar</source> <target>Главная панель</target> @@ -1200,7 +1197,7 @@ This guarantees a consistent state even in case of a serious error. <target>Сравнение и синхронизация</target> <source>Configuration saved</source> -<target>Настройки синхронизации сохранены</target> +<target>Конфигурация сохранена</target> <source>FreeFileSync batch</source> <target>Пакетное задание FreeFileSync</target> @@ -1215,11 +1212,14 @@ This guarantees a consistent state even in case of a serious error. <target>&Не сохранять</target> <source>Delete selected configurations</source> -<target>Удалить выделенные настройки</target> +<target>Удалить выделенные конфигурации</target> <source>Synchronization Settings</source> <target>Настройки синхронизации</target> +<source>Reset filter</source> +<target>Сбросить фильтр</target> + <source>Show files that exist on left side only</source> <target>Показать файлы, существующие только слева</target> @@ -1357,6 +1357,9 @@ This guarantees a consistent state even in case of a serious error. <pluralform>Вы точно хотите удалить следующие %x элементов?</pluralform> </target> +<source>Preferences</source> +<target>Предпочтения</target> + <source>Copy NTFS permissions</source> <target>Копирование NTFS прав доступа</target> @@ -1438,6 +1441,12 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>Добавить отметку времени для каждого имени файла</target> +<source>Comparison</source> +<target>Сравнение</target> + +<source>Synchronization</source> +<target>Синхронизация</target> + <source>Leave as unresolved conflict</source> <target>Оставить как нерешенный конфликт</target> @@ -1580,5 +1589,5 @@ This guarantees a consistent state even in case of a serious error. <target>Невозможно прочитать следующие XML элементы:</target> <source>Configuration file %x loaded partially only.</source> -<target>Файл конфигурации %x загрузился частично.</target> +<target>Конфигурационный файл %x загрузился частично.</target> diff --git a/FreeFileSync/Build/Languages/scottish_gaelic.lng b/FreeFileSync/Build/Languages/scottish_gaelic.lng index ff6ea7f0..fe2c3069 100644 --- a/FreeFileSync/Build/Languages/scottish_gaelic.lng +++ b/FreeFileSync/Build/Languages/scottish_gaelic.lng @@ -20,28 +20,28 @@ <target>Chan eil innteart an stòir-dhàta sioncronaicht a-rèir nan roghainnean làithreach</target> <source>Setting default synchronization directions: Old files will be overwritten with newer files.</source> -<target>A' suidheachadh comhair bhunaiteach an t-sioncronachaidh: Thèid faidhlichean nas ùire a sgrìobhadh thairis air seann-fhaidhlichean.</target> +<target>A’ suidheachadh comhair bhunaiteach an t-sioncronachaidh: Thèid faidhlichean nas ùire a sgrìobhadh thairis air seann-fhaidhlichean.</target> <source>Checking recycle bin availability for folder %x...</source> -<target>A' toirt sùil a bheil am biona ri fhaighin airson a' phasgain %x...</target> +<target>A’ toirt sùil a bheil am biona ri fhaighin airson a’ phasgain %x...</target> <source>Moving file %x to the recycle bin</source> -<target>A' gluasad an fhaidhle %x dhan bhiona</target> +<target>A’ gluasad an fhaidhle %x dhan bhiona</target> <source>Moving folder %x to the recycle bin</source> -<target>A' gluasad a' phasgain %x dhan bhiona</target> +<target>A’ gluasad a’ phasgain %x dhan bhiona</target> <source>Moving symbolic link %x to the recycle bin</source> -<target>A' gluasad an symbolic link %x dhan bhiona</target> +<target>A’ gluasad an symbolic link %x dhan bhiona</target> <source>Deleting file %x</source> -<target>A' sguabadh às an fhaidhle %x</target> +<target>A’ sguabadh às an fhaidhle %x</target> <source>Deleting folder %x</source> -<target>A' sguabadh às a' phasgain %x</target> +<target>A’ sguabadh às a’ phasgain %x</target> <source>Deleting symbolic link %x</source> -<target>A' sguabadh às an symbolic link %x</target> +<target>A’ sguabadh às an symbolic link %x</target> <source>The recycle bin is not available for the following folders. Files will be deleted permanently instead:</source> <target>Chan eil am biona ri làimh airson nam pasganan a leanas. Thèid an sguabadh às gu buan an àite sin:</target> @@ -62,10 +62,10 @@ <target>Chan eil rèiteachadh dligheach san fhaidhle %x.</target> <source>Unequal number of left and right directories specified.</source> -<target>Chan eil àireamh nam pasganan air an taobh chlì 's an taobh deas co-ionnann</target> +<target>Chan eil àireamh nam pasganan air an taobh chlì ’s an taobh deas co-ionnann</target> <source>The config file must not contain settings at directory pair level when directories are set via command line.</source> -<target>Chan fhaod roghainnean aig ìre paidhrichean nam pasganan a bhith san fhaidhle rèiteachaidh nuair a thathar a' cur pasganan slighe na loidhne-àithne.</target> +<target>Chan fhaod roghainnean aig ìre paidhrichean nam pasganan a bhith san fhaidhle rèiteachaidh nuair a thathar a’ cur pasganan slighe na loidhne-àithne.</target> <source>Directories cannot be set for more than one configuration file.</source> <target>Cha ghabh pasganan a shuidheachadh airson barrachd air aon fhaidhle rèiteachaidh.</target> @@ -76,23 +76,29 @@ <source>Syntax:</source> <target>Co-chàradh:</target> -<source>config files</source> -<target>faidhlichean rèiteachaidh</target> +<source>global config file:</source> +<target>faidhle uile-choitcheann an rèiteachaidh</target> + +<source>config files:</source> +<target>faidhlichean rèiteachaidh:</target> <source>directory</source> <target>pasgan</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Slighe gu faidhle GlobalSettings.xml eile</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> -<target>Àireamh sam bith de dh'fhaidhlichean rèiteachaidh FreeFileSync .ffs_gui agus/no .ffs_batch</target> +<target>Àireamh sam bith de dh’fhaidhlichean rèiteachaidh FreeFileSync .ffs_gui agus/no .ffs_batch</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Àireamh sam bith de phasganan eile airson aon fhaidhle rèiteachaidh air a' char as fhaide.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Àireamh sam bith de phaidhrichean pasgain eile airson aon fhaidhle rèiteachaidh air a’ char as fhaide</target> <source>Cannot find the following folders:</source> <target>Chan urrainn dhuinn na pasgain a leanas a lorg:</target> <source>You can ignore this error to consider each folder as empty. The folders then will be created automatically during synchronization.</source> -<target>'S urrainn dhut a' mhearachd seo a leigeil seachad ma tha thu airson 's gun dèilig sinn ri gach pasgan mar gum biodh iad falamh. Thèid na pasgain a chruthachadh gu fèin-obrachail an uairsin rè an t-sioncronachaidh</target> +<target>’S urrainn dhut a’ mhearachd seo a leigeil seachad ma tha thu airson ’s gun dèilig sinn ri gach pasgan mar gum biodh iad falamh. Thèid na pasgain a chruthachadh gu fèin-obrachail an uairsin rè an t-sioncronachaidh</target> <source>A folder input field is empty.</source> <target>Tha co-dhiù aon raon pasgain ann a tha falamh.</target> @@ -122,16 +128,16 @@ <target>Chan eil diofar eatarra ach a thaobh an cuid bhuadhan</target> <source>Resolving symbolic link %x</source> -<target>Duilgheadas a' rèiteachadh a' symbolic link %x</target> +<target>Duilgheadas a’ rèiteachadh a’ symbolic link %x</target> <source>Comparing content of files %x</source> -<target>A' dèanamh coimheas eadar na faidhlichean %x</target> +<target>A’ dèanamh coimheas eadar na faidhlichean %x</target> <source>Generating file list...</source> -<target>A' gintinn liosta nam faidhle...</target> +<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’ choimeas</target> <source>Calculating sync directions...</source> <target>Ag àireamhachadh comhairean an t-sioncronachaidh...</target> @@ -197,7 +203,7 @@ <target>Chan eil am faidhle stòir-dhàta %x co-chòrdail.</target> <source>Initial synchronization:</source> -<target>A' chiad sioncronachadh:</target> +<target>A’ chiad sioncronachadh:</target> <source>Database file %x does not yet exist.</source> <target>Chan eil am faidhle stòir-dhàta %x ann fhathast.</target> @@ -215,16 +221,16 @@ <target>Chan eil seisean an cumantas aig na faidhlichean stòir-dhàta.</target> <source>Searching for folder %x...</source> -<target>A' lorg a' phasgain %x...</target> +<target>A’ lorg a’ phasgain %x...</target> <source>Cannot read file attributes of %x.</source> <target>Cha ghabh buadhan an fhaidhle %x a leughadh.</target> <source>Cannot get process information.</source> -<target>Chan urrainn dhuinn greim fhaighinn air fiosrachadh a' phròiseis.</target> +<target>Chan urrainn dhuinn greim fhaighinn air fiosrachadh a’ phròiseis.</target> <source>Waiting while directory is locked:</source> -<target>A' feitheamh fhad 's a thèid am pasgan a ghlasadh:</target> +<target>A’ feitheamh fhad ’s a thèid am pasgan a ghlasadh:</target> <source>Lock owner:</source> <target>Glais an sealbhadair:</target> @@ -241,10 +247,10 @@ </target> <source>Detecting abandoned lock...</source> -<target>A' mothachadh ri glasan trèigte...</target> +<target>A’ mothachadh ri glasan trèigte...</target> <source>Creating file %x</source> -<target>A' cruthachadh an fhaidhle %x</target> +<target>A’ cruthachadh an fhaidhle %x</target> <source>Items processed:</source> <target>Nithean a tha deiseil:</target> @@ -279,10 +285,10 @@ <target>Mearachd le parsadh an fhaidhle %x, loidhne %y, colbh %z.</target> <source>Cannot set directory lock for %x.</source> -<target>Cha ghabh glas a' phasgain airson %x a shuidheachadh.</target> +<target>Cha ghabh glas a’ phasgain airson %x a shuidheachadh.</target> <source>Scanning:</source> -<target>'Ga sganadh:</target> +<target>’Ga sganadh:</target> <source> <pluralform>1 thread</pluralform> @@ -296,7 +302,7 @@ </target> <source>Encoding extended time information: %x</source> -<target>A' còdachadh fiosrachadh leudaichte an ama: %x</target> +<target>A’ còdachadh fiosrachadh leudaichte an ama: %x</target> <source>/sec</source> <target>/diog</target> @@ -326,10 +332,10 @@ <target>Chan urrainn dhuinn ainm an draibh airson %x a dhearbhadh.</target> <source>Volume name %x is not part of file path %y.</source> -<target>Chan eil ainm an draibh %x 'na phàirt de shlighe an fhaodhle %y.</target> +<target>Chan eil ainm an draibh %x ’na phàirt de shlighe an fhaodhle %y.</target> <source>Stop requested: Waiting for current operation to finish...</source> -<target>Dh'iarr thu oirnn sgur: A' feitheamh ri crìoch na h-obrach làithreach...</target> +<target>Dh’iarr thu oirnn sgur: A’ feitheamh ri crìoch na h-obrach làithreach...</target> <source>Unable to create time stamp for versioning:</source> <target>Cha ghabh stampa ama a chruthachadh airson versioning:</target> @@ -347,7 +353,7 @@ <target>&Prògram</target> <source>&View help</source> -<target>&Faic a' chobhair</target> +<target>&Faic a’ chobhair</target> <source>&About</source> <target>&Mu dheidhinn</target> @@ -365,7 +371,7 @@ <target>2. Cuir a-steach àithne.</target> <source>3. Press 'Start'.</source> -<target>3. Briog air "Tòisich".</target> +<target>3. Briog air ”Tòisich”.</target> <source>To get started just import a .ffs_batch file.</source> <target>Cha leig thu leas ach faidhle .ffs_batch ion-phortadh airson toiseach tòiseachaidh.</target> @@ -386,7 +392,7 @@ <target>Tagh pasgan</target> <source>Idle time (in seconds):</source> -<target>Ùine 'na thàmh (ann an diogan):</target> +<target>Ùine ’na thàmh (ann an diogan):</target> <source>Idle time between last detected change and execution of command</source> <target>An tàmh eadar an t-atharrachadh mu dheireadh agus gnìomhachadh na h-àithne</target> @@ -401,7 +407,7 @@ The command is triggered if: </source> <target> Thèid an loidhne-àithne a chur gu dol: -- ma dh'atharraicheas faidhlichean no fo-phasgain +- ma dh’atharraicheas faidhlichean no fo-phasgain - ma nochdas pasgain ùra (m.e. ma chuireas tu a-steach bioran USB) </target> @@ -421,10 +427,10 @@ Thèid an loidhne-àithne a chur gu dol: <target>Sioncronachadh fèin-obrachail</target> <source>Directory monitoring active</source> -<target>Tha na pasganan 'gam marasgladh</target> +<target>Tha na pasganan ’gam marasgladh</target> <source>Waiting until all directories are available...</source> -<target>A' feitheamh gus am bi gach pasgan ri làimh...</target> +<target>A’ feitheamh gus am bi gach pasgan ri làimh...</target> <source>Error</source> <target>Mearachd</target> @@ -433,7 +439,7 @@ Thèid an loidhne-àithne a chur gu dol: <target>&Aisig</target> <source>&Show error</source> -<target>&Seall a' mhearachd</target> +<target>&Seall a’ mhearachd</target> <source>&Exit</source> <target>&Fàg an-seo</target> @@ -466,37 +472,37 @@ Thèid an loidhne-àithne a chur gu dol: <target>Iomadh fear...</target> <source>Moving file %x to %y</source> -<target>A' gluasad an fhaidhle %x gu %y</target> +<target>A’ gluasad an fhaidhle %x gu %y</target> <source>Moving folder %x to %y</source> -<target>A' gluasad a' phasgain %x gu %y</target> +<target>A’ gluasad a’ phasgain %x gu %y</target> <source>Moving symbolic link %x to %y</source> -<target>A' gluasad an symbolic link %x gu %y</target> +<target>A’ gluasad an symbolic link %x gu %y</target> <source>Removing old versions...</source> -<target>A' toirt air falbh nan seann tionndaidhean...</target> +<target>A’ toirt air falbh nan seann tionndaidhean...</target> <source>Creating symbolic link %x</source> -<target>A' cruthachadh an symbolic link %x</target> +<target>A’ cruthachadh an symbolic link %x</target> <source>Creating folder %x</source> -<target>A' cruthachadh a' phasgain %x</target> +<target>A’ cruthachadh a’ phasgain %x</target> <source>Overwriting file %x</source> -<target>A' sgrìobhadh thairis air an fhaidhle %x</target> +<target>A’ sgrìobhadh thairis air an fhaidhle %x</target> <source>Overwriting symbolic link %x</source> -<target>A' sgrìobhadh thairis air an symbolic link %x</target> +<target>A’ sgrìobhadh thairis air an symbolic link %x</target> <source>Verifying file %x</source> -<target>A' dearbhadh an fhaidhle %x</target> +<target>A’ dearbhadh an fhaidhle %x</target> <source>Updating attributes of %x</source> <target>Ag ùrachadh buadhan %x</target> <source>Creating a Volume Shadow Copy for %x...</source> -<target>A' cruthachadh lethbhreac sgàil draibh airson %x...</target> +<target>A’ cruthachadh lethbhreac sgàil draibh airson %x...</target> <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> @@ -508,7 +514,7 @@ Thèid an loidhne-àithne a chur gu dol: <target>Tha am pasgan-uidhe %x ann mu thràth.</target> <source>Target folder input field must not be empty.</source> -<target>Chan fhaod raon a' phasgain a bhith falamh.</target> +<target>Chan fhaod raon a’ phasgain a bhith falamh.</target> <source>Please enter a target folder for versioning.</source> <target>Cuir a-steach pasgan-targaide a chum versioning.</target> @@ -520,7 +526,7 @@ Thèid an loidhne-àithne a chur gu dol: <target>Tha còmstrithean aig na nithean a leanas fhathast is cha dèid an sioncronachadh:</target> <source>The following folders are significantly different. Make sure you are matching the correct folders for synchronization.</source> -<target>Tha diofar mòr eadar na pasganan a leanas. Dèan cinnteach gu bheil thu a' maidseadh nam pasganan ceart airson sioncronachadh.</target> +<target>Tha diofar mòr eadar na pasganan a leanas. Dèan cinnteach gu bheil thu a’ maidseadh nam pasganan ceart airson sioncronachadh.</target> <source>Not enough free disk space available in:</source> <target>Chan eil rùm saor gu leòr air an diosga:</target> @@ -532,13 +538,13 @@ Thèid an loidhne-àithne a chur gu dol: <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> +<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>Synchronizing folder pair:</source> -<target>A' sioncronachadh paidhir nam pasgan:</target> +<target>A’ sioncronachadh paidhir nam pasgan:</target> <source>Generating database...</source> -<target>A' gintinn an stòir-dhàta...</target> +<target>A’ gintinn an stòir-dhàta...</target> <source>job name</source> <target>ainm na h-obrach</target> @@ -559,13 +565,13 @@ Thèid an loidhne-àithne a chur gu dol: <target>Chaidh a shioncronachadh</target> <source>Saving log file %x...</source> -<target>A' sàbhaladh faidhle an loga %x...</target> +<target>A’ sàbhaladh faidhle an loga %x...</target> <source>Stopped</source> <target>Chaidh stad a chur air</target> <source>You can switch to FreeFileSync's main window to resolve this issue.</source> -<target>'S urrainn dhut leum a ghearradh gu prìomh-uinneag FreeFileSync gus an duilgheadas seo fhuasgladh.</target> +<target>’S urrainn dhut leum a ghearradh gu prìomh-uinneag FreeFileSync gus an duilgheadas seo fhuasgladh.</target> <source>&Don't show this warning again</source> <target>Na seall an rabha&dh seo a-rithist</target> @@ -577,30 +583,30 @@ Thèid an loidhne-àithne a chur gu dol: <target>&Dèan suids</target> <source>Switching to FreeFileSync's main window</source> -<target>A' gearradh leum gu prìomh-uinneag FreeFileSync</target> +<target>A’ gearradh leum gu prìomh-uinneag FreeFileSync</target> <source> <pluralform>Automatic retry in 1 second...</pluralform> <pluralform>Automatic retry in %x seconds...</pluralform> </source> <target> -<pluralform>A' feuchainn ris às ùr gu fèin-obrachail ann an %x diog...</pluralform> -<pluralform>A' feuchainn ris às ùr gu fèin-obrachail ann an %x dhiog...</pluralform> -<pluralform>A' feuchainn ris às ùr gu fèin-obrachail ann an %x diogan...</pluralform> -<pluralform>A' feuchainn ris às ùr gu fèin-obrachail ann an %x diog...</pluralform> +<pluralform>A’ feuchainn ris às ùr gu fèin-obrachail ann an %x diog...</pluralform> +<pluralform>A’ feuchainn ris às ùr gu fèin-obrachail ann an %x dhiog...</pluralform> +<pluralform>A’ feuchainn ris às ùr gu fèin-obrachail ann an %x diogan...</pluralform> +<pluralform>A’ feuchainn ris às ùr gu fèin-obrachail ann an %x diog...</pluralform> </target> <source>&Ignore subsequent errors</source> <target>Le&ig seachad mearachdan às a dhèidh seo</target> <source>Retrying operation...</source> -<target>A' feuchainn ris a-rithist...</target> +<target>A’ feuchainn ris a-rithist...</target> <source>Serious Error</source> <target>Mearachd mhòr</target> <source>Check for Program Updates</source> -<target>Thoir sùil ach a bheil ùrachadh ann airson a' phrògraim</target> +<target>Thoir sùil ach a bheil ùrachadh ann airson a’ phrògraim</target> <source>A new version of FreeFileSync is available:</source> <target>Tha tionndadh ùr de FreeFileSync ann:</target> @@ -612,10 +618,10 @@ Thèid an loidhne-àithne a chur gu dol: <target>&Luchdaich a-nuas</target> <source>FreeFileSync is up to date.</source> -<target>Tha FreeFileSync cho ùr 's a ghabhas.</target> +<target>Tha FreeFileSync cho ùr ’s a ghabhas.</target> <source>Unable to connect to sourceforge.net.</source> -<target>Cha b' urrainn dhuinn ceangal a dhèanamh ri Sourceforge.net.</target> +<target>Cha b’ urrainn dhuinn ceangal a dhèanamh ri Sourceforge.net.</target> <source>Cannot find current FreeFileSync version number online. Do you want to check manually?</source> <target>Chan urrainn dhuinn àireamh an tionndaidh làithrich aig FreeFileSync a lorg air loidhne. A bheil thu airson sùil a thoirt thu fhèin?</target> @@ -659,11 +665,11 @@ Thèid an loidhne-àithne a chur gu dol: <source>Drag && drop</source> <target>Slaod ⁊ leig às</target> -<source>Alternate comparison settings</source> -<target>Roghainnean eile airson coimeasadh</target> +<source>Local comparison settings</source> +<target>Roghainnean coimeis ionadail</target> -<source>Alternate synchronization settings</source> -<target>Roghainnean eile airson sioncronachadh</target> +<source>Local synchronization settings</source> +<target>Roghainnean sioncronachaidh ionadail</target> <source>Local filter</source> <target>Criathrag ionadail</target> @@ -674,11 +680,11 @@ Thèid an loidhne-àithne a chur gu dol: <source>None</source> <target>Chan eil gin</target> -<source>Remove alternate settings</source> -<target>Thoir air falbh na roghainnean eile</target> +<source>Remove local settings</source> +<target>Thoir air falbh na roghainnean ionadail</target> -<source>Clear filter settings</source> -<target>Falamhaich roghainnean na criathraige</target> +<source>Reset local filter</source> +<target>Ath-shuidhich a’ chriathrag ionadail</target> <source>Copy</source> <target>Dèan lethbhreac</target> @@ -686,14 +692,8 @@ Thèid an loidhne-àithne a chur gu dol: <source>Paste</source> <target>Cuir ann</target> -<source>Alternate Comparison Settings</source> -<target>Roghainnean eile airson coimeasadh</target> - -<source>Alternate Synchronization Settings</source> -<target>Roghainnean eile airson sioncronachadh</target> - -<source>Local Filter</source> -<target>Criathrag ionadail</target> +<source>Local Synchronization Settings</source> +<target>Roghainnean sioncronachaidh ionadail</target> <source>&New</source> <target>Ù&r</target> @@ -710,8 +710,8 @@ Thèid an loidhne-àithne a chur gu dol: <source>2. &Synchronize</source> <target>2. &Dèan sioncronachadh</target> -<source>&Global settings</source> -<target>&Na roghainnean uile-choitcheann</target> +<source>&Options</source> +<target>R&oghainnean</target> <source>&Language</source> <target>&Cànan</target> @@ -734,12 +734,12 @@ Thèid an loidhne-àithne a chur gu dol: <source>&Check for new version</source> <target>Thoir sùil a&ch a bheil tionndadh ùr ann</target> -<source>Compare</source> -<target>Dèan coimeas</target> - <source>Cancel</source> <target>Sguir dheth</target> +<source>Compare</source> +<target>Dèan coimeas</target> + <source>Synchronize</source> <target>Dèan sioncronachadh</target> @@ -759,11 +759,23 @@ Thèid an loidhne-àithne a chur gu dol: <target>Lorg:</target> <source>Match case</source> -<target>An aire do litrichean mòra 's beaga</target> +<target>An aire do litrichean mòra ’s beaga</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> + <source>View type:</source> <target>Seall an seòrsa:</target> @@ -774,25 +786,28 @@ Thèid an loidhne-àithne a chur gu dol: <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> +<target>Àireamh nam faidhle ’s nam pasgan a thèid a chruthachadh</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> +<target>Àireamh nam faidhle ’s nam pasgan a thèid a sguabadh às</target> <source>Total bytes to copy</source> <target>Co mheud baidht a thèid lethbhreac a dhèanamh dhiubh</target> +<source>Use local settings:</source> +<target>Cleachd na roghainnean ionadail</target> + <source>Select a variant:</source> <target>Tagh eug-samhail:</target> <source>Identify equal files by comparing modification time and size.</source> -<target>Lorg faidhlichean a tha co-ionnann le bhith a' dèanamh coimeas eadar an cuid meud is ama.</target> +<target>Lorg faidhlichean a tha co-ionnann le bhith a’ dèanamh coimeas eadar an cuid meud is ama.</target> <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> +<target>Lorg faidhlichean a tha co-ionnann le bhith a’ dèanamh coimeas eadar susbaint nam faidhlichean.</target> <source>Symbolic links:</source> <target>Ceanglaichean samhlachail:</target> @@ -800,23 +815,38 @@ Thèid an loidhne-àithne a chur gu dol: <source>More information</source> <target>Barrachd fiosrachaidh</target> -<source>OK</source> -<target>Ceart ma-thà</target> +<source>Local settings:</source> +<target>Roghainnean ionadail</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> +<source>Include:</source> +<target>Gabh a-staigh:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Cruthaich lethbhreac-glèidhidh sgàthanaichte dhen phasgan air an taobh clì 's am pasgan air an taobh deas 'ga atharrachadh d' a rèir.</target> +<source>Exclude:</source> +<target>Dùin a-mach:</target> -<source>Copy new and updated files to the right folder.</source> -<target>Cuir lethbhreac de dh'fhaidhlichean ùra 's ùraichte dhan phasgan air an taobh deas.</target> +<source>Show examples</source> +<target>Seall buill-eisimpleir</target> -<source>Configure your own synchronization rules.</source> -<target>Sònraich riaghailtean sioncronachaidh thu fhèin.</target> +<source>Time span:</source> +<target>An rainse ama:</target> + +<source>File size:</source> +<target>Meud an fhaidhle:</target> + +<source>Minimum:</source> +<target>Air a’ char as lugha:</target> + +<source>Maximum:</source> +<target>Air a’ char as motha:</target> + +<source>&Reset</source> +<target>&Ath-shuidhich</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> <source>Detect moved files</source> -<target>Mothaich do dh'fhaidhlichean a chaidh a ghluasad</target> +<target>Mothaich do dh’fhaidhlichean a chaidh a ghluasad</target> <source> - Requires and creates database files @@ -824,11 +854,14 @@ Thèid an loidhne-àithne a chur gu dol: - Not supported by all file systems </source> <target> -- Feumaidh seo faidhlichean stòir-dhàta 's cruthaichidh seo faidhlichean mar sin -- Bidh am mothachadh an gnìomh an dèidh a' chiad sioncronachaidh -- Chan eil gach siostam fhaidhlichean a' cur taic ris +- Feumaidh seo faidhlichean stòir-dhàta ’s cruthaichidh seo faidhlichean mar sin +- Bidh am mothachadh an gnìomh an dèidh a’ chiad sioncronachaidh +- Chan eil gach siostam fhaidhlichean a’ cur taic ris </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Mothaich do chomhair an t-sioncronachaidh le taic o fhaidhlichean stòir-dhàta</target> + <source>Delete files:</source> <target>Sguab às na faidhlichean:</target> @@ -842,7 +875,7 @@ Thèid an loidhne-àithne a chur gu dol: <target>Am 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> +<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> @@ -853,9 +886,6 @@ Thèid an loidhne-àithne a chur gu dol: <source>Naming convention:</source> <target>Gnàthas nan ainmean:</target> -<source>Show examples</source> -<target>Seall buill-eisimpleir</target> - <source>Handle errors:</source> <target>Mearachdan làimhseachaidh:</target> @@ -874,8 +904,8 @@ Thèid an loidhne-àithne a chur gu dol: <source>On completion:</source> <target>An dèidh coileanaidh:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Mothaich do chomhair an t-sioncronachaidh le taic o fhaidhlichean stòir-dhàta</target> +<source>OK</source> +<target>Ceart ma-thà</target> <source>Start synchronization now?</source> <target>A bheil thu airson tòiseachadh air an t-sioncronachadh an-dràsta?</target> @@ -896,28 +926,28 @@ Thèid an loidhne-àithne a chur gu dol: <target>An ùine a tha air fhàgail:</target> <source>Time elapsed:</source> -<target>An ùine a dh'fhalbh:</target> +<target>An ùine a dh’fhalbh:</target> <source>Synchronizing...</source> -<target>A' sioncronachadh...</target> +<target>A’ sioncronachadh...</target> <source>Minimize to notification area</source> -<target>Lùghdach 's gluais gu raon nam brathan</target> +<target>Lùghdach ’s gluais gu raon nam brathan</target> <source>Close</source> <target>Dùin</target> <source>&Pause</source> -<target>&Cuir 'na stad</target> +<target>&Cuir ’na stad</target> <source>Stop</source> <target>Sguir dheth</target> <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> +<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 synchronization at first error</source> -<target>Sguir dhen t-sioncronachadh aig a' chiad mhearachd</target> +<target>Sguir dhen t-sioncronachadh aig a’ chiad mhearachd</target> <source>Run minimized</source> <target>Ruith e sa mhodh lùghdaichte</target> @@ -929,7 +959,7 @@ Thèid an loidhne-àithne a chur gu dol: <target>Crìoch:</target> <source>Limit maximum number of log files</source> -<target>Cuingich an àireamh as motha de dh'fhaidhlichean an loga</target> +<target>Cuingich an àireamh as motha de dh’fhaidhlichean an loga</target> <source>How can I schedule a batch job?</source> <target>Ciamar a chuireas mi obair baidse air an sgeideal?</target> @@ -937,30 +967,6 @@ Thèid an loidhne-àithne a chur gu dol: <source>&Recycle bin</source> <target>A&m biona</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> - -<source>Include:</source> -<target>Gabh a-staigh:</target> - -<source>Exclude:</source> -<target>Dùin a-mach:</target> - -<source>Time span:</source> -<target>An rainse ama:</target> - -<source>File size:</source> -<target>Meud an fhaidhle:</target> - -<source>Minimum:</source> -<target>Air a' char as lugha:</target> - -<source>Maximum:</source> -<target>Air a' char as motha:</target> - -<source>&Reset</source> -<target>&Ath-shuidhich</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> @@ -980,10 +986,10 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <target>(mholamaid seo)</target> <source>Copy locked files</source> -<target>Dèan lethbhreac de dh'fhaidhlichean glaiste</target> +<target>Dèan lethbhreac de dh’fhaidhlichean glaiste</target> <source>Copy shared or locked files using the Volume Shadow Copy Service.</source> -<target>Dèan lethbhreac de dh'fhaidhlichean co-roinnte no glaiste le seirbheis lethbhreacan sgàil an draibh.</target> +<target>Dèan lethbhreac de dh’fhaidhlichean co-roinnte no glaiste le seirbheis lethbhreacan sgàil an draibh.</target> <source>(requires administrator rights)</source> <target>(feumaidh seo còraichean rianadair)</target> @@ -992,13 +998,13 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <target>Dèan lethbhreac de cheadan-inntrigidh nam faidhle</target> <source>Transfer file and folder permissions.</source> -<target>Tar-chuir am faidhle 's ceadan a' phasgain</target> +<target>Tar-chuir am faidhle ’s ceadan a’ phasgain</target> <source>Automatic retry on error:</source> <target>Feuch ris a-rithist gu fèin-obrachail ri linn mearachd:</target> <source>Retry count:</source> -<target>Co mheud turas a dh'fheudadh ris a-rithist:</target> +<target>Co mheud turas a dh’fheudadh ris a-rithist:</target> <source>Delay (in seconds):</source> <target>An dàil (ann an diogan):</target> @@ -1019,13 +1025,13 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <target>Chaidh an còd tùsail a sgrìobhadh ann an C++ le taic:</target> <source>If you like FreeFileSync</source> -<target>Ma tha FreeFileSync a' còrdadh riut</target> +<target>Ma tha FreeFileSync a’ còrdadh riut</target> <source>Donate with PayPal</source> <target>Nach doir sibh tabhartas le PayPal?</target> <source>Feedback and suggestions are welcome</source> -<target>Tha sinn a' cur fàilte mhòr air beachd is moladh sam bith</target> +<target>Tha sinn a’ cur fàilte mhòr air beachd is moladh sam bith</target> <source>Homepage</source> <target>An duilleag-dhachaigh</target> @@ -1045,12 +1051,15 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <source>Delete Items</source> <target>Sguab às na nithean</target> -<source>Global Settings</source> -<target>Na roghainnean uile-choitcheann</target> +<source>Options</source> +<target>Roghainnean</target> <source>Select Time Span</source> <target>Tagh an rainse ama</target> +<source>&Preferences...</source> +<target>&Roghainnean</target> + <source>Folder Pairs</source> <target>Paidhrichean nam pasganan</target> @@ -1069,17 +1078,11 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <source>Main Bar</source> <target>Am prìomh-bhàr</target> -<source>Open...</source> -<target>Fosgail...</target> - -<source>Save</source> -<target>Sàbhail</target> - <source>Compare both sides</source> <target>Dèan coimeas air an dà thaobh</target> <source>Comparison settings</source> -<target>Roghainnean a' choimeasaidh</target> +<target>Roghainnean a’ choimeasaidh</target> <source>Synchronization settings</source> <target>Roghainnean an t-sioncronachaidh</target> @@ -1131,14 +1134,14 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <pluralform>Showing %y of %x rows</pluralform> </source> <target> -<pluralform>A' sealltainn %y à %x ràgh</pluralform> -<pluralform>A' sealltainn %y à %x ràgh</pluralform> -<pluralform>A' sealltainn %y à %x ràghan</pluralform> -<pluralform>A' sealltainn %y à %x ràgh</pluralform> +<pluralform>A’ sealltainn %y à %x ràgh</pluralform> +<pluralform>A’ sealltainn %y à %x ràgh</pluralform> +<pluralform>A’ sealltainn %y à %x ràghan</pluralform> +<pluralform>A’ sealltainn %y à %x ràgh</pluralform> </target> <source>Set direction:</source> -<target>Suidhich a' chomhair:</target> +<target>Suidhich a’ chomhair:</target> <source>multiple selection</source> <target>Ioma-thaghadh</target> @@ -1183,7 +1186,7 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <target>An sealladh bunaiteach</target> <source>Show "%x"</source> -<target>Seall "%x"</target> +<target>Seall “%x”</target> <source>Last session</source> <target>An seisean mu dheireadh</target> @@ -1209,8 +1212,11 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <source>Delete selected configurations</source> <target>Sguab às na rèiteachaidhean a thagh thu</target> -<source>Filter</source> -<target>Criathrag</target> +<source>Synchronization Settings</source> +<target>Roghainnean an t-sioncronachaidh</target> + +<source>Reset filter</source> +<target>Ath-shuidhich 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> @@ -1255,20 +1261,17 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <target>Seall faidhlichean nach dèid lethbhreac a dhèanamh dhiubh</target> <source>Show filtered or temporarily excluded files</source> -<target>Seall faidhlichean a tha 'gan dùnadh a-mach no air an criathradh a-mach an-dràsta fhèin</target> +<target>Seall faidhlichean a tha ’gan dùnadh a-mach no air an criathradh a-mach an-dràsta fhèin</target> <source>Set as default</source> -<target>Suidhich mar a' bhun-roghainn</target> +<target>Suidhich mar a’ bhun-roghainn</target> + +<source>Filter</source> +<target>Criathrag</target> <source>All files are in sync</source> <target>Tha gach faidhle sioncronaichte</target> -<source>Synchronization Settings</source> -<target>Roghainnean an t-sioncronachaidh</target> - -<source>Comparison Settings</source> -<target>Roghainnean a' choimeasaidh</target> - <source>Cannot find %x</source> <target>Chan urrainn dhuinn %x a lorg.</target> @@ -1279,13 +1282,13 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <target>Chaidh liosta nam faidhle às-phortadh</target> <source>Searching for program updates...</source> -<target>A' lorg ùrachaidhean a' phrògraim...</target> +<target>A’ lorg ùrachaidhean a’ phrògraim...</target> <source>Close progress dialog</source> <target>Dùin còmhradh an adhartais</target> <source>Standby</source> -<target>Cuir 'na fhuireachas</target> +<target>Cuir ’na fhuireachas</target> <source>Log off</source> <target>Clàraich a-mach</target> @@ -1297,10 +1300,10 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <target>Geamhraich</target> <source>Scanning...</source> -<target>'Ga sganadh...</target> +<target>’Ga sganadh...</target> <source>Comparing content...</source> -<target>A' dèanamh coimeas eadar an cuid susbaint...</target> +<target>A’ dèanamh coimeas eadar an cuid susbaint...</target> <source>Info</source> <target>Fiosrachadh</target> @@ -1312,10 +1315,10 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <target>Tagh na h-uile</target> <source>Paused</source> -<target>'Na stad</target> +<target>’Na stad</target> <source>Initializing...</source> -<target>A' tòiseachadh...</target> +<target>A’ tòiseachadh...</target> <source>Completed</source> <target>Deiseil</target> @@ -1329,30 +1332,6 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <source>Log</source> <target>Logaich</target> -<source>Today</source> -<target>An-diugh</target> - -<source>This week</source> -<target>An t-seachdain seo</target> - -<source>This month</source> -<target>Am mìos seo</target> - -<source>This year</source> -<target>Am bliadhna</target> - -<source>Last x days</source> -<target>Na x làithean seo chaidh</target> - -<source>Byte</source> -<target>Baidht</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1378,14 +1357,8 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <pluralform>A bheil thu cinnteach gu bheil thu airson na %x nì seo a sguabadh às?</pluralform> </target> -<source>Exclude</source> -<target>Dùin a-mach</target> - -<source>Direct</source> -<target>Dìreach</target> - -<source>Follow</source> -<target>Lean</target> +<source>Preferences</source> +<target>Roghainnean</target> <source>Copy NTFS permissions</source> <target>Dèan lethbhreac de cheadan NTFS</target> @@ -1397,25 +1370,67 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <target>- ainm slàn dhen fhaidhle no dhen phasgan</target> <source>- folder part only</source> -<target>- cuid a' phasgain a-mhàin</target> +<target>- cuid a’ phasgain a-mhàin</target> <source>- Other side's counterpart to %item_path%</source> -<target>- Seise %item_folder% aig a' choimpiutair eile</target> +<target>- Seise %item_folder% aig a’ choimpiutair eile</target> <source>- Other side's counterpart to %item_folder%</source> -<target>- Seise %item_folder% aig a' choimpiutair eile</target> +<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>Leave as unresolved conflict</source> -<target>Fàg mar còmhstri gun rèiteachadh</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> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Cruthaich lethbhreac-glèidhidh sgàthanaichte dhen phasgan air an taobh clì ’s am pasgan air an taobh deas ’ga atharrachadh d’ a rèir.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Cuir lethbhreac de dh’fhaidhlichean ùra ’s ùraichte dhan phasgan air an taobh deas.</target> + +<source>Configure your own synchronization rules.</source> +<target>Sònraich riaghailtean sioncronachaidh thu fhèin.</target> + +<source>Exclude</source> +<target>Dùin a-mach</target> + +<source>Direct</source> +<target>Dìreach</target> + +<source>Follow</source> +<target>Lean</target> + +<source>Today</source> +<target>An-diugh</target> + +<source>This week</source> +<target>An t-seachdain seo</target> + +<source>This month</source> +<target>Am mìos seo</target> + +<source>This year</source> +<target>Am bliadhna</target> + +<source>Last x days</source> +<target>Na x làithean seo chaidh</target> + +<source>Byte</source> +<target>Baidht</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> -<target>Cuir 'na àite</target> +<target>Cuir ’na àite</target> <source>Move files and replace if existing</source> -<target>Gluais na faidhlichean 's cuir iad an àite na feadhainn làithreach ma tha gin ann</target> +<target>Gluais na faidhlichean ’s cuir iad an àite na feadhainn làithreach ma tha gin ann</target> <source>Time stamp</source> <target>Stampa ama</target> @@ -1423,6 +1438,15 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <source>Append a time stamp to each file name</source> <target>Cuir stampa ama ri gach ainm faidhle</target> +<source>Comparison</source> +<target>Coimeas</target> + +<source>Synchronization</source> +<target>Sioncronachadh</target> + +<source>Leave as unresolved conflict</source> +<target>Fàg mar còmhstri gun rèiteachadh</target> + <source>File</source> <target>Faidhle</target> @@ -1541,7 +1565,7 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <target>Chan urrainn dhuinn clàradh gus teachdaireachdan an t-siostaim fhaighinn.</target> <source>Cannot set privilege %x.</source> -<target>Cha ghabh a' phribhleid %x a shuidheachadh.</target> +<target>Cha ghabh a’ phribhleid %x a shuidheachadh.</target> <source>Unable to suspend system sleep mode.</source> <target>Chan urrainn dhuinn modh cadal an t-siostaim a chur dheth.</target> @@ -1553,7 +1577,7 @@ Nì seo cinnteach gum bi fuasgladh ann ma thachras mearachd mhòr. <target>Cha ghabh %x a ghluasad dhan bhiona.</target> <source>Checking recycle bin failed for folder %x.</source> -<target>Dh'fhàillig sgrùdadh a' bhiona airson a' phasgain %x.</target> +<target>Dh’fhàillig sgrùdadh a’ bhiona airson a’ phasgain %x.</target> <source>Cannot determine final path for %x.</source> <target>Chan urrainn dhuinn an t-slighe dheireannach airson %x a dhearbhadh.</target> diff --git a/FreeFileSync/Build/Languages/serbian.lng b/FreeFileSync/Build/Languages/serbian.lng index 72df9f31..64516484 100644 --- a/FreeFileSync/Build/Languages/serbian.lng +++ b/FreeFileSync/Build/Languages/serbian.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>Синтакса:</target> -<source>config files</source> -<target>конфигурационе датотеке</target> +<source>global config file:</source> +<target>глобална датотека конфигурације:</target> + +<source>config files:</source> +<target>конфигурационе датотеке:</target> <source>directory</source> <target>фолдер</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Путања до алтернативне GlobalSettings.xml датотеке.</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Било који број FreeFileSync .ffs_gui и/или .ffs_batch конфигурационих датотека.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Било који број алтернативних фолдера за најмање једну конфигурациону датотеку.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Било који број алтернативних фолдерских парова за бар једну конфигурациону датотеку.</target> <source>Cannot find the following folders:</source> <target>Не могу пронаћи следеће фолдере:</target> @@ -655,11 +661,11 @@ The command is triggered if: <source>Drag && drop</source> <target>Вуци && пусти</target> -<source>Alternate comparison settings</source> -<target>Алтернативна подешавања упоређивања</target> +<source>Local comparison settings</source> +<target>Локална подешавања упоређивања</target> -<source>Alternate synchronization settings</source> -<target>Алтернативна подешавања синхронизације</target> +<source>Local synchronization settings</source> +<target>Локална подешавања синхронизације</target> <source>Local filter</source> <target>Локални филтер</target> @@ -670,11 +676,11 @@ The command is triggered if: <source>None</source> <target>Ниједан</target> -<source>Remove alternate settings</source> -<target>Уклони алтернативна подешавања</target> +<source>Remove local settings</source> +<target>Уклони локална подешавања</target> -<source>Clear filter settings</source> -<target>Уклони подешавања филтера</target> +<source>Reset local filter</source> +<target>Ресетуј локални филтер</target> <source>Copy</source> <target>Копирај</target> @@ -682,14 +688,8 @@ The command is triggered if: <source>Paste</source> <target>Залепи</target> -<source>Alternate Comparison Settings</source> -<target>Алтернативна подешавања упоређивања</target> - -<source>Alternate Synchronization Settings</source> -<target>Алтернативна подешавања синхронизације</target> - -<source>Local Filter</source> -<target>Локални филтер</target> +<source>Local Synchronization Settings</source> +<target>Локална подешавања синхронизације</target> <source>&New</source> <target>&Ново</target> @@ -706,8 +706,8 @@ The command is triggered if: <source>2. &Synchronize</source> <target>2. &Синхронизуј</target> -<source>&Global settings</source> -<target>&Глобална подешавања</target> +<source>&Options</source> +<target>&Опције</target> <source>&Language</source> <target>&Језик</target> @@ -730,12 +730,12 @@ The command is triggered if: <source>&Check for new version</source> <target>&Провери постојање нове верзије</target> -<source>Compare</source> -<target>Упореди</target> - <source>Cancel</source> <target>Одустани</target> +<source>Compare</source> +<target>Упореди</target> + <source>Synchronize</source> <target>Синхронизуј</target> @@ -757,9 +757,21 @@ The command is triggered if: <source>Match case</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> @@ -781,6 +793,9 @@ The command is triggered if: <source>Total bytes to copy</source> <target>Укупно бајтова за копирање</target> +<source>Use local settings:</source> +<target>Употреби локална подешавања:</target> + <source>Select a variant:</source> <target>Одаберите варијанту:</target> @@ -796,20 +811,35 @@ The command is triggered if: <source>More information</source> <target>Више информација</target> -<source>OK</source> -<target>У реду</target> +<source>Local settings:</source> +<target>Локална подешавања:</target> -<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> -<target>Пронађи и изврши промене на обе стране. Брисања, премештања и конфликти се откривају аутоматски употребом базе података.</target> +<source>Include:</source> +<target>Укључи:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Креирај огледални бекап левог фолдера прилагођавајући га потпуно десном фолдеру.</target> +<source>Exclude:</source> +<target>Искључи:</target> -<source>Copy new and updated files to the right folder.</source> -<target>Копирај нове и ажуриране датотеке у десни фолдер.</target> +<source>Show examples</source> +<target>Прикажи примере</target> -<source>Configure your own synchronization rules.</source> -<target>Конфигуришите ваша властита синхронизациона правила.</target> +<source>Time span:</source> +<target>Временско ограничење:</target> + +<source>File size:</source> +<target>Величина датотеке:</target> + +<source>Minimum:</source> +<target>Минимум:</target> + +<source>Maximum:</source> +<target>Максимум:</target> + +<source>&Reset</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> <source>Detect moved files</source> <target>Уочи премештене датотеке</target> @@ -825,6 +855,9 @@ The command is triggered if: - Није подржано за све системе датотека </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Уочи синхронизацијске смерове уз помоћ датотека базе</target> + <source>Delete files:</source> <target>Обриши датотеке:</target> @@ -849,9 +882,6 @@ The command is triggered if: <source>Naming convention:</source> <target>Правило именовања:</target> -<source>Show examples</source> -<target>Прикажи примере</target> - <source>Handle errors:</source> <target>Обрада грешака:</target> @@ -870,8 +900,8 @@ The command is triggered if: <source>On completion:</source> <target>При завршетку:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Уочи синхронизацијске смерове уз помоћ датотека базе</target> +<source>OK</source> +<target>У реду</target> <source>Start synchronization now?</source> <target>Почни синхронизацију сада?</target> @@ -933,30 +963,6 @@ The command is triggered if: <source>&Recycle bin</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> - -<source>Include:</source> -<target>Укључи:</target> - -<source>Exclude:</source> -<target>Искључи:</target> - -<source>Time span:</source> -<target>Временско ограничење:</target> - -<source>File size:</source> -<target>Величина датотеке:</target> - -<source>Minimum:</source> -<target>Минимум:</target> - -<source>Maximum:</source> -<target>Максимум:</target> - -<source>&Reset</source> -<target>&Ресетуј</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Следећа подешавања се користе за све синхронизацијске задатке.</target> @@ -1041,12 +1047,15 @@ This guarantees a consistent state even in case of a serious error. <source>Delete Items</source> <target>Избриши ставке</target> -<source>Global Settings</source> -<target>Глобална подешавања</target> +<source>Options</source> +<target>Опције</target> <source>Select Time Span</source> <target>Изаберите временски распон</target> +<source>&Preferences...</source> +<target>&Преференце...</target> + <source>Folder Pairs</source> <target>Фолдерски парови</target> @@ -1065,12 +1074,6 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>Главна трака</target> -<source>Open...</source> -<target>Отвори...</target> - -<source>Save</source> -<target>Сачувај</target> - <source>Compare both sides</source> <target>Упореди обе стране</target> @@ -1201,8 +1204,11 @@ This guarantees a consistent state even in case of a serious error. <source>Delete selected configurations</source> <target>Обриши селектоване конфигурације</target> -<source>Filter</source> -<target>Филтрирање</target> +<source>Synchronization Settings</source> +<target>Подешавања синхронизације</target> + +<source>Reset filter</source> +<target>Ресетуј филтер</target> <source>Show files that exist on left side only</source> <target>Прикажи датотеке које постоје само на левој страни</target> @@ -1252,15 +1258,12 @@ This guarantees a consistent state even in case of a serious error. <source>Set as default</source> <target>Постави као подразумевано</target> +<source>Filter</source> +<target>Филтрирање</target> + <source>All files are in sync</source> <target>Све датотеке су синхронизоване</target> -<source>Synchronization Settings</source> -<target>Подешавања синхронизације</target> - -<source>Comparison Settings</source> -<target>Подешавања упоређивања</target> - <source>Cannot find %x</source> <target>Немогу пронаћи %x</target> @@ -1321,30 +1324,6 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>Лог</target> -<source>Today</source> -<target>Данас</target> - -<source>This week</source> -<target>Ове недеље</target> - -<source>This month</source> -<target>Овог месеца</target> - -<source>This year</source> -<target>Ове године</target> - -<source>Last x days</source> -<target>Задњих x дана</target> - -<source>Byte</source> -<target>Бајт</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1368,14 +1347,8 @@ This guarantees a consistent state even in case of a serious error. <pluralform>Да ли стварно желите да обришете следећих %x ставки?</pluralform> </target> -<source>Exclude</source> -<target>Искључи</target> - -<source>Direct</source> -<target>Непосредно</target> - -<source>Follow</source> -<target>Следи</target> +<source>Preferences</source> +<target>Преференце</target> <source>Copy NTFS permissions</source> <target>Копирај NTFS овлашћења</target> @@ -1398,8 +1371,50 @@ This guarantees a consistent state even in case of a serious error. <source>Restore all hidden windows and warnings?</source> <target>Прикажи све скривене прозоре и упозорења?</target> -<source>Leave as unresolved conflict</source> -<target>Остави као неразрешени конфликт</target> +<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> +<target>Пронађи и изврши промене на обе стране. Брисања, премештања и конфликти се откривају аутоматски употребом базе података.</target> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Креирај огледални бекап левог фолдера прилагођавајући га потпуно десном фолдеру.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Копирај нове и ажуриране датотеке у десни фолдер.</target> + +<source>Configure your own synchronization rules.</source> +<target>Конфигуришите ваша властита синхронизациона правила.</target> + +<source>Exclude</source> +<target>Искључи</target> + +<source>Direct</source> +<target>Непосредно</target> + +<source>Follow</source> +<target>Следи</target> + +<source>Today</source> +<target>Данас</target> + +<source>This week</source> +<target>Ове недеље</target> + +<source>This month</source> +<target>Овог месеца</target> + +<source>This year</source> +<target>Ове године</target> + +<source>Last x days</source> +<target>Задњих x дана</target> + +<source>Byte</source> +<target>Бајт</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>Замени</target> @@ -1413,6 +1428,15 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>Додај временску ознаку за свако име датотеке</target> +<source>Comparison</source> +<target>Упоређење</target> + +<source>Synchronization</source> +<target>Синхронизација</target> + +<source>Leave as unresolved conflict</source> +<target>Остави као неразрешени конфликт</target> + <source>File</source> <target>Датотека</target> diff --git a/FreeFileSync/Build/Languages/slovenian.lng b/FreeFileSync/Build/Languages/slovenian.lng index 2eedd54d..b2a0c137 100644 --- a/FreeFileSync/Build/Languages/slovenian.lng +++ b/FreeFileSync/Build/Languages/slovenian.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>Sintaksa:</target> -<source>config files</source> -<target>konfiguracijske datoteke</target> +<source>global config file:</source> +<target></target> + +<source>config files:</source> +<target></target> <source>directory</source> <target>imenik</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target></target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Poljubno število FreeFileSync .ffs_gui in/ali .ffs_batch konfigracijskih datotek.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Poljubno število alternatvnih imenikov za največ eno konfiguracijsko datoteko.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target></target> <source>Cannot find the following folders:</source> <target>Ne morem najti naslednjih map:</target> @@ -659,11 +665,11 @@ Ukaz se sproži če: <source>Drag && drop</source> <target>Povleci && spusti</target> -<source>Alternate comparison settings</source> -<target>Alternativne nastavitve primerjave</target> +<source>Local comparison settings</source> +<target></target> -<source>Alternate synchronization settings</source> -<target>Alternativne nastavitve sinhnorizacije</target> +<source>Local synchronization settings</source> +<target></target> <source>Local filter</source> <target>Lokalni filter</target> @@ -674,11 +680,11 @@ Ukaz se sproži če: <source>None</source> <target>Nič</target> -<source>Remove alternate settings</source> -<target>Odstrani nadomestne nastavitve</target> +<source>Remove local settings</source> +<target></target> -<source>Clear filter settings</source> -<target>Počisti nastavitve filtra</target> +<source>Reset local filter</source> +<target></target> <source>Copy</source> <target>Kopiraj</target> @@ -686,14 +692,8 @@ Ukaz se sproži če: <source>Paste</source> <target>Prilepi</target> -<source>Alternate Comparison Settings</source> -<target>Alternativne nastavitve primerjave</target> - -<source>Alternate Synchronization Settings</source> -<target>Alternativne nastavitve sinhnorizacije</target> - -<source>Local Filter</source> -<target>Lokalni filter</target> +<source>Local Synchronization Settings</source> +<target></target> <source>&New</source> <target>&Novo</target> @@ -710,8 +710,8 @@ Ukaz se sproži če: <source>2. &Synchronize</source> <target>2. &Sinhroniziraj</target> -<source>&Global settings</source> -<target>&Skupne nastavitve</target> +<source>&Options</source> +<target></target> <source>&Language</source> <target>&Jezik</target> @@ -734,12 +734,12 @@ Ukaz se sproži če: <source>&Check for new version</source> <target>&Preveri, če obstaja nova verzija</target> -<source>Compare</source> -<target>Primerjaj</target> - <source>Cancel</source> <target>Prekliči</target> +<source>Compare</source> +<target>Primerjaj</target> + <source>Synchronize</source> <target>Sinhroniziraj</target> @@ -761,9 +761,21 @@ Ukaz se sproži če: <source>Match case</source> <target>Ujemaj se s primerom</target> +<source>Open...</source> +<target>Odpri...</target> + +<source>Save</source> +<target>Shrani</target> + +<source>Save as GUI job</source> +<target></target> + <source>Save as batch job</source> <target>Shrani kot serijsko opravilo</target> +<source>Save as...</source> +<target></target> + <source>View type:</source> <target>Tip pogleda:</target> @@ -785,6 +797,9 @@ Ukaz se sproži če: <source>Total bytes to copy</source> <target>Skupno bajtov za kopiranje</target> +<source>Use local settings:</source> +<target></target> + <source>Select a variant:</source> <target>Izberi možnost:</target> @@ -800,20 +815,35 @@ Ukaz se sproži če: <source>More information</source> <target>Več informacij</target> -<source>OK</source> -<target>V redu</target> +<source>Local settings:</source> +<target></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> +<source>Include:</source> +<target>Vključi:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Ustvari zrcalno kopijo levega imenika s prilagoditvijo desnega imenika, tako da se ujemata.</target> +<source>Exclude:</source> +<target>Izključi:</target> -<source>Copy new and updated files to the right folder.</source> -<target>Kopiraj nove in posodobljene datoteke v desni imenik.</target> +<source>Show examples</source> +<target>Pokaži primere</target> -<source>Configure your own synchronization rules.</source> -<target>Konfigurirajte vaša lastna sinhronizacijska pravila.</target> +<source>Time span:</source> +<target>Časovno obdobje</target> + +<source>File size:</source> +<target>Velikost datoteke:</target> + +<source>Minimum:</source> +<target>Minimum:</target> + +<source>Maximum:</source> +<target>Maksimum:</target> + +<source>&Reset</source> +<target>&Ponovni zagon</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> <source>Detect moved files</source> <target>Zaznaj premaknjene datoteke</target> @@ -829,6 +859,9 @@ Ukaz se sproži če: - Ni podprto s strani vseh datotečnih sistemov </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Zaznaj smer sinhnorizacije s pomočjo datotek podatkovne baze</target> + <source>Delete files:</source> <target>Izbriši datoteke:</target> @@ -853,9 +886,6 @@ Ukaz se sproži če: <source>Naming convention:</source> <target>Konvencija poimenovanja:</target> -<source>Show examples</source> -<target>Pokaži primere</target> - <source>Handle errors:</source> <target>Upravljanje napak:</target> @@ -874,8 +904,8 @@ Ukaz se sproži če: <source>On completion:</source> <target>Ob zaključku:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Zaznaj smer sinhnorizacije s pomočjo datotek podatkovne baze</target> +<source>OK</source> +<target>V redu</target> <source>Start synchronization now?</source> <target>Zaženem sinhnorizacijo takoj?</target> @@ -937,30 +967,6 @@ Ukaz se sproži če: <source>&Recycle bin</source> <target>&Koš</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> - -<source>Include:</source> -<target>Vključi:</target> - -<source>Exclude:</source> -<target>Izključi:</target> - -<source>Time span:</source> -<target>Časovno obdobje</target> - -<source>File size:</source> -<target>Velikost datoteke:</target> - -<source>Minimum:</source> -<target>Minimum:</target> - -<source>Maximum:</source> -<target>Maksimum:</target> - -<source>&Reset</source> -<target>&Ponovni zagon</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Naslednje nastavitve se uporabljajo pri vseh sinhronizacijskih opravilih.</target> @@ -1045,12 +1051,15 @@ To zagotavlja konsistenco podatkov v primeru napake. <source>Delete Items</source> <target>Izbriši elemente</target> -<source>Global Settings</source> -<target>Skupne nastavitve</target> +<source>Options</source> +<target></target> <source>Select Time Span</source> <target>Izberi časovno obdobje</target> +<source>&Preferences...</source> +<target></target> + <source>Folder Pairs</source> <target>Pari imenikov</target> @@ -1069,12 +1078,6 @@ To zagotavlja konsistenco podatkov v primeru napake. <source>Main Bar</source> <target>Glavna vrstica</target> -<source>Open...</source> -<target>Odpri...</target> - -<source>Save</source> -<target>Shrani</target> - <source>Compare both sides</source> <target>Primerjaj obe strani</target> @@ -1209,8 +1212,11 @@ To zagotavlja konsistenco podatkov v primeru napake. <source>Delete selected configurations</source> <target>Izbriši izbrane konfiguracije</target> -<source>Filter</source> -<target>Filter</target> +<source>Synchronization Settings</source> +<target>Nastavitve sinhnorizacije</target> + +<source>Reset filter</source> +<target></target> <source>Show files that exist on left side only</source> <target>Prikaži datoteke, ki obstajajo samo na levi</target> @@ -1260,15 +1266,12 @@ To zagotavlja konsistenco podatkov v primeru napake. <source>Set as default</source> <target>Nastavi kot privzeto</target> +<source>Filter</source> +<target>Filter</target> + <source>All files are in sync</source> <target>Vse datoteke so sinhronizirane</target> -<source>Synchronization Settings</source> -<target>Nastavitve sinhnorizacije</target> - -<source>Comparison Settings</source> -<target>Nastavitve primerjave</target> - <source>Cannot find %x</source> <target>Ne najdem %x</target> @@ -1329,30 +1332,6 @@ To zagotavlja konsistenco podatkov v primeru napake. <source>Log</source> <target>Dnevnik</target> -<source>Today</source> -<target>Danes</target> - -<source>This week</source> -<target>Ta teden</target> - -<source>This month</source> -<target>Ta mesec</target> - -<source>This year</source> -<target>To leto</target> - -<source>Last x days</source> -<target>Zadnjih x dni</target> - -<source>Byte</source> -<target>Bajt</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1378,14 +1357,8 @@ To zagotavlja konsistenco podatkov v primeru napake. <pluralform>Ali resnično želite izbrisati naslednjih %x elementov?</pluralform> </target> -<source>Exclude</source> -<target>Izključi</target> - -<source>Direct</source> -<target>Neposredno</target> - -<source>Follow</source> -<target>Sledi</target> +<source>Preferences</source> +<target></target> <source>Copy NTFS permissions</source> <target>Kopiraj NTFS dovoljenja</target> @@ -1408,8 +1381,50 @@ To zagotavlja konsistenco podatkov v primeru napake. <source>Restore all hidden windows and warnings?</source> <target>Obnovim vsa skrita okna in opozorila?</target> -<source>Leave as unresolved conflict</source> -<target>Pusti kot nerešeni spor</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> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Ustvari zrcalno kopijo levega imenika s prilagoditvijo desnega imenika, tako da se ujemata.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Kopiraj nove in posodobljene datoteke v desni imenik.</target> + +<source>Configure your own synchronization rules.</source> +<target>Konfigurirajte vaša lastna sinhronizacijska pravila.</target> + +<source>Exclude</source> +<target>Izključi</target> + +<source>Direct</source> +<target>Neposredno</target> + +<source>Follow</source> +<target>Sledi</target> + +<source>Today</source> +<target>Danes</target> + +<source>This week</source> +<target>Ta teden</target> + +<source>This month</source> +<target>Ta mesec</target> + +<source>This year</source> +<target>To leto</target> + +<source>Last x days</source> +<target>Zadnjih x dni</target> + +<source>Byte</source> +<target>Bajt</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>Zamenjaj</target> @@ -1423,6 +1438,15 @@ To zagotavlja konsistenco podatkov v primeru napake. <source>Append a time stamp to each file name</source> <target>Imenu vsake datoteke pripni časovni žig</target> +<source>Comparison</source> +<target></target> + +<source>Synchronization</source> +<target></target> + +<source>Leave as unresolved conflict</source> +<target>Pusti kot nerešeni spor</target> + <source>File</source> <target>Datoteka</target> diff --git a/FreeFileSync/Build/Languages/spanish.lng b/FreeFileSync/Build/Languages/spanish.lng index af20f3b2..62b53c3a 100644 --- a/FreeFileSync/Build/Languages/spanish.lng +++ b/FreeFileSync/Build/Languages/spanish.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>Sintaxis:</target> -<source>config files</source> -<target>archivos de configuración</target> +<source>global config file:</source> +<target>archivo de config. global:</target> + +<source>config files:</source> +<target>archivos de configuración:</target> <source>directory</source> <target>directorio</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Ruta a un archivo alternativo GlobalSettings.xml.</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Cualquier número de archivos de configuración de FreeFileSync (.ffs_gui ó .ffs_batch).</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Cualquier número de directorios alternativos para un archivo de configuración como máximo.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Cualquier número de pares de directorios alternativos para un archivo de configuración como máximo.</target> <source>Cannot find the following folders:</source> <target>No se pudieron encontrar las siguiente carpetas:</target> @@ -651,11 +657,11 @@ El comando es disparado si: <source>Drag && drop</source> <target>Arrastrar y soltar</target> -<source>Alternate comparison settings</source> -<target>Opciones avanzadas de comparación</target> +<source>Local comparison settings</source> +<target>Opciones de comparación local</target> -<source>Alternate synchronization settings</source> -<target>Opciones avanzadas de sincronización</target> +<source>Local synchronization settings</source> +<target>Opciones de sincronización local</target> <source>Local filter</source> <target>Filtro local</target> @@ -666,11 +672,11 @@ El comando es disparado si: <source>None</source> <target>Ninguna</target> -<source>Remove alternate settings</source> -<target>Eliminar opciones avanzadas</target> +<source>Remove local settings</source> +<target>Eliminar opciones locales</target> -<source>Clear filter settings</source> -<target>Limpiar opciones del filtrado</target> +<source>Reset local filter</source> +<target>Reiniciar el filtro local</target> <source>Copy</source> <target>Copiar</target> @@ -678,14 +684,8 @@ El comando es disparado si: <source>Paste</source> <target>Pegar</target> -<source>Alternate Comparison Settings</source> -<target>Opciones avanzadas de comparación</target> - -<source>Alternate Synchronization Settings</source> -<target>Opciones avanzadas de sincronización</target> - -<source>Local Filter</source> -<target>Filtro local</target> +<source>Local Synchronization Settings</source> +<target>Opciones de sincronización local</target> <source>&New</source> <target>&Nuevo</target> @@ -702,8 +702,8 @@ El comando es disparado si: <source>2. &Synchronize</source> <target>2. &Sincronizar</target> -<source>&Global settings</source> -<target>&Opciones globales</target> +<source>&Options</source> +<target>&Opciones</target> <source>&Language</source> <target>&Idioma</target> @@ -726,12 +726,12 @@ El comando es disparado si: <source>&Check for new version</source> <target>&Comprobar nueva versión</target> -<source>Compare</source> -<target>Comparar</target> - <source>Cancel</source> <target>Cancelar</target> +<source>Compare</source> +<target>Comparar</target> + <source>Synchronize</source> <target>Sincronizar</target> @@ -753,8 +753,20 @@ El comando es disparado si: <source>Match case</source> <target>Coincidir mayúsculas y minúsculas</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>Salvar como tarea por lotes</target> +<target>Guardar como tarea por lotes</target> + +<source>Save as...</source> +<target>Guardar como…</target> <source>View type:</source> <target>Ver tipo:</target> @@ -777,6 +789,9 @@ El comando es disparado si: <source>Total bytes to copy</source> <target>Total de bytes a copiar</target> +<source>Use local settings:</source> +<target>Usar Opciones locales:</target> + <source>Select a variant:</source> <target>Seleccione una variante:</target> @@ -792,20 +807,35 @@ El comando es disparado si: <source>More information</source> <target>Más información</target> -<source>OK</source> -<target>OK</target> +<source>Local settings:</source> +<target>Opciones locales:</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> +<source>Include:</source> +<target>Incluir:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Crear una copia de respaldo espejo de la carpeta izquierda, adaptando y haciendo coincidir la carpeta derecha.</target> +<source>Exclude:</source> +<target>Excluir:</target> -<source>Copy new and updated files to the right folder.</source> -<target>Copiar archivos nuevos y actualizados a la carpeta de la derecha.</target> +<source>Show examples</source> +<target>Mostrar ejemplos</target> -<source>Configure your own synchronization rules.</source> -<target>Configurar reglas de sincronización personalizadas.</target> +<source>Time span:</source> +<target>Espacio de tiempo:</target> + +<source>File size:</source> +<target>Tamaño de archivo:</target> + +<source>Minimum:</source> +<target>Mínimo:</target> + +<source>Maximum:</source> +<target>Máximo:</target> + +<source>&Reset</source> +<target>&Reiniciar</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> <source>Detect moved files</source> <target>Detectar archivos movidos</target> @@ -821,6 +851,9 @@ El comando es disparado si: - No compatible con todos los sistemas de archivos </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Detectar direcciones de sincronización a partir de archivos de bases de datos</target> + <source>Delete files:</source> <target>Eliminar archivos:</target> @@ -845,9 +878,6 @@ El comando es disparado si: <source>Naming convention:</source> <target>Convención de nombre:</target> -<source>Show examples</source> -<target>Mostrar ejemplos</target> - <source>Handle errors:</source> <target>Tratar errores:</target> @@ -866,8 +896,8 @@ El comando es disparado si: <source>On completion:</source> <target>Al completar:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Detectar direcciones de sincronización a partir de archivos de bases de datos</target> +<source>OK</source> +<target>OK</target> <source>Start synchronization now?</source> <target>¿Iniciar la sincronización ahora?</target> @@ -929,30 +959,6 @@ El comando es disparado si: <source>&Recycle bin</source> <target>Papelera de &reciclaje</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> - -<source>Include:</source> -<target>Incluir:</target> - -<source>Exclude:</source> -<target>Excluir:</target> - -<source>Time span:</source> -<target>Espacio de tiempo:</target> - -<source>File size:</source> -<target>Tamaño de archivo:</target> - -<source>Minimum:</source> -<target>Mínimo:</target> - -<source>Maximum:</source> -<target>Máximo:</target> - -<source>&Reset</source> -<target>&Reiniciar</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> @@ -1037,12 +1043,15 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Delete Items</source> <target>Eliminar elementos</target> -<source>Global Settings</source> -<target>Opciones globales</target> +<source>Options</source> +<target>Opciones</target> <source>Select Time Span</source> <target>Seleccionar duración</target> +<source>&Preferences...</source> +<target>&Preferencias…</target> + <source>Folder Pairs</source> <target>Pares de carpetas</target> @@ -1061,12 +1070,6 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Main Bar</source> <target>Barra principal</target> -<source>Open...</source> -<target>Abrir…</target> - -<source>Save</source> -<target>Guardar</target> - <source>Compare both sides</source> <target>Comparar ambos lados</target> @@ -1193,8 +1196,11 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Delete selected configurations</source> <target>Eliminar las configuraciones seleccionadas</target> -<source>Filter</source> -<target>Filtro</target> +<source>Synchronization Settings</source> +<target>Opciones de sincronización</target> + +<source>Reset filter</source> +<target>Reiniciar el filtro</target> <source>Show files that exist on left side only</source> <target>Mostrar sólo archivos existentes en la izquierda</target> @@ -1244,15 +1250,12 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Set as default</source> <target>Predeterminado</target> +<source>Filter</source> +<target>Filtro</target> + <source>All files are in sync</source> <target>Todos los archivos están sincronizados</target> -<source>Synchronization Settings</source> -<target>Opciones de sincronización</target> - -<source>Comparison Settings</source> -<target>Opciones de comparación</target> - <source>Cannot find %x</source> <target>No se puede encontrar %x</target> @@ -1313,30 +1316,6 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Log</source> <target>Registro</target> -<source>Today</source> -<target>Hoy</target> - -<source>This week</source> -<target>Esta semana</target> - -<source>This month</source> -<target>Este mes</target> - -<source>This year</source> -<target>Este año</target> - -<source>Last x days</source> -<target>Últimos x días</target> - -<source>Byte</source> -<target>Byte</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1358,14 +1337,8 @@ Se garantiza un estado coherente incluso en caso de error grave. <pluralform>¿Realmente desea eliminar estos %x elementos?</pluralform> </target> -<source>Exclude</source> -<target>Excluir</target> - -<source>Direct</source> -<target>Enviar</target> - -<source>Follow</source> -<target>Seguir</target> +<source>Preferences</source> +<target>Preferencias</target> <source>Copy NTFS permissions</source> <target>Copiar permisos NTFS</target> @@ -1388,8 +1361,50 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Restore all hidden windows and warnings?</source> <target>Restaurar todas las ventanas y mensajes de advertencia ocultados ?</target> -<source>Leave as unresolved conflict</source> -<target>Dejar como conflicto sin resolver</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> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Crear una copia de respaldo espejo de la carpeta izquierda, adaptando y haciendo coincidir la carpeta derecha.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Copiar archivos nuevos y actualizados a la carpeta de la derecha.</target> + +<source>Configure your own synchronization rules.</source> +<target>Configurar reglas de sincronización personalizadas.</target> + +<source>Exclude</source> +<target>Excluir</target> + +<source>Direct</source> +<target>Enviar</target> + +<source>Follow</source> +<target>Seguir</target> + +<source>Today</source> +<target>Hoy</target> + +<source>This week</source> +<target>Esta semana</target> + +<source>This month</source> +<target>Este mes</target> + +<source>This year</source> +<target>Este año</target> + +<source>Last x days</source> +<target>Últimos x días</target> + +<source>Byte</source> +<target>Byte</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>Reemplazar</target> @@ -1403,6 +1418,15 @@ Se garantiza un estado coherente incluso en caso de error grave. <source>Append a time stamp to each file name</source> <target>Incluir marca horaria en cada nombre de archivo</target> +<source>Comparison</source> +<target>Comparación</target> + +<source>Synchronization</source> +<target>Sincronización</target> + +<source>Leave as unresolved conflict</source> +<target>Dejar como conflicto sin resolver</target> + <source>File</source> <target>Archivo</target> diff --git a/FreeFileSync/Build/Languages/swedish.lng b/FreeFileSync/Build/Languages/swedish.lng index 96c8cd5a..8f9838c5 100644 --- a/FreeFileSync/Build/Languages/swedish.lng +++ b/FreeFileSync/Build/Languages/swedish.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>Syntax:</target> -<source>config files</source> -<target>konfigurationsfiler</target> +<source>global config file:</source> +<target>övergripande konfigurationsfil:</target> + +<source>config files:</source> +<target>configurationsfiler:</target> <source>directory</source> <target>mapp</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Sökväg till en alternativ GlobalSettings.xml-fil</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Valfritt antal FreeFileSync .ffs_gui och/eller .ffs_batch konfigurationsfiler.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Valfritt antal alternativa mappar för max en konfigurationsfil.</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> <source>Cannot find the following folders:</source> <target>Kan inte hitta följande mappar:</target> @@ -651,11 +657,11 @@ Kommandot triggas om: <source>Drag && drop</source> <target>Dra && släpp</target> -<source>Alternate comparison settings</source> -<target>Alternativa jämförelseinställningar</target> +<source>Local comparison settings</source> +<target>Lokala jämförelseinställningar</target> -<source>Alternate synchronization settings</source> -<target>Alternativa synkroniseringsinställningar</target> +<source>Local synchronization settings</source> +<target>Lokala synkroniseringsinställningar</target> <source>Local filter</source> <target>Lokalt filter</target> @@ -666,11 +672,11 @@ Kommandot triggas om: <source>None</source> <target>Inget</target> -<source>Remove alternate settings</source> -<target>Ta bort alternativa inställningar</target> +<source>Remove local settings</source> +<target>Ta bort lokala inställningar</target> -<source>Clear filter settings</source> -<target>Rensa filterinställningar</target> +<source>Reset local filter</source> +<target>Återställ lokalt filter</target> <source>Copy</source> <target>Kopiera</target> @@ -678,14 +684,8 @@ Kommandot triggas om: <source>Paste</source> <target>Klistra in</target> -<source>Alternate Comparison Settings</source> -<target>Alternativa jämförelseinställningar</target> - -<source>Alternate Synchronization Settings</source> -<target>Alternativa synkroniseringsinställningar</target> - -<source>Local Filter</source> -<target>Lokalt filter</target> +<source>Local Synchronization Settings</source> +<target>Lokala synkroniseringsinställningar</target> <source>&New</source> <target>&Nytt</target> @@ -702,8 +702,8 @@ Kommandot triggas om: <source>2. &Synchronize</source> <target>2. &Synkronisera</target> -<source>&Global settings</source> -<target>&Allmäna inställningar</target> +<source>&Options</source> +<target>&Alternativ</target> <source>&Language</source> <target>&Språk</target> @@ -726,12 +726,12 @@ Kommandot triggas om: <source>&Check for new version</source> <target>&Sök efter uppdateringar</target> -<source>Compare</source> -<target>Jämför</target> - <source>Cancel</source> <target>Avbryt</target> +<source>Compare</source> +<target>Jämför</target> + <source>Synchronize</source> <target>Synkronisera</target> @@ -753,9 +753,21 @@ Kommandot triggas om: <source>Match case</source> <target>Matcha gemener/VERSALER</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> + <source>View type:</source> <target>Visningstyp:</target> @@ -777,6 +789,9 @@ Kommandot triggas om: <source>Total bytes to copy</source> <target>Byte att kopiera</target> +<source>Use local settings:</source> +<target>Använd lokala inställningar:</target> + <source>Select a variant:</source> <target>Välj ett alternativ:</target> @@ -792,20 +807,35 @@ Kommandot triggas om: <source>More information</source> <target>Mer information</target> -<source>OK</source> -<target>OK</target> +<source>Local settings:</source> +<target>Lokala inställningar:</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> +<source>Include:</source> +<target>Inkludera:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Skapar en speglad säkerhetskopia av vänstra mappen genom att anpassa den högra</target> +<source>Exclude:</source> +<target>Undanta:</target> -<source>Copy new and updated files to the right folder.</source> -<target>Kopierar nya och uppdaterade filer till höger mapp.</target> +<source>Show examples</source> +<target>Visa exempel</target> -<source>Configure your own synchronization rules.</source> -<target>Konfigurera dina egna synkroniseringsregler.</target> +<source>Time span:</source> +<target>Tidsrymd:</target> + +<source>File size:</source> +<target>Filstorlek:</target> + +<source>Minimum:</source> +<target>Min:</target> + +<source>Maximum:</source> +<target>Max:</target> + +<source>&Reset</source> +<target>&Återställ</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> <source>Detect moved files</source> <target>Hitta flyttade filer</target> @@ -821,6 +851,9 @@ Kommandot triggas om: - Stöds ej av alla filsystem </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Hitta synkroniseringsmappar med hjälp av databasfiler</target> + <source>Delete files:</source> <target>Ta bort filer:</target> @@ -845,9 +878,6 @@ Kommandot triggas om: <source>Naming convention:</source> <target>Regler för namngivning</target> -<source>Show examples</source> -<target>Visa exempel</target> - <source>Handle errors:</source> <target>Felhantering:</target> @@ -866,8 +896,8 @@ Kommandot triggas om: <source>On completion:</source> <target>Vid slutförd åtgärd:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Hitta synkroniseringsmappar med hjälp av databasfiler</target> +<source>OK</source> +<target>OK</target> <source>Start synchronization now?</source> <target>Vill du starta synkroniseringen nu?</target> @@ -929,30 +959,6 @@ Kommandot triggas om: <source>&Recycle bin</source> <target>&Papperskorgen</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> - -<source>Include:</source> -<target>Inkludera:</target> - -<source>Exclude:</source> -<target>Undanta:</target> - -<source>Time span:</source> -<target>Tidsrymd:</target> - -<source>File size:</source> -<target>Filstorlek:</target> - -<source>Minimum:</source> -<target>Min:</target> - -<source>Maximum:</source> -<target>Max:</target> - -<source>&Reset</source> -<target>&Återställ</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Följande inställningar används för all synkronisering</target> @@ -1037,12 +1043,15 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Delete Items</source> <target>Ta bort objekt</target> -<source>Global Settings</source> -<target>Globala inställningar</target> +<source>Options</source> +<target>Alternativ</target> <source>Select Time Span</source> <target>Välj tidsrymd</target> +<source>&Preferences...</source> +<target>&Inställningar...</target> + <source>Folder Pairs</source> <target>Mapp-par</target> @@ -1061,12 +1070,6 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Main Bar</source> <target>Primärt verktygsfält</target> -<source>Open...</source> -<target>Öppna...</target> - -<source>Save</source> -<target>Spara</target> - <source>Compare both sides</source> <target>Jämför båda sidor</target> @@ -1193,8 +1196,11 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Delete selected configurations</source> <target>Ta bort markerade konfigurationer</target> -<source>Filter</source> -<target>Filter</target> +<source>Synchronization Settings</source> +<target>Synkroniseringsinställningar</target> + +<source>Reset filter</source> +<target>Återställ filter</target> <source>Show files that exist on left side only</source> <target>Visa filer som endast finns till vänster</target> @@ -1244,15 +1250,12 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Set as default</source> <target>Ange som standard</target> +<source>Filter</source> +<target>Filter</target> + <source>All files are in sync</source> <target>Alla filer är synkroniserade</target> -<source>Synchronization Settings</source> -<target>Synkroniseringsinställningar</target> - -<source>Comparison Settings</source> -<target>Jämförelseinställningar</target> - <source>Cannot find %x</source> <target>Kan inte hitta %x</target> @@ -1313,30 +1316,6 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Log</source> <target>Logg</target> -<source>Today</source> -<target>Idag</target> - -<source>This week</source> -<target>Denna veckan</target> - -<source>This month</source> -<target>Denna månaden</target> - -<source>This year</source> -<target>I år</target> - -<source>Last x days</source> -<target>Senaste x dagarna</target> - -<source>Byte</source> -<target>Byte</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1358,14 +1337,8 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <pluralform>Vill du verkligen ta bort följande %x objekt?</pluralform> </target> -<source>Exclude</source> -<target>Undanta</target> - -<source>Direct</source> -<target>Direkt</target> - -<source>Follow</source> -<target>Följ</target> +<source>Preferences</source> +<target>Inställningar</target> <source>Copy NTFS permissions</source> <target>Kopiera NTFS-behörigheter</target> @@ -1388,8 +1361,50 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Restore all hidden windows and warnings?</source> <target>Vill du återställa alla dolda vyer och varningar</target> -<source>Leave as unresolved conflict</source> -<target>Ignorera konflikt</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> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Skapar en speglad säkerhetskopia av vänstra mappen genom att anpassa den högra</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Kopierar nya och uppdaterade filer till höger mapp.</target> + +<source>Configure your own synchronization rules.</source> +<target>Konfigurera dina egna synkroniseringsregler.</target> + +<source>Exclude</source> +<target>Undanta</target> + +<source>Direct</source> +<target>Direkt</target> + +<source>Follow</source> +<target>Följ</target> + +<source>Today</source> +<target>Idag</target> + +<source>This week</source> +<target>Denna veckan</target> + +<source>This month</source> +<target>Denna månaden</target> + +<source>This year</source> +<target>I år</target> + +<source>Last x days</source> +<target>Senaste x dagarna</target> + +<source>Byte</source> +<target>Byte</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>Byt ut</target> @@ -1403,6 +1418,15 @@ Detta garanterar ett konsekvent tillstånd även vid allvarliga fel. <source>Append a time stamp to each file name</source> <target>Lägg till en tidsstämpel till varje filnamn</target> +<source>Comparison</source> +<target>Jämförelse</target> + +<source>Synchronization</source> +<target>Synkronisering</target> + +<source>Leave as unresolved conflict</source> +<target>Ignorera konflikt</target> + <source>File</source> <target>Fil</target> diff --git a/FreeFileSync/Build/Languages/turkish.lng b/FreeFileSync/Build/Languages/turkish.lng index 5841ac33..dbc70ac3 100644 --- a/FreeFileSync/Build/Languages/turkish.lng +++ b/FreeFileSync/Build/Languages/turkish.lng @@ -76,17 +76,23 @@ <source>Syntax:</source> <target>Yazım:</target> -<source>config files</source> -<target>ayar dosyaları</target> +<source>global config file:</source> +<target>genel ayar dosyası:</target> + +<source>config files:</source> +<target>ayar dosyaları:</target> <source>directory</source> <target>klasör</target> +<source>Path to an alternate GlobalSettings.xml file.</source> +<target>Alternatif GlobalSettings.xml dosyasının yolu.</target> + <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>FreeFileSync .ffs_gui ya da .ffs_batch ayar dosyalarının sayısı.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>En çok bir ayar dosyası için alternatif klasörlerin sayısı.</target> +<source>Any number of alternative directory pairs for at most one config file.</source> +<target>Bir ayar dosyasındaki en fazla alternatif klasör çifti sayısı.</target> <source>Cannot find the following folders:</source> <target>Aşağıdaki klasörler bulunamadı:</target> @@ -651,11 +657,11 @@ Komut şu durumlarda yürütülür: <source>Drag && drop</source> <target>Dosyaları sürükleyip buraya bırakabilirsiniz</target> -<source>Alternate comparison settings</source> -<target>Alternatif karşılaştırma ayarları</target> +<source>Local comparison settings</source> +<target>Yerel karşılaştırma ayarları</target> -<source>Alternate synchronization settings</source> -<target>Alternatif eşleştirme ayarları</target> +<source>Local synchronization settings</source> +<target>Yerel eşleştirme ayarları</target> <source>Local filter</source> <target>Yerel süzgeç</target> @@ -666,11 +672,11 @@ Komut şu durumlarda yürütülür: <source>None</source> <target>Yok</target> -<source>Remove alternate settings</source> -<target>Alternatif ayarları silin</target> +<source>Remove local settings</source> +<target>Yerel ayarları silin</target> -<source>Clear filter settings</source> -<target>Süzgeç ayarlarını temizleyin</target> +<source>Reset local filter</source> +<target>Yerel süzgeci sıfırlayın</target> <source>Copy</source> <target>Kopyalayın</target> @@ -678,14 +684,8 @@ Komut şu durumlarda yürütülür: <source>Paste</source> <target>Yapıştırın</target> -<source>Alternate Comparison Settings</source> -<target>Alternatif Karşılaştırma Ayarları</target> - -<source>Alternate Synchronization Settings</source> -<target>Alternatif Eşleştirme Ayarları</target> - -<source>Local Filter</source> -<target>Yerel Süzgeç</target> +<source>Local Synchronization Settings</source> +<target>Yerel Eşleştirme Ayarları</target> <source>&New</source> <target>Ye&ni</target> @@ -702,8 +702,8 @@ Komut şu durumlarda yürütülür: <source>2. &Synchronize</source> <target>2. &Eşleştirin</target> -<source>&Global settings</source> -<target>&Genel ayarlar</target> +<source>&Options</source> +<target>A&yarlar</target> <source>&Language</source> <target>Di&l</target> @@ -726,12 +726,12 @@ Komut şu durumlarda yürütülür: <source>&Check for new version</source> <target>Yeni &sürümü denetleyin</target> -<source>Compare</source> -<target>Karşılaştırın</target> - <source>Cancel</source> <target>İptal</target> +<source>Compare</source> +<target>Karşılaştırın</target> + <source>Synchronize</source> <target>Eşleştirin</target> @@ -753,9 +753,21 @@ Komut şu durumlarda yürütülür: <source>Match case</source> <target>Büyük-küçük harf uysun</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> + <source>View type:</source> <target>Görünüm tipi:</target> @@ -777,6 +789,9 @@ Komut şu durumlarda yürütülür: <source>Total bytes to copy</source> <target>Toplam kopyalanacak bayt</target> +<source>Use local settings:</source> +<target>Yerel ayarlar kullanılsın:</target> + <source>Select a variant:</source> <target>İşlem tipini seçin:</target> @@ -792,20 +807,35 @@ Komut şu durumlarda yürütülür: <source>More information</source> <target>Ek bilgilere bakın</target> -<source>OK</source> -<target>Tamam</target> +<source>Local settings:</source> +<target>Yerel ayarlar:</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> +<source>Include:</source> +<target>Katılacak ögeler:</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Sağ klasör, sola uyacak şekilde güncellenerek, sol klasörün yansı yedeği oluşturulur.</target> +<source>Exclude:</source> +<target>Katılmayacak ögeler</target> -<source>Copy new and updated files to the right folder.</source> -<target>Sol taraftaki yeni ya da güncellenmiş ögeler sağ tarafa kopyalanır.</target> +<source>Show examples</source> +<target>Örneklere bakın</target> -<source>Configure your own synchronization rules.</source> -<target>Eşleştirme kuralları kullanıcının isteğine göre belirlenir.</target> +<source>Time span:</source> +<target>Zaman aralığı:</target> + +<source>File size:</source> +<target>Dosya boyutu:</target> + +<source>Minimum:</source> +<target>En küçük:</target> + +<source>Maximum:</source> +<target>En büyük:</target> + +<source>&Reset</source> +<target>Sıfı&rlayın</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> <source>Detect moved files</source> <target>Taşınmış dosyalar algılansın</target> @@ -821,6 +851,9 @@ Komut şu durumlarda yürütülür: - Tüm dosya sistemleri tarafından desteklenmez </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Eşleştirme yönü, veritabanı dosyaları yardımı ile belirlensin</target> + <source>Delete files:</source> <target>Dosya silme işlemi:</target> @@ -845,9 +878,6 @@ Komut şu durumlarda yürütülür: <source>Naming convention:</source> <target>Adlandırma kuralı:</target> -<source>Show examples</source> -<target>Örneklere bakın</target> - <source>Handle errors:</source> <target>Hata olursa:</target> @@ -866,8 +896,8 @@ Komut şu durumlarda yürütülür: <source>On completion:</source> <target>Eşleştirme tamamlandığında:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Eşleştirme yönü, veritabanı dosyaları yardımı ile belirlensin</target> +<source>OK</source> +<target>Tamam</target> <source>Start synchronization now?</source> <target>Eşleştirme başlatılsın mı?</target> @@ -929,30 +959,6 @@ Komut şu durumlarda yürütülür: <source>&Recycle bin</source> <target>Ge&ri Dönüşüm Kutusu</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> - -<source>Include:</source> -<target>Katılacak ögeler:</target> - -<source>Exclude:</source> -<target>Katılmayacak ögeler</target> - -<source>Time span:</source> -<target>Zaman aralığı:</target> - -<source>File size:</source> -<target>Dosya boyutu:</target> - -<source>Minimum:</source> -<target>En küçük:</target> - -<source>Maximum:</source> -<target>En büyük:</target> - -<source>&Reset</source> -<target>Sıfı&rlayın</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> @@ -1037,12 +1043,15 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Delete Items</source> <target>Ögeleri Silin</target> -<source>Global Settings</source> -<target>Genel Ayarlar</target> +<source>Options</source> +<target>Ayarlar</target> <source>Select Time Span</source> <target>Zaman Aralığı</target> +<source>&Preferences...</source> +<target>&Tercihler...</target> + <source>Folder Pairs</source> <target>Klasör Çiftleri</target> @@ -1061,12 +1070,6 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Main Bar</source> <target>Ana Çubuk</target> -<source>Open...</source> -<target>Açın...</target> - -<source>Save</source> -<target>Kaydedin</target> - <source>Compare both sides</source> <target>İki tarafı karşılaştırın</target> @@ -1193,8 +1196,11 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Delete selected configurations</source> <target>Seçili ayarları silin</target> -<source>Filter</source> -<target>Süzgeç</target> +<source>Synchronization Settings</source> +<target>Eşleştirme Ayarları</target> + +<source>Reset filter</source> +<target>Süzgeci sıfırlayın</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> @@ -1244,15 +1250,12 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Set as default</source> <target>Varsayılan olarak belirleyin</target> +<source>Filter</source> +<target>Süzgeç</target> + <source>All files are in sync</source> <target>Tüm dosyalar eşleştirildi</target> -<source>Synchronization Settings</source> -<target>Eşleştirme Ayarları</target> - -<source>Comparison Settings</source> -<target>Karşılaştırma Ayarları</target> - <source>Cannot find %x</source> <target>%x bulunamadı</target> @@ -1313,30 +1316,6 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Log</source> <target>Günlük</target> -<source>Today</source> -<target>Bugün</target> - -<source>This week</source> -<target>Bu hafta</target> - -<source>This month</source> -<target>Bu ay</target> - -<source>This year</source> -<target>Bu yıl</target> - -<source>Last x days</source> -<target>Son x günde</target> - -<source>Byte</source> -<target>Bayt</target> - -<source>KB</source> -<target>KB</target> - -<source>MB</source> -<target>MB</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1358,14 +1337,8 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <pluralform>Aşağıdaki %x ögeyi silmek istediğinize emin misiniz?</pluralform> </target> -<source>Exclude</source> -<target>Katılmasın</target> - -<source>Direct</source> -<target>Doğrudan</target> - -<source>Follow</source> -<target>Hedefler</target> +<source>Preferences</source> +<target>Tercihler</target> <source>Copy NTFS permissions</source> <target>NTFS izinleri de kopyalansın</target> @@ -1388,8 +1361,50 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Restore all hidden windows and warnings?</source> <target>Gizlenmiş tüm pencere ve uyarılar yeniden görüntülensin mi?</target> -<source>Leave as unresolved conflict</source> -<target>Uyuşmazlık çözülmeden bırakılsın</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> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Sağ klasör, sola uyacak şekilde güncellenerek, sol klasörün yansı yedeği oluşturulur.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Sol taraftaki yeni ya da güncellenmiş ögeler sağ tarafa kopyalanır.</target> + +<source>Configure your own synchronization rules.</source> +<target>Eşleştirme kuralları kullanıcının isteğine göre belirlenir.</target> + +<source>Exclude</source> +<target>Katılmasın</target> + +<source>Direct</source> +<target>Doğrudan</target> + +<source>Follow</source> +<target>Hedefler</target> + +<source>Today</source> +<target>Bugün</target> + +<source>This week</source> +<target>Bu hafta</target> + +<source>This month</source> +<target>Bu ay</target> + +<source>This year</source> +<target>Bu yıl</target> + +<source>Last x days</source> +<target>Son x günde</target> + +<source>Byte</source> +<target>Bayt</target> + +<source>KB</source> +<target>KB</target> + +<source>MB</source> +<target>MB</target> <source>Replace</source> <target>Değiştirin</target> @@ -1403,6 +1418,15 @@ Bu yöntem, ciddi bir hata oluşması durumunda bile işlemin tutarlı olarak ya <source>Append a time stamp to each file name</source> <target>Her bir dosya adına bir zaman damgası eklensin</target> +<source>Comparison</source> +<target>Karşılaştırma</target> + +<source>Synchronization</source> +<target>Eşleştirme</target> + +<source>Leave as unresolved conflict</source> +<target>Uyuşmazlık çözülmeden bırakılsın</target> + <source>File</source> <target>Dosya</target> diff --git a/FreeFileSync/Build/Languages/ukrainian.lng b/FreeFileSync/Build/Languages/ukrainian.lng index e97fa6c6..70f068ed 100644 --- a/FreeFileSync/Build/Languages/ukrainian.lng +++ b/FreeFileSync/Build/Languages/ukrainian.lng @@ -7,6 +7,66 @@ <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>Synchronization</source> +<target></target> + +<source>Comparison</source> +<target></target> + +<source>Preferences</source> +<target></target> + +<source>Reset filter</source> +<target></target> + +<source>&Preferences...</source> +<target></target> + +<source>Options</source> +<target></target> + +<source>Local settings:</source> +<target></target> + +<source>Use local settings:</source> +<target></target> + +<source>Save as...</source> +<target></target> + +<source>Save as GUI job</source> +<target></target> + +<source>&Options</source> +<target></target> + +<source>Local Synchronization Settings</source> +<target></target> + +<source>Reset local filter</source> +<target></target> + +<source>Remove local settings</source> +<target></target> + +<source>Local synchronization settings</source> +<target></target> + +<source>Local comparison settings</source> +<target></target> + +<source>Any number of alternative directory pairs for at most one config file.</source> +<target></target> + +<source>Path to an alternate GlobalSettings.xml file.</source> +<target></target> + +<source>config files:</source> +<target></target> + +<source>global config file:</source> +<target></target> + <source>Both sides have changed since last synchronization.</source> <target>З моменту останньої синхронізації з обох сторін відбулися зміни.</target> @@ -79,18 +139,12 @@ <source>Syntax:</source> <target>Синтаксис:</target> -<source>config files</source> -<target>файли конфігурації</target> - <source>directory</source> <target>каталог</target> <source>Any number of FreeFileSync .ffs_gui and/or .ffs_batch configuration files.</source> <target>Будь-яка кількість FreeFileSync .ffs_gui та/або .ffs_batch файлів конфігурації.</target> -<source>Any number of alternative directories for at most one config file.</source> -<target>Будь-яка кількість альтернативних каталогів для щонайбільше одного конфігураційного файлу.</target> - <source>Cannot find the following folders:</source> <target>Не вдається знайти такі папки:</target> @@ -658,12 +712,6 @@ The command is triggered if: <source>Drag && drop</source> <target>Drag && drop</target> -<source>Alternate comparison settings</source> -<target>Альтернативні налаштування порівняння</target> - -<source>Alternate synchronization settings</source> -<target>Альтернативні налаштування синхронізації</target> - <source>Local filter</source> <target>Локальний фільтр</target> @@ -673,27 +721,12 @@ The command is triggered if: <source>None</source> <target>Відсутні</target> -<source>Remove alternate settings</source> -<target>Вилучити альтернативні налаштування</target> - -<source>Clear filter settings</source> -<target>Очистити налаштування фільтра</target> - <source>Copy</source> <target>Копіювати</target> <source>Paste</source> <target>Вклеїти</target> -<source>Alternate Comparison Settings</source> -<target>Альтернативні Налаштування Порівняння</target> - -<source>Alternate Synchronization Settings</source> -<target>Альтернативні Налаштування Синхронізації</target> - -<source>Local Filter</source> -<target>Локальний Фільтр</target> - <source>&New</source> <target>&Нова</target> @@ -709,9 +742,6 @@ The command is triggered if: <source>2. &Synchronize</source> <target>2. &Синхронізувати</target> -<source>&Global settings</source> -<target>&Глобальні налаштування</target> - <source>&Language</source> <target>&Мова</target> @@ -733,12 +763,12 @@ The command is triggered if: <source>&Check for new version</source> <target>&Перевірка наявності нової версії</target> -<source>Compare</source> -<target>Порівняти</target> - <source>Cancel</source> <target>Відмінити</target> +<source>Compare</source> +<target>Порівняти</target> + <source>Synchronize</source> <target>Синхронізувати</target> @@ -760,6 +790,12 @@ The command is triggered if: <source>Match case</source> <target>Враховувати регістр</target> +<source>Open...</source> +<target>Відкрити...</target> + +<source>Save</source> +<target>Зберегти</target> + <source>Save as batch job</source> <target>Зберегти як пакетне завдання</target> @@ -799,20 +835,32 @@ The command is triggered if: <source>More information</source> <target>Додаткова інформація</target> -<source>OK</source> -<target>OK</target> +<source>Include:</source> +<target>Включити</target> -<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> -<target>Виявити та поширити зміни на обидві сторони. Видалення, перейменування та конфлікти визначаються автоматично використовуючи базу даних.</target> +<source>Exclude:</source> +<target>Виключити</target> -<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> -<target>Створення дзеркальної резервної копії лівої папки шляхом адаптації правої папки.</target> +<source>Show examples</source> +<target>Показати приклади</target> -<source>Copy new and updated files to the right folder.</source> -<target>Скопіювати нові та оновлені файли в праву папку.</target> +<source>Time span:</source> +<target>Часовий інтервал</target> -<source>Configure your own synchronization rules.</source> -<target>Налаштувати власні правила синхронізації.</target> +<source>File size:</source> +<target>Розмір Файла</target> + +<source>Minimum:</source> +<target>Мінімум:</target> + +<source>Maximum:</source> +<target>Максимум:</target> + +<source>&Reset</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> <source>Detect moved files</source> <target>Виявляти переміщені файли</target> @@ -828,6 +876,9 @@ The command is triggered if: - Підтримується не всіма файловими системами </target> +<source>Detect synchronization directions with the help of database files</source> +<target>Визначити напрямок синхронізації за допомогою файлів баз даних</target> + <source>Delete files:</source> <target>Вилучити файли:</target> @@ -852,9 +903,6 @@ The command is triggered if: <source>Naming convention:</source> <target>Метод іменування:</target> -<source>Show examples</source> -<target>Показати приклади</target> - <source>Handle errors:</source> <target>Обробка помилок:</target> @@ -873,8 +921,8 @@ The command is triggered if: <source>On completion:</source> <target>Після завершення:</target> -<source>Detect synchronization directions with the help of database files</source> -<target>Визначити напрямок синхронізації за допомогою файлів баз даних</target> +<source>OK</source> +<target>OK</target> <source>Start synchronization now?</source> <target>Розпочати синхронізацію?</target> @@ -936,30 +984,6 @@ The command is triggered if: <source>&Recycle bin</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> - -<source>Include:</source> -<target>Включити</target> - -<source>Exclude:</source> -<target>Виключити</target> - -<source>Time span:</source> -<target>Часовий інтервал</target> - -<source>File size:</source> -<target>Розмір Файла</target> - -<source>Minimum:</source> -<target>Мінімум:</target> - -<source>Maximum:</source> -<target>Максимум:</target> - -<source>&Reset</source> -<target>&Відновити</target> - <source>The following settings are used for all synchronization jobs.</source> <target>Наступні налаштування використовуються для всіх завдань синхронізації.</target> @@ -1044,9 +1068,6 @@ This guarantees a consistent state even in case of a serious error. <source>Delete Items</source> <target>Вилучити Елементи</target> -<source>Global Settings</source> -<target>Глобальні Налаштування</target> - <source>Select Time Span</source> <target>Виберіть Інтервал Часу</target> @@ -1068,12 +1089,6 @@ This guarantees a consistent state even in case of a serious error. <source>Main Bar</source> <target>Головна панель</target> -<source>Open...</source> -<target>Відкрити...</target> - -<source>Save</source> -<target>Зберегти</target> - <source>Compare both sides</source> <target>Порівняти обидві сторони</target> @@ -1204,8 +1219,8 @@ This guarantees a consistent state even in case of a serious error. <source>Delete selected configurations</source> <target>Вилучити вибрану конфігурацію</target> -<source>Filter</source> -<target>Фільтр</target> +<source>Synchronization Settings</source> +<target>Налаштування Синхронізації</target> <source>Show files that exist on left side only</source> <target>Показати файли, які є тільки ліворуч</target> @@ -1255,15 +1270,12 @@ This guarantees a consistent state even in case of a serious error. <source>Set as default</source> <target>Встановити за замовчуванням</target> +<source>Filter</source> +<target>Фільтр</target> + <source>All files are in sync</source> <target>Всі файли синхронні</target> -<source>Synchronization Settings</source> -<target>Налаштування Синхронізації</target> - -<source>Comparison Settings</source> -<target>Параметри Порівняння</target> - <source>Cannot find %x</source> <target>Не можна знайти %x</target> @@ -1324,30 +1336,6 @@ This guarantees a consistent state even in case of a serious error. <source>Log</source> <target>Лог</target> -<source>Today</source> -<target>Сьогодні</target> - -<source>This week</source> -<target>Цього тижня</target> - -<source>This month</source> -<target>Цього місяця</target> - -<source>This year</source> -<target>Цього року</target> - -<source>Last x days</source> -<target>Останні x днів</target> - -<source>Byte</source> -<target>Байт</target> - -<source>KB</source> -<target>КБ</target> - -<source>MB</source> -<target>МБ</target> - <source> <pluralform>Do you really want to move the following item to the recycle bin?</pluralform> <pluralform>Do you really want to move the following %x items to the recycle bin?</pluralform> @@ -1371,15 +1359,6 @@ This guarantees a consistent state even in case of a serious error. <pluralform>Ви дійсно хочете вилучити ці %x елементів?</pluralform> </target> -<source>Exclude</source> -<target>Виключити</target> - -<source>Direct</source> -<target>Прямо</target> - -<source>Follow</source> -<target>Послідовно</target> - <source>Copy NTFS permissions</source> <target>Копіювати права доступу NTFS</target> @@ -1401,8 +1380,50 @@ This guarantees a consistent state even in case of a serious error. <source>Restore all hidden windows and warnings?</source> <target>Відновити всі приховані вікна та попередження?</target> -<source>Leave as unresolved conflict</source> -<target>Залишити як невирішений конфлікт</target> +<source>Identify and propagate changes on both sides. Deletions, moves and conflicts are detected automatically using a database.</source> +<target>Виявити та поширити зміни на обидві сторони. Видалення, перейменування та конфлікти визначаються автоматично використовуючи базу даних.</target> + +<source>Create a mirror backup of the left folder by adapting the right folder to match.</source> +<target>Створення дзеркальної резервної копії лівої папки шляхом адаптації правої папки.</target> + +<source>Copy new and updated files to the right folder.</source> +<target>Скопіювати нові та оновлені файли в праву папку.</target> + +<source>Configure your own synchronization rules.</source> +<target>Налаштувати власні правила синхронізації.</target> + +<source>Exclude</source> +<target>Виключити</target> + +<source>Direct</source> +<target>Прямо</target> + +<source>Follow</source> +<target>Послідовно</target> + +<source>Today</source> +<target>Сьогодні</target> + +<source>This week</source> +<target>Цього тижня</target> + +<source>This month</source> +<target>Цього місяця</target> + +<source>This year</source> +<target>Цього року</target> + +<source>Last x days</source> +<target>Останні x днів</target> + +<source>Byte</source> +<target>Байт</target> + +<source>KB</source> +<target>КБ</target> + +<source>MB</source> +<target>МБ</target> <source>Replace</source> <target>Замінити</target> @@ -1416,6 +1437,9 @@ This guarantees a consistent state even in case of a serious error. <source>Append a time stamp to each file name</source> <target>Приєднати часову мітку до кожної назви файлу</target> +<source>Leave as unresolved conflict</source> +<target>Залишити як невирішений конфлікт</target> + <source>File</source> <target>Файл</target> diff --git a/FreeFileSync/Source/Makefile b/FreeFileSync/Source/Makefile index bb3cbfec..f9c1647e 100644 --- a/FreeFileSync/Source/Makefile +++ b/FreeFileSync/Source/Makefile @@ -7,9 +7,12 @@ SHAREDIR = $(DESTDIR)$(prefix)/share APPSHAREDIR = $(SHAREDIR)/$(APPNAME) DOCSHAREDIR = $(SHAREDIR)/doc/$(APPNAME) -CXXFLAGS = -std=c++11 -pipe -O3 -DNDEBUG -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ +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 +release launchpad: CXXFLAGS += -O3 -DNDEBUG +debug: CXXFLAGS += -g -D__WXDEBUG__ + LINKFLAGS = #distinguish Linux/OSX builds @@ -17,7 +20,7 @@ OPERATING_SYSTEM_NAME := $(shell uname) #################### Linux ############################ ifeq ($(OPERATING_SYSTEM_NAME), Linux) -COMPILER_BIN=g++ -pthread +COMPILER_BIN = g++ -pthread CXXFLAGS += -DZEN_LINUX -Wcast-align -Wshadow #Gtk - support recycler/icon loading/no button border/grid scrolling @@ -38,39 +41,34 @@ CXXFLAGS += `pkg-config --cflags unity` -DHAVE_UBUNTU_UNITY LINKFLAGS += `pkg-config --libs unity` endif -ifeq ($(BUILD),Launchpad) -#default build/Launchpad -CXXFLAGS += `wx-config --cxxflags --debug=no` -LINKFLAGS += `wx-config --libs std, aui --debug=no` -lboost_thread -lboost_system -lz -else -#static wxWidgets and boost library linkage for precompiled release -WX_CONFIG_BIN =$(HOME)/Desktop/wxWidgets/lib/release/bin/wx-config -CXXFLAGS += -I$(HOME)/Desktop/boost -BOOST_LIB_DIR =$(HOME)/Desktop/boost/stage/lib - -CXXFLAGS += `$(WX_CONFIG_BIN) --cxxflags --debug=no --static=yes` -LINKFLAGS += `$(WX_CONFIG_BIN) --libs std, aui --debug=no --static=yes` $(BOOST_LIB_DIR)/libboost_thread.a $(BOOST_LIB_DIR)/libboost_system.a -lX11 -endif - +release launchpad: LINKFLAGS += -s +#release debug: LINKFLAGS += -lX11 endif #################### OS X ############################ ifeq ($(OPERATING_SYSTEM_NAME), Darwin) -COMPILER_BIN=clang++ -stdlib=libc++ +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 -WX_CONFIG_BIN =$(HOME)/Desktop/wxWidgets/lib/release/bin/wx-config -CXXFLAGS += -I$(HOME)/Desktop/boost +#-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 -MACOS_SDK =-mmacosx-version-min=10.7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk +CXXFLAGS += -I$(HOME)/Desktop/boost -#-Wl,-Bstatic not supported on OSX! +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` -# link wxWidgets and boost statically -> check dependencies with: otool -L FreeFileSync -CXXFLAGS += $(MACOS_SDK) `$(WX_CONFIG_BIN) --cxxflags --debug=no --static=yes` -LINKFLAGS += $(MACOS_SDK) `$(WX_CONFIG_BIN) --libs std, aui --debug=no --static=yes` $(BOOST_LIB_DIR)/libboost_thread.a $(BOOST_LIB_DIR)/libboost_system.a +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 -endif -###################################################### CPP_LIST= #internal list of all *.cpp files needed for compilation CPP_LIST+=algorithm.cpp @@ -139,7 +137,11 @@ endif 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) -all: FreeFileSync +all: release + +release: FreeFileSync +debug: FreeFileSync +launchpad: FreeFileSync ../Obj/FFS_GCC_Make_Release/ffs/src/%.mm.o : %.mm mkdir -p $(dir $@) diff --git a/FreeFileSync/Source/RealtimeSync/Makefile b/FreeFileSync/Source/RealtimeSync/Makefile index a150bf0f..b3d440ca 100644 --- a/FreeFileSync/Source/RealtimeSync/Makefile +++ b/FreeFileSync/Source/RealtimeSync/Makefile @@ -4,9 +4,12 @@ APPNAME = RealtimeSync prefix = /usr BINDIR = $(DESTDIR)$(prefix)/bin -CXXFLAGS = -std=c++11 -pipe -O3 -DNDEBUG -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ +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 +release launchpad: CXXFLAGS += -O3 -DNDEBUG +debug: CXXFLAGS += -g -D__WXDEBUG__ + LINKFLAGS = #distinguish Linux/Mac builds @@ -14,46 +17,41 @@ OPERATING_SYSTEM_NAME := $(shell uname) #################### Linux ############################ ifeq ($(OPERATING_SYSTEM_NAME), Linux) -COMPILER_BIN=g++ -pthread +COMPILER_BIN = g++ -pthread CXXFLAGS += -DZEN_LINUX -Wcast-align -Wshadow #Gtk - support "no button border" CXXFLAGS += `pkg-config --cflags gtk+-2.0` LINKFLAGS += `pkg-config --libs gtk+-2.0` -ifeq ($(BUILD),Launchpad) -#default build/Launchpad -CXXFLAGS += `wx-config --cxxflags --debug=no` -LINKFLAGS += `wx-config --libs --debug=no` -lboost_thread -lboost_system -lz -else -#static wxWidgets and boost library linkage for precompiled release -WX_CONFIG_BIN =$(HOME)/Desktop/wxWidgets/lib/release/bin/wx-config -CXXFLAGS += -I$(HOME)/Desktop/boost -BOOST_LIB_DIR =$(HOME)/Desktop/boost/stage/lib - -CXXFLAGS += `$(WX_CONFIG_BIN) --cxxflags --debug=no --static=yes` -LINKFLAGS += `$(WX_CONFIG_BIN) --libs --debug=no --static=yes` $(BOOST_LIB_DIR)/libboost_thread.a $(BOOST_LIB_DIR)/libboost_system.a -lX11 -endif - +release launchpad: LINKFLAGS += -s +#release debug: LINKFLAGS += -lX11 endif #################### OS X ############################ ifeq ($(OPERATING_SYSTEM_NAME), Darwin) -COMPILER_BIN=clang++ -stdlib=libc++ +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 -WX_CONFIG_BIN =$(HOME)/Desktop/wxWidgets/lib/release/bin/wx-config -CXXFLAGS += -I$(HOME)/Desktop/boost -BOOST_LIB_DIR =$(HOME)/Desktop/boost/stage/lib -MACOS_SDK =-mmacosx-version-min=10.7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk #-Wl,-Bstatic not supported on OSX! - -# link wxWidgets and boost statically -> check dependencies with: otool -L RealtimeSync -CXXFLAGS += $(MACOS_SDK) `$(WX_CONFIG_BIN) --cxxflags --debug=no --static=yes` -LINKFLAGS += $(MACOS_SDK) `$(WX_CONFIG_BIN) --libs --debug=no --static=yes` $(BOOST_LIB_DIR)/libboost_thread.a $(BOOST_LIB_DIR)/libboost_system.a - +# 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+=application.cpp CPP_LIST+=gui_generated.cpp @@ -83,7 +81,11 @@ 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: RealtimeSync +all: release + +release: RealtimeSync +debug: RealtimeSync +launchpad: RealtimeSync ../../Obj/RTS_GCC_Make_Release/ffs/src/rts/%.o : %.cpp mkdir -p $(dir $@) diff --git a/FreeFileSync/Source/RealtimeSync/application.cpp b/FreeFileSync/Source/RealtimeSync/application.cpp index cb315e62..04530e3a 100644 --- a/FreeFileSync/Source/RealtimeSync/application.cpp +++ b/FreeFileSync/Source/RealtimeSync/application.cpp @@ -8,6 +8,7 @@ #include "main_dlg.h" #include <zen/file_handling.h> #include <zen/thread.h> +#include <zen/dll.h> #include <wx/event.h> #include <wx/log.h> #include <wx/tooltip.h> @@ -184,4 +185,4 @@ void Application::onQueryEndSession(wxEvent& event) OnExit(); //wxWidgets screws up again: http://trac.wxwidgets.org/ticket/3069 //wxEntryCleanup(); -> gives popup "dll init failed" on XP std::exit(FFS_RC_SUCCESS); //Windows will terminate anyway: destruct global objects -}
\ No newline at end of file +} diff --git a/FreeFileSync/Source/RealtimeSync/monitor.cpp b/FreeFileSync/Source/RealtimeSync/monitor.cpp index 09b92af6..9f629310 100644 --- a/FreeFileSync/Source/RealtimeSync/monitor.cpp +++ b/FreeFileSync/Source/RealtimeSync/monitor.cpp @@ -121,6 +121,7 @@ WaitResult waitForChanges(const std::vector<Zstring>& dirnamePhrases, //throw Fi #ifdef ZEN_MAC endsWith(e.filename_, Zstr("/.DS_Store")) || #endif + endsWith(e.filename_, TEMP_FILE_ENDING) || endsWith(e.filename_, Zstr(".ffs_lock")) || //sync.ffs_lock, sync.Del.ffs_lock endsWith(e.filename_, Zstr(".ffs_db")); //sync.ffs_db, .sync.tmp.ffs_db //no need to ignore temporal recycle bin directory: this must be caused by a file deletion anyway diff --git a/FreeFileSync/Source/application.cpp b/FreeFileSync/Source/application.cpp index f2f9ff4a..ec03a184 100644 --- a/FreeFileSync/Source/application.cpp +++ b/FreeFileSync/Source/application.cpp @@ -18,7 +18,7 @@ #include "algorithm.h" #include "synchronization.h" #include "ui/batch_status_handler.h" -#include "ui/check_version.h" +//#include "ui/check_version.h" #include "ui/main_dlg.h" #include "ui/switch_to_gui.h" #include "lib/process_xml.h" @@ -428,7 +428,8 @@ void Application::launch(const std::vector<Zstring>& commandArgs) XmlGuiConfig guiCfg; guiCfg.mainCfg.syncCfg.directionCfg.var = DirectionConfig::MIRROR; - if (!replaceDirectories(guiCfg.mainCfg)) return; + if (!replaceDirectories(guiCfg.mainCfg)) + return; runGuiMode(globalConfigFilePath, guiCfg, std::vector<Zstring>()); } } @@ -453,7 +454,8 @@ void Application::launch(const std::vector<Zstring>& commandArgs) notifyError(e.toString(), std::wstring()); return; } - if (!replaceDirectories(batchCfg.mainCfg)) return; + if (!replaceDirectories(batchCfg.mainCfg)) + return; runBatchMode(globalConfigFilePath, batchCfg, filename, returnCode); } //GUI mode: single config diff --git a/FreeFileSync/Source/comparison.cpp b/FreeFileSync/Source/comparison.cpp index b5a1a78f..522b0d73 100644 --- a/FreeFileSync/Source/comparison.cpp +++ b/FreeFileSync/Source/comparison.cpp @@ -140,7 +140,7 @@ void checkFolderDependency(const std::vector<ResolvedFolderPair>& folderPairs, b { std::vector<std::pair<Zstring, Zstring>> dependentDirs; - auto dependentDir = [](const Zstring& lhs, const Zstring& rhs) + auto areDependent = [](const Zstring& lhs, const Zstring& rhs) { return EqualFilename()(Zstring(lhs.c_str(), std::min(lhs.length(), rhs.length())), //note: this is NOT an equivalence relation! Zstring(rhs.c_str(), std::min(lhs.length(), rhs.length()))); @@ -149,7 +149,7 @@ void checkFolderDependency(const std::vector<ResolvedFolderPair>& folderPairs, b for (const ResolvedFolderPair& fp : folderPairs) if (!fp.dirnameLeft.empty() && !fp.dirnameRight.empty()) //empty folders names may be accepted by user { - if (dependentDir(fp.dirnameLeft, fp.dirnameRight)) //test wheter leftDirectory begins with rightDirectory or the other way round + if (areDependent(fp.dirnameLeft, fp.dirnameRight)) //test wheter leftDirectory begins with rightDirectory or the other way round dependentDirs.push_back(std::make_pair(fp.dirnameLeft, fp.dirnameRight)); } diff --git a/FreeFileSync/Source/ui/batch_config.cpp b/FreeFileSync/Source/ui/batch_config.cpp index 09bb3280..92494048 100644 --- a/FreeFileSync/Source/ui/batch_config.cpp +++ b/FreeFileSync/Source/ui/batch_config.cpp @@ -6,7 +6,7 @@ #include "batch_config.h" #include <wx/wupdlock.h> -#include <wx+/std_button_order.h> +#include <wx+/std_button_layout.h> #include <wx+/font_size.h> #include <wx+/image_resources.h> #include "gui_generated.h" @@ -75,7 +75,7 @@ BatchDialog::BatchDialog(wxWindow* parent, new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this" wxWindowUpdateLocker dummy(this); //leads to GUI corruption problems on Linux/OS X! #endif - setStandardButtonOrder(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonSaveAs).setCancel(m_buttonCancel)); + setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonSaveAs).setCancel(m_buttonCancel)); m_staticTextDescr->SetLabel(replaceCpy(m_staticTextDescr->GetLabel(), L"%x", L"FreeFileSync.exe <" + _("job name") + L">.ffs_batch")); diff --git a/FreeFileSync/Source/ui/folder_pair.h b/FreeFileSync/Source/ui/folder_pair.h index 0fdc2a1c..9f700a59 100644 --- a/FreeFileSync/Source/ui/folder_pair.h +++ b/FreeFileSync/Source/ui/folder_pair.h @@ -64,23 +64,23 @@ private: if (altCompConfig.get()) { setImage(*basicPanel_.m_bpButtonAltCompCfg, getResourceImage(L"cfg_compare_small")); - basicPanel_.m_bpButtonAltCompCfg->SetToolTip(_("Alternate comparison settings") + L" (" + getVariantName(altCompConfig->compareVar) + L")"); + basicPanel_.m_bpButtonAltCompCfg->SetToolTip(_("Local comparison settings") + L" (" + getVariantName(altCompConfig->compareVar) + L")"); } else { setImage(*basicPanel_.m_bpButtonAltCompCfg, greyScale(getResourceImage(L"cfg_compare_small"))); - basicPanel_.m_bpButtonAltCompCfg->SetToolTip(_("Alternate comparison settings")); + basicPanel_.m_bpButtonAltCompCfg->SetToolTip(_("Local comparison settings")); } if (altSyncConfig.get()) { setImage(*basicPanel_.m_bpButtonAltSyncCfg, getResourceImage(L"cfg_sync_small")); - basicPanel_.m_bpButtonAltSyncCfg->SetToolTip(_("Alternate synchronization settings") + L" (" + getVariantName(altSyncConfig->directionCfg.var) + L")"); + basicPanel_.m_bpButtonAltSyncCfg->SetToolTip(_("Local synchronization settings") + L" (" + getVariantName(altSyncConfig->directionCfg.var) + L")"); } else { setImage(*basicPanel_.m_bpButtonAltSyncCfg, greyScale(getResourceImage(L"cfg_sync_small"))); - basicPanel_.m_bpButtonAltSyncCfg->SetToolTip(_("Alternate synchronization settings")); + basicPanel_.m_bpButtonAltSyncCfg->SetToolTip(_("Local synchronization settings")); } if (!isNullFilter(localFilter)) @@ -105,7 +105,7 @@ private: }; ContextMenu menu; - menu.addItem(_("Remove alternate settings"), removeAltCompCfg, nullptr, altCompConfig.get() != nullptr); + menu.addItem(_("Remove local settings"), removeAltCompCfg, nullptr, altCompConfig.get() != nullptr); menu.popup(basicPanel_); } @@ -119,7 +119,7 @@ private: }; ContextMenu menu; - menu.addItem(_("Remove alternate settings"), removeAltSyncCfg, nullptr, altSyncConfig.get() != nullptr); + menu.addItem(_("Remove local settings"), removeAltSyncCfg, nullptr, altSyncConfig.get() != nullptr); menu.popup(basicPanel_); } @@ -146,7 +146,7 @@ private: }; ContextMenu menu; - menu.addItem(_("Clear filter settings"), removeLocalFilterCfg, nullptr, !isNullFilter(localFilter)); + menu.addItem(_("Reset 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 68b2c0d0..80e06143 100644 --- a/FreeFileSync/Source/ui/gui_generated.cpp +++ b/FreeFileSync/Source/ui/gui_generated.cpp @@ -55,8 +55,8 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const m_menubar1->Append( m_menuFile, _("&Program") ); m_menuTools = new wxMenu(); - m_menuItemGlobSett = new wxMenuItem( m_menuTools, wxID_PREFERENCES, wxString( _("&Global settings") ) , wxEmptyString, wxITEM_NORMAL ); - m_menuTools->Append( m_menuItemGlobSett ); + m_menuItemOptions = new wxMenuItem( m_menuTools, wxID_PREFERENCES, wxString( _("&Options") ) , wxEmptyString, wxITEM_NORMAL ); + m_menuTools->Append( m_menuItemOptions ); m_menuTools->AppendSeparator(); @@ -883,7 +883,7 @@ MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const this->Connect( m_menuItem10->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) ); this->Connect( m_menuItem11->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) ); this->Connect( m_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) ); - this->Connect( m_menuItemGlobSett->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuGlobalSettings ) ); + this->Connect( m_menuItemOptions->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuOptions ) ); this->Connect( m_menuItem15->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuFindItem ) ); this->Connect( m_menuItem5->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) ); this->Connect( m_menuItemManual->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) ); @@ -957,26 +957,26 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w bSizer7 = new wxBoxSizer( wxVERTICAL ); m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - m_panel39 = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_panel39->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); + m_panelCompSettingsHolder = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_panelCompSettingsHolder->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); wxBoxSizer* bSizer275; bSizer275 = new wxBoxSizer( wxVERTICAL ); bSizerLocalCompSettings = new wxBoxSizer( wxVERTICAL ); - m_checkBoxUseLocalCmpOptions = new wxCheckBox( m_panel39, wxID_ANY, _("Use local settings:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkBoxUseLocalCmpOptions = new wxCheckBox( m_panelCompSettingsHolder, wxID_ANY, _("Use local settings:"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkBoxUseLocalCmpOptions->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); bSizerLocalCompSettings->Add( m_checkBoxUseLocalCmpOptions, 0, wxALL|wxEXPAND, 10 ); - m_staticline59 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + m_staticline59 = new wxStaticLine( m_panelCompSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizerLocalCompSettings->Add( m_staticline59, 0, wxEXPAND, 5 ); bSizer275->Add( bSizerLocalCompSettings, 0, wxEXPAND, 5 ); - m_panelComparisonSettings = new wxPanel( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_panelComparisonSettings = new wxPanel( m_panelCompSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelComparisonSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); wxBoxSizer* bSizer159; @@ -1064,29 +1064,29 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w bSizer275->Add( m_panelComparisonSettings, 0, wxEXPAND, 5 ); - m_panel39->SetSizer( bSizer275 ); - m_panel39->Layout(); - bSizer275->Fit( m_panel39 ); - m_notebook->AddPage( m_panel39, _("dummy"), false ); - m_panel40 = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_panel40->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); + m_panelCompSettingsHolder->SetSizer( bSizer275 ); + m_panelCompSettingsHolder->Layout(); + bSizer275->Fit( m_panelCompSettingsHolder ); + m_notebook->AddPage( m_panelCompSettingsHolder, _("dummy"), true ); + m_panelFilterSettingsHolder = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_panelFilterSettingsHolder->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); wxBoxSizer* bSizer278; bSizer278 = new wxBoxSizer( wxVERTICAL ); bSizerLocalFilterSettings = new wxBoxSizer( wxVERTICAL ); - m_staticText144 = new wxStaticText( m_panel40, wxID_ANY, _("Local settings:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText144 = new wxStaticText( m_panelFilterSettingsHolder, wxID_ANY, _("Local settings:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText144->Wrap( -1 ); bSizerLocalFilterSettings->Add( m_staticText144, 0, wxALL, 10 ); - m_staticline61 = new wxStaticLine( m_panel40, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + m_staticline61 = new wxStaticLine( m_panelFilterSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizerLocalFilterSettings->Add( m_staticline61, 0, wxEXPAND, 5 ); bSizer278->Add( bSizerLocalFilterSettings, 0, wxEXPAND, 5 ); - m_panelFilterSettings = new wxPanel( m_panel40, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_panelFilterSettings = new wxPanel( m_panelFilterSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelFilterSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); wxBoxSizer* bSizer1591; @@ -1265,16 +1265,16 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w bSizer1591->Fit( m_panelFilterSettings ); bSizer278->Add( m_panelFilterSettings, 1, wxEXPAND, 5 ); - m_staticline62 = new wxStaticLine( m_panel40, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + m_staticline62 = new wxStaticLine( m_panelFilterSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizer278->Add( m_staticline62, 0, wxEXPAND, 5 ); wxBoxSizer* bSizer280; bSizer280 = new wxBoxSizer( wxHORIZONTAL ); - m_buttonReset = new wxButton( m_panel40, wxID_DEFAULT, _("&Reset"), wxDefaultPosition, wxSize( -1,30 ), 0 ); - bSizer280->Add( m_buttonReset, 0, wxALL, 5 ); + 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_staticText44 = new wxStaticText( m_panel40, 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 = 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 ); bSizer280->Add( m_staticText44, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 10 ); @@ -1282,28 +1282,28 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w bSizer278->Add( bSizer280, 0, wxEXPAND, 5 ); - m_panel40->SetSizer( bSizer278 ); - m_panel40->Layout(); - bSizer278->Fit( m_panel40 ); - m_notebook->AddPage( m_panel40, _("dummy"), false ); - m_panel41 = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); + m_panelFilterSettingsHolder->SetSizer( bSizer278 ); + m_panelFilterSettingsHolder->Layout(); + bSizer278->Fit( m_panelFilterSettingsHolder ); + m_notebook->AddPage( m_panelFilterSettingsHolder, _("dummy"), false ); + m_panelSyncSettingsHolder = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_panelSyncSettingsHolder->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); wxBoxSizer* bSizer276; bSizer276 = new wxBoxSizer( wxVERTICAL ); bSizerLocalSyncSettings = new wxBoxSizer( wxVERTICAL ); - m_checkBoxUseLocalSyncOptions = new wxCheckBox( m_panel41, wxID_ANY, _("Use local settings:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkBoxUseLocalSyncOptions = new wxCheckBox( m_panelSyncSettingsHolder, wxID_ANY, _("Use local settings:"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerLocalSyncSettings->Add( m_checkBoxUseLocalSyncOptions, 0, wxALL|wxEXPAND, 10 ); - m_staticline60 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + m_staticline60 = new wxStaticLine( m_panelSyncSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizerLocalSyncSettings->Add( m_staticline60, 0, wxEXPAND, 5 ); bSizer276->Add( bSizerLocalSyncSettings, 0, wxEXPAND, 5 ); - m_panelSyncSettings = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_panelSyncSettings = new wxPanel( m_panelSyncSettingsHolder, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelSyncSettings->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); wxBoxSizer* bSizer232; @@ -1644,22 +1644,22 @@ ConfigDlgGenerated::ConfigDlgGenerated( wxWindow* parent, wxWindowID id, const w bSizer276->Add( m_panelSyncSettings, 1, wxEXPAND, 5 ); - m_panel41->SetSizer( bSizer276 ); - m_panel41->Layout(); - bSizer276->Fit( m_panel41 ); - m_notebook->AddPage( m_panel41, _("dummy"), true ); + m_panelSyncSettingsHolder->SetSizer( bSizer276 ); + m_panelSyncSettingsHolder->Layout(); + bSizer276->Fit( m_panelSyncSettingsHolder ); + m_notebook->AddPage( m_panelSyncSettingsHolder, _("dummy"), false ); bSizer7->Add( m_notebook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL ); - m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,30 ), 0 ); + m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_buttonOkay->SetDefault(); m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 ); + m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); @@ -1910,13 +1910,13 @@ SyncConfirmationDlgGenerated::SyncConfirmationDlgGenerated( wxWindow* parent, wx bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL ); - m_buttonStartSync = new wxButton( this, wxID_OK, _("&Start"), wxDefaultPosition, wxSize( -1,30 ), 0 ); + m_buttonStartSync = new wxButton( this, wxID_OK, _("&Start"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_buttonStartSync->SetDefault(); m_buttonStartSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); bSizerStdButtons->Add( m_buttonStartSync, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 ); + m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); @@ -2448,16 +2448,16 @@ SyncProgressPanelGenerated::SyncProgressPanelGenerated( wxWindow* parent, wxWind bSizerStdButtons->Add( bSizer160, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1,30 ), 0 ); + m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_buttonClose->SetDefault(); m_buttonClose->Enable( false ); bSizerStdButtons->Add( m_buttonClose, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_buttonPause = new wxButton( this, wxID_ANY, _("&Pause"), wxDefaultPosition, wxSize( -1,30 ), 0 ); + m_buttonPause = new wxButton( this, wxID_ANY, _("&Pause"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); bSizerStdButtons->Add( m_buttonPause, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - m_buttonStop = new wxButton( this, wxID_CANCEL, _("Stop"), wxDefaultPosition, wxSize( -1,30 ), 0 ); + m_buttonStop = new wxButton( this, wxID_CANCEL, _("Stop"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); bSizerStdButtons->Add( m_buttonStop, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); @@ -2643,7 +2643,7 @@ BatchDlgGenerated::BatchDlgGenerated( wxWindow* parent, wxWindowID id, const wxS bSizer1721->Add( m_checkBoxLogfilesLimit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - m_spinCtrlLogfileLimit = new wxSpinCtrl( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 ); + m_spinCtrlLogfileLimit = new wxSpinCtrl( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 70,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 ); m_spinCtrlLogfileLimit->SetToolTip( _("Limit maximum number of log files") ); bSizer1721->Add( m_spinCtrlLogfileLimit, 0, wxALIGN_CENTER_VERTICAL, 5 ); @@ -2674,13 +2674,13 @@ BatchDlgGenerated::BatchDlgGenerated( wxWindow* parent, wxWindowID id, const wxS bSizerStdButtons->Add( 0, 0, 1, wxEXPAND, 5 ); - m_buttonSaveAs = new wxButton( this, wxID_SAVE, _("Save &as..."), wxDefaultPosition, wxSize( -1,30 ), 0 ); + m_buttonSaveAs = new wxButton( this, wxID_SAVE, _("Save &as..."), wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_buttonSaveAs->SetDefault(); m_buttonSaveAs->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); bSizerStdButtons->Add( m_buttonSaveAs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 ); + m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); @@ -2768,13 +2768,13 @@ DeleteDlgGenerated::DeleteDlgGenerated( wxWindow* parent, wxWindowID id, const w bSizerStdButtons->Add( bSizer99, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 ); - m_buttonOK = new wxButton( this, wxID_OK, _("dummy"), wxDefaultPosition, wxSize( -1,30 ), 0 ); + m_buttonOK = new wxButton( this, wxID_OK, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_buttonOK->SetDefault(); m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); bSizerStdButtons->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 ); + m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); @@ -2798,7 +2798,7 @@ DeleteDlgGenerated::~DeleteDlgGenerated() { } -GlobalSettingsDlgGenerated::GlobalSettingsDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +OptionsDlgGenerated::OptionsDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) { this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize ); this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); @@ -3015,19 +3015,19 @@ GlobalSettingsDlgGenerated::GlobalSettingsDlgGenerated( wxWindow* parent, wxWind bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL ); - m_buttonDefault = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 ); + m_buttonDefault = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); bSizerStdButtons->Add( m_buttonDefault, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); bSizerStdButtons->Add( 0, 0, 1, 0, 5 ); - m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,30 ), 0 ); + m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_buttonOkay->SetDefault(); m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 ); + m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); @@ -3041,18 +3041,18 @@ GlobalSettingsDlgGenerated::GlobalSettingsDlgGenerated( wxWindow* parent, wxWind this->Centre( wxBOTH ); // Connect Events - this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( GlobalSettingsDlgGenerated::OnClose ) ); - m_spinCtrlAutoRetryCount->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnToggleAutoRetryCount ), NULL, this ); - m_bpButtonAddRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnAddRow ), NULL, this ); - m_bpButtonRemoveRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnRemoveRow ), NULL, this ); - m_hyperlink17->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( GlobalSettingsDlgGenerated::OnHelpShowExamples ), NULL, this ); - m_buttonResetDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnResetDialogs ), NULL, this ); - m_buttonDefault->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnDefault ), NULL, this ); - m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnOkay ), NULL, this ); - m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnCancel ), NULL, this ); + this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( OptionsDlgGenerated::OnClose ) ); + m_spinCtrlAutoRetryCount->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( OptionsDlgGenerated::OnToggleAutoRetryCount ), NULL, this ); + m_bpButtonAddRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnAddRow ), NULL, this ); + m_bpButtonRemoveRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnRemoveRow ), NULL, this ); + m_hyperlink17->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( OptionsDlgGenerated::OnHelpShowExamples ), NULL, this ); + m_buttonResetDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnResetDialogs ), NULL, this ); + m_buttonDefault->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnDefault ), NULL, this ); + m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnOkay ), NULL, this ); + m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( OptionsDlgGenerated::OnCancel ), NULL, this ); } -GlobalSettingsDlgGenerated::~GlobalSettingsDlgGenerated() +OptionsDlgGenerated::~OptionsDlgGenerated() { } @@ -3111,13 +3111,13 @@ SelectTimespanDlgGenerated::SelectTimespanDlgGenerated( wxWindow* parent, wxWind bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL ); - m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,30 ), 0 ); + m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_buttonOkay->SetDefault(); m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); bSizerStdButtons->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 ); + m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); @@ -3426,7 +3426,7 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL ); - m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1,30 ), 0 ); + m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_buttonClose->SetDefault(); bSizerStdButtons->Add( m_buttonClose, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); diff --git a/FreeFileSync/Source/ui/gui_generated.h b/FreeFileSync/Source/ui/gui_generated.h index ed5beae9..c397b6d1 100644 --- a/FreeFileSync/Source/ui/gui_generated.h +++ b/FreeFileSync/Source/ui/gui_generated.h @@ -75,7 +75,7 @@ protected: wxMenuItem* m_menuItem10; wxMenuItem* m_menuItem11; wxMenu* m_menuTools; - wxMenuItem* m_menuItemGlobSett; + wxMenuItem* m_menuItemOptions; wxMenu* m_menuLanguages; wxMenu* m_menuHelp; wxMenuItem* m_menuItemManual; @@ -193,7 +193,7 @@ protected: virtual void OnCompare( wxCommandEvent& event ) { event.Skip(); } virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); } virtual void OnMenuQuit( wxCommandEvent& event ) { event.Skip(); } - virtual void OnMenuGlobalSettings( wxCommandEvent& event ) { event.Skip(); } + virtual void OnMenuOptions( wxCommandEvent& event ) { event.Skip(); } virtual void OnMenuFindItem( wxCommandEvent& event ) { event.Skip(); } virtual void OnMenuExportFileList( wxCommandEvent& event ) { event.Skip(); } virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); } @@ -247,7 +247,7 @@ private: protected: wxNotebook* m_notebook; - wxPanel* m_panel39; + wxPanel* m_panelCompSettingsHolder; wxBoxSizer* bSizerLocalCompSettings; wxCheckBox* m_checkBoxUseLocalCmpOptions; wxStaticLine* m_staticline59; @@ -264,7 +264,7 @@ protected: wxChoice* m_choiceHandleSymlinks; wxHyperlinkCtrl* m_hyperlink24; wxStaticLine* m_staticline331; - wxPanel* m_panel40; + wxPanel* m_panelFilterSettingsHolder; wxBoxSizer* bSizerLocalFilterSettings; wxStaticText* m_staticText144; wxStaticLine* m_staticline61; @@ -294,7 +294,7 @@ protected: wxStaticLine* m_staticline62; wxButton* m_buttonReset; wxStaticText* m_staticText44; - wxPanel* m_panel41; + wxPanel* m_panelSyncSettingsHolder; wxBoxSizer* bSizerLocalSyncSettings; wxCheckBox* m_checkBoxUseLocalSyncOptions; wxStaticLine* m_staticline60; @@ -672,9 +672,9 @@ public: }; /////////////////////////////////////////////////////////////////////////////// -/// Class GlobalSettingsDlgGenerated +/// Class OptionsDlgGenerated /////////////////////////////////////////////////////////////////////////////// -class GlobalSettingsDlgGenerated : public wxDialog +class OptionsDlgGenerated : public wxDialog { private: @@ -725,8 +725,8 @@ protected: public: - GlobalSettingsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Global Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~GlobalSettingsDlgGenerated(); + OptionsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~OptionsDlgGenerated(); }; diff --git a/FreeFileSync/Source/ui/main_dlg.cpp b/FreeFileSync/Source/ui/main_dlg.cpp index 0e89aa4c..c777296e 100644 --- a/FreeFileSync/Source/ui/main_dlg.cpp +++ b/FreeFileSync/Source/ui/main_dlg.cpp @@ -501,6 +501,13 @@ MainDialog::MainDialog(const Zstring& globalConfigFile, m_bpButtonAddPair ->SetBitmapLabel(getResourceImage(L"item_add")); m_bpButtonHideSearch->SetBitmapLabel(getResourceImage(L"close_panel")); + warn_static("remove after test") +#ifdef ZEN_MAC + //follow OS conventions: + // m_menuItemOptions->SetItemLabel(_("&Preferences...") + L"\tCtrl+,"); //"Ctrl" is automatically mapped to command button! + //this->SetMenuBar(m_menubar1); +#endif + //---------------- support for dockable gui style -------------------------------- bSizerPanelHolder->Detach(m_panelTopButtons); bSizerPanelHolder->Detach(m_panelDirectoryPairs); @@ -634,8 +641,8 @@ MainDialog::MainDialog(const Zstring& globalConfigFile, setMenuItemImage(m_menuItemLoad, getResourceImage(L"load_small")); setMenuItemImage(m_menuItemSave, getResourceImage(L"save_small")); - setMenuItemImage(m_menuItemGlobSett, getResourceImage(L"settings_small")); - setMenuItemImage(m_menuItem7, getResourceImage(L"batch_small")); + setMenuItemImage(m_menuItemOptions, getResourceImage(L"settings_small")); + setMenuItemImage(m_menuItem7, getResourceImage(L"batch_small")); setMenuItemImage(m_menuItemManual, getResourceImage(L"help_small")); setMenuItemImage(m_menuItemAbout, getResourceImage(L"about_small")); @@ -3321,7 +3328,7 @@ void MainDialog::OnGlobalFilterContext(wxMouseEvent& event) }; ContextMenu menu; - menu.addItem( _("Clear filter settings"), clearFilter, nullptr, !isNullFilter(currentCfg.mainCfg.globalFilter)); + menu.addItem( _("Reset 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); @@ -4339,9 +4346,9 @@ void MainDialog::setAddFolderPairs(const std::vector<zen::FolderPairEnh>& newPai //menu events -void MainDialog::OnMenuGlobalSettings(wxCommandEvent& event) +void MainDialog::OnMenuOptions(wxCommandEvent& event) { - zen::showGlobalSettingsDlg(this, globalCfg); + zen::showOptionsDlg(this, globalCfg); } diff --git a/FreeFileSync/Source/ui/main_dlg.h b/FreeFileSync/Source/ui/main_dlg.h index 7f7de49c..6a2069e1 100644 --- a/FreeFileSync/Source/ui/main_dlg.h +++ b/FreeFileSync/Source/ui/main_dlg.h @@ -237,7 +237,7 @@ private: void OnSearchPanelKeyPressed(wxKeyEvent& event); //menu events - virtual void OnMenuGlobalSettings(wxCommandEvent& event) override; + virtual void OnMenuOptions (wxCommandEvent& event) override; virtual void OnMenuExportFileList(wxCommandEvent& event) override; virtual void OnMenuFindItem (wxCommandEvent& event) override; virtual void OnMenuCheckVersion (wxCommandEvent& event) override; diff --git a/FreeFileSync/Source/ui/progress_indicator.cpp b/FreeFileSync/Source/ui/progress_indicator.cpp index 31c0ba6e..fd8e4b07 100644 --- a/FreeFileSync/Source/ui/progress_indicator.cpp +++ b/FreeFileSync/Source/ui/progress_indicator.cpp @@ -22,7 +22,7 @@ #include <wx+/context_menu.h> #include <wx+/no_flicker.h> #include <wx+/font_size.h> -#include <wx+/std_button_order.h> +#include <wx+/std_button_layout.h> #include <wx+/popup_dlg.h> #include <wx+/image_resources.h> #include <wx+/key_event.h> @@ -1206,7 +1206,7 @@ SyncProgressDialogImpl<TopLevelDialog>::SyncProgressDialogImpl(long style, //wxF pnl.m_panelItemsProcessed->Hide(); pnl.m_buttonClose ->Show(false); //set std order after button visibility was set - setStandardButtonOrder(*pnl.bSizerStdButtons, StdButtons().setAffirmative(pnl.m_buttonPause).setCancel(pnl.m_buttonStop)); + setStandardButtonLayout(*pnl.bSizerStdButtons, StdButtons().setAffirmative(pnl.m_buttonPause).setCancel(pnl.m_buttonStop)); pnl.m_bpButtonMinimizeToTray->SetBitmapLabel(getResourceImage(L"minimize_to_tray")); @@ -1847,7 +1847,7 @@ void SyncProgressDialogImpl<TopLevelDialog>::processHasFinished(SyncResult resul pnl.bSizerOnCompletion->Show(false); //set std order after button visibility was set - setStandardButtonOrder(*pnl.bSizerStdButtons, StdButtons().setAffirmative(pnl.m_buttonClose)); + setStandardButtonLayout(*pnl.bSizerStdButtons, StdButtons().setAffirmative(pnl.m_buttonClose)); //hide current operation status pnl.bSizerStatusText->Show(false); diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp index 13b5d372..3060b927 100644 --- a/FreeFileSync/Source/ui/small_dlgs.cpp +++ b/FreeFileSync/Source/ui/small_dlgs.cpp @@ -16,7 +16,7 @@ #include <wx+/no_flicker.h> #include <wx+/image_tools.h> #include <wx+/font_size.h> -#include <wx+/std_button_order.h> +#include <wx+/std_button_layout.h> #include <wx+/popup_dlg.h> #include <wx+/image_resources.h> #include "gui_generated.h" @@ -48,7 +48,7 @@ private: AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent) { - setStandardButtonOrder(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonClose)); + setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonClose)); setRelativeFontSize(*m_buttonDonate, 1.25); @@ -98,6 +98,14 @@ AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent) //generate logo: put *after* first Fit() Layout(); //make sure m_panelLogo has final width (required by wxGTK) + wxImage titelImage = createImageFromText(wxString(L"FreeFileSync ") + zen::currentVersion, + wxFont(wxNORMAL_FONT->GetPointSize() * 1.8, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, L"Tahoma"), + *wxBLACK); //accessibility: align foreground/background colors! + wxImage buildImage = createImageFromText(replaceCpy(_("Build: %x"), L"%x", build), + *wxNORMAL_FONT, + *wxBLACK); + wxImage headerImage = stackImages(titelImage, buildImage, ImageStackLayout::VERTICAL, ImageStackAlignment::CENTER, 0); + wxBitmap bmpLogo; { wxImage tmp = getResourceImage(L"logo").ConvertToImage(); @@ -106,17 +114,8 @@ AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent) } { wxMemoryDC dc(bmpLogo); - - wxImage labelImage = createImageFromText(wxString(L"FreeFileSync ") + zen::currentVersion, - wxFont(wxNORMAL_FONT->GetPointSize() * 1.8, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, L"Tahoma"), - *wxBLACK); //accessibility: align foreground/background colors! - wxImage buildImage = createImageFromText(replaceCpy(_("Build: %x"), L"%x", build), - *wxNORMAL_FONT, - *wxBLACK); - wxImage dynImage = stackImages(labelImage, buildImage, ImageStackLayout::VERTICAL, ImageStackAlignment::CENTER, 0); - - dc.DrawBitmap(dynImage, wxPoint((bmpLogo.GetWidth () - dynImage.GetWidth ()) / 2, - (bmpLogo.GetHeight() - dynImage.GetHeight()) / 2)); + dc.DrawBitmap(headerImage, wxPoint((bmpLogo.GetWidth () - headerImage.GetWidth ()) / 2, + (bmpLogo.GetHeight() - headerImage.GetHeight()) / 2)); } m_bitmapLogo->SetBitmap(bmpLogo); @@ -172,7 +171,7 @@ DeleteDialog::DeleteDialog(wxWindow* parent, #ifdef ZEN_WIN new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this" #endif - setStandardButtonOrder(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOK).setCancel(m_buttonCancel)); + setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOK).setCancel(m_buttonCancel)); setMainInstructionFont(*m_staticTextHeader); @@ -300,7 +299,7 @@ SyncConfirmationDlg::SyncConfirmationDlg(wxWindow* parent, #ifdef ZEN_WIN new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this" #endif - setStandardButtonOrder(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonStartSync).setCancel(m_buttonCancel)); + setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonStartSync).setCancel(m_buttonCancel)); setMainInstructionFont(*m_staticTextHeader); m_bitmapSync->SetBitmap(getResourceImage(L"sync")); @@ -366,10 +365,10 @@ ReturnSmallDlg::ButtonPressed zen::showSyncConfirmationDlg(wxWindow* parent, //######################################################################################## -class GlobalSettingsDlg : public GlobalSettingsDlgGenerated +class OptionsDlg : public OptionsDlgGenerated { public: - GlobalSettingsDlg(wxWindow* parent, xmlAccess::XmlGlobalSettings& globalSettings); + OptionsDlg(wxWindow* parent, xmlAccess::XmlGlobalSettings& globalSettings); private: virtual void OnOkay(wxCommandEvent& event); @@ -393,14 +392,19 @@ private: }; -GlobalSettingsDlg::GlobalSettingsDlg(wxWindow* parent, xmlAccess::XmlGlobalSettings& globalSettings) : - GlobalSettingsDlgGenerated(parent), +OptionsDlg::OptionsDlg(wxWindow* parent, xmlAccess::XmlGlobalSettings& globalSettings) : + OptionsDlgGenerated(parent), settings(globalSettings) { #ifdef ZEN_WIN new zen::MouseMoveWindow(*this); //allow moving dialog by clicking (nearly) anywhere...; ownership passed to "this" #endif - setStandardButtonOrder(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel)); + setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel)); + + warn_static("remove after test") + //#ifdef ZEN_MAC + // SetTitle(_("Preferences")); //follow OS conventions + //#endif //setMainInstructionFont(*m_staticTextHeader); @@ -444,7 +448,7 @@ GlobalSettingsDlg::GlobalSettingsDlg(wxWindow* parent, xmlAccess::XmlGlobalSetti Layout(); //automatically fit column width to match total grid width - Connect(wxEVT_SIZE, wxSizeEventHandler(GlobalSettingsDlg::onResize), nullptr, this); + Connect(wxEVT_SIZE, wxSizeEventHandler(OptionsDlg::onResize), nullptr, this); wxSizeEvent dummy; onResize(dummy); @@ -452,7 +456,7 @@ GlobalSettingsDlg::GlobalSettingsDlg(wxWindow* parent, xmlAccess::XmlGlobalSetti } -void GlobalSettingsDlg::onResize(wxSizeEvent& event) +void OptionsDlg::onResize(wxSizeEvent& event) { const int widthTotal = m_gridCustomCommand->GetGridWindow()->GetClientSize().GetWidth(); @@ -470,7 +474,7 @@ void GlobalSettingsDlg::onResize(wxSizeEvent& event) } -void GlobalSettingsDlg::updateGui() +void OptionsDlg::updateGui() { const bool autoRetryActive = m_spinCtrlAutoRetryCount->GetValue() > 0; m_staticTextAutoRetryDelay->Enable(autoRetryActive); @@ -478,9 +482,9 @@ void GlobalSettingsDlg::updateGui() } -void GlobalSettingsDlg::OnOkay(wxCommandEvent& event) +void OptionsDlg::OnOkay(wxCommandEvent& event) { - //write global settings only when okay-button is pressed! + //write settings only when okay-button is pressed! settings.failsafeFileCopy = m_checkBoxFailSafe->GetValue(); settings.copyLockedFiles = m_checkBoxCopyLocked->GetValue(); settings.copyFilePermissions = m_checkBoxCopyPermissions->GetValue(); @@ -494,7 +498,7 @@ void GlobalSettingsDlg::OnOkay(wxCommandEvent& event) } -void GlobalSettingsDlg::OnResetDialogs(wxCommandEvent& event) +void OptionsDlg::OnResetDialogs(wxCommandEvent& event) { switch (showConfirmationDialog(this, DialogInfoType::INFO, PopupDialogCfg().setMainInstructions(_("Restore all hidden windows and warnings?")), @@ -509,7 +513,7 @@ void GlobalSettingsDlg::OnResetDialogs(wxCommandEvent& event) } -void GlobalSettingsDlg::OnDefault(wxCommandEvent& event) +void OptionsDlg::OnDefault(wxCommandEvent& event) { const xmlAccess::XmlGlobalSettings defaultCfg; @@ -526,7 +530,7 @@ void GlobalSettingsDlg::OnDefault(wxCommandEvent& event) } -void GlobalSettingsDlg::setExtApp(const xmlAccess::ExternalApps& extApp) +void OptionsDlg::setExtApp(const xmlAccess::ExternalApps& extApp) { auto extAppTmp = extApp; vector_remove_if(extAppTmp, [](decltype(extAppTmp[0])& entry) { return entry.first.empty() && entry.second.empty(); }); @@ -552,7 +556,7 @@ void GlobalSettingsDlg::setExtApp(const xmlAccess::ExternalApps& extApp) } -xmlAccess::ExternalApps GlobalSettingsDlg::getExtApp() const +xmlAccess::ExternalApps OptionsDlg::getExtApp() const { xmlAccess::ExternalApps output; for (int i = 0; i < m_gridCustomCommand->GetNumberRows(); ++i) @@ -572,7 +576,7 @@ xmlAccess::ExternalApps GlobalSettingsDlg::getExtApp() const } -void GlobalSettingsDlg::OnAddRow(wxCommandEvent& event) +void OptionsDlg::OnAddRow(wxCommandEvent& event) { #ifdef ZEN_WIN wxWindowUpdateLocker dummy(this); //leads to GUI corruption problems on Linux/OS X! @@ -586,7 +590,7 @@ void GlobalSettingsDlg::OnAddRow(wxCommandEvent& event) } -void GlobalSettingsDlg::OnRemoveRow(wxCommandEvent& event) +void OptionsDlg::OnRemoveRow(wxCommandEvent& event) { if (m_gridCustomCommand->GetNumberRows() > 0) { @@ -603,10 +607,10 @@ void GlobalSettingsDlg::OnRemoveRow(wxCommandEvent& event) } -ReturnSmallDlg::ButtonPressed zen::showGlobalSettingsDlg(wxWindow* parent, xmlAccess::XmlGlobalSettings& globalSettings) +ReturnSmallDlg::ButtonPressed zen::showOptionsDlg(wxWindow* parent, xmlAccess::XmlGlobalSettings& globalSettings) { - GlobalSettingsDlg settingsDlg(parent, globalSettings); - return static_cast<ReturnSmallDlg::ButtonPressed>(settingsDlg.ShowModal()); + OptionsDlg dlg(parent, globalSettings); + return static_cast<ReturnSmallDlg::ButtonPressed>(dlg.ShowModal()); } //######################################################################################## @@ -657,7 +661,7 @@ SelectTimespanDlg::SelectTimespanDlg(wxWindow* parent, Int64& timeFrom, Int64& t #ifdef ZEN_WIN new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this" #endif - setStandardButtonOrder(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel)); + setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel)); long style = wxCAL_SHOW_HOLIDAYS | wxCAL_SHOW_SURROUNDING_WEEKS; diff --git a/FreeFileSync/Source/ui/small_dlgs.h b/FreeFileSync/Source/ui/small_dlgs.h index 62942fd0..78e7a075 100644 --- a/FreeFileSync/Source/ui/small_dlgs.h +++ b/FreeFileSync/Source/ui/small_dlgs.h @@ -41,7 +41,7 @@ ReturnSmallDlg::ButtonPressed showSyncConfirmationDlg(wxWindow* parent, ReturnSmallDlg::ButtonPressed showCompareCfgDialog(wxWindow* parent, CompConfig& cmpConfig, const wxString& title); -ReturnSmallDlg::ButtonPressed showGlobalSettingsDlg(wxWindow* parent, xmlAccess::XmlGlobalSettings& globalSettings); +ReturnSmallDlg::ButtonPressed showOptionsDlg(wxWindow* parent, xmlAccess::XmlGlobalSettings& globalSettings); ReturnSmallDlg::ButtonPressed showSelectTimespanDlg(wxWindow* parent, Int64& timeFrom, Int64& timeTo); } diff --git a/FreeFileSync/Source/ui/sync_cfg.cpp b/FreeFileSync/Source/ui/sync_cfg.cpp index 864b6487..f6e3c41d 100644 --- a/FreeFileSync/Source/ui/sync_cfg.cpp +++ b/FreeFileSync/Source/ui/sync_cfg.cpp @@ -12,7 +12,7 @@ #include <wx+/choice_enum.h> #include <wx+/image_tools.h> #include <wx+/font_size.h> -#include <wx+/std_button_order.h> +#include <wx+/std_button_layout.h> #include <wx+/popup_dlg.h> #include <wx+/key_event.h> #include <wx+/image_resources.h> @@ -212,7 +212,7 @@ ConfigDialog::ConfigDialog(wxWindow* parent, #ifdef ZEN_WIN new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this" #endif - setStandardButtonOrder(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel)); + setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonOkay).setCancel(m_buttonCancel)); SetTitle(title); @@ -256,8 +256,8 @@ ConfigDialog::ConfigDialog(wxWindow* parent, { m_checkBoxUseLocalCmpOptions->SetValue(true); bSizerLocalCompSettings->Show(false); + m_panelCompSettingsHolder->Layout(); //fix comp panel glitch on Win 7 125% font size } - updateCompGui(); //------------- filter panel -------------------------- @@ -286,7 +286,10 @@ ConfigDialog::ConfigDialog(wxWindow* parent, assert((useAlternateCmpCfg != nullptr) == (useAlternateSyncCfg != nullptr)); if (!useAlternateCmpCfg) + { bSizerLocalFilterSettings->Show(false); + m_panelFilterSettingsHolder->Layout(); + } setFilter(filterCfg); @@ -326,6 +329,7 @@ ConfigDialog::ConfigDialog(wxWindow* parent, { m_checkBoxUseLocalSyncOptions->SetValue(true); bSizerLocalSyncSettings->Show(false); + m_panelSyncSettingsHolder->Layout(); } if (miscCfg) diff --git a/FreeFileSync/Source/ui/tray_icon.cpp b/FreeFileSync/Source/ui/tray_icon.cpp index 28842a80..71ee7e20 100644 --- a/FreeFileSync/Source/ui/tray_icon.cpp +++ b/FreeFileSync/Source/ui/tray_icon.cpp @@ -142,7 +142,7 @@ private: wxMenu* contextMenu = new wxMenu; wxMenuItem* defaultItem = new wxMenuItem(contextMenu, CONTEXT_RESTORE, _("&Restore")); - //wxWidgets font messup: + //wxWidgets font mess-up: //1. font must be set *before* wxMenu::Append()! //2. don't use defaultItem->GetFont(); making it bold creates a huge font size for some reason #ifdef ZEN_WIN //no wxMenuItem::SetFont() on Linux and OS X: wasn't wxWidgets supposed to be *portable* at some point in time????? diff --git a/FreeFileSync/Source/version/version.h b/FreeFileSync/Source/version/version.h index d47231cb..56b98209 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.5"; //internal linkage! +const wchar_t currentVersion[] = L"6.6"; //internal linkage! } #endif diff --git a/wx+/bitmap_button.h b/wx+/bitmap_button.h index 4e5adb87..3255ffce 100644 --- a/wx+/bitmap_button.h +++ b/wx+/bitmap_button.h @@ -60,9 +60,9 @@ void setBitmapTextLabel(wxBitmapButton& btn, const wxImage& img, const wxString& } //SetMinSize() instead of SetSize() is needed here for wxWindows layout determination to work corretly - wxSize minSize = btn.GetMinSize(); - btn.SetMinSize(wxSize(std::max(dynImage.GetWidth () + 2 * border, minSize.GetWidth()), - std::max(dynImage.GetHeight() + 2 * border, minSize.GetHeight()))); + const int defaultHeight = wxButton::GetDefaultSize().GetHeight(); + btn.SetMinSize(wxSize(dynImage.GetWidth () + 2 * border, + std::max(dynImage.GetHeight() + 2 * border, defaultHeight))); btn.SetBitmapLabel(wxBitmap(dynImage)); //SetLabel() calls confuse wxBitmapButton in the disabled state and it won't show the image! workaround: diff --git a/wx+/key_event.h b/wx+/key_event.h index cd75bb78..aa094b4a 100644 --- a/wx+/key_event.h +++ b/wx+/key_event.h @@ -15,8 +15,8 @@ namespace zen { -//wxWidgets provides no elegant way to register shortcut keys scoped for dialog windows => -//enable dialog-specific local key events! +//wxWidgets provides no elegant way to register shortcut keys scoped for dialog windows +// => enable dialog-specific local key events! //setup in wxDialog-derived class' constructor, e.g.: // setupLocalKeyEvents(*this, [this](wxKeyEvent& event){ this->onLocalKeyEvent(event); }); @@ -31,7 +31,7 @@ void setupLocalKeyEvents(wxWindow& wnd, const std::function<void(wxKeyEvent& eve -//pretty much the same like "bool wxWindowBase::IsDescendant(wxWindowBase* child) const" but without the obvious misnaming +//pretty much the same like "bool wxWindowBase::IsDescendant(wxWindowBase* child) const" but without the obvious misnomer inline bool isComponentOf(const wxWindow* child, const wxWindow* top) { diff --git a/wx+/popup_dlg.cpp b/wx+/popup_dlg.cpp index 66b3117e..dff6bdb0 100644 --- a/wx+/popup_dlg.cpp +++ b/wx+/popup_dlg.cpp @@ -6,7 +6,7 @@ #include "popup_dlg.h" #include <wx/app.h> -#include <wx+/std_button_order.h> +#include <wx+/std_button_layout.h> #include <wx+/font_size.h> #include <wx+/image_resources.h> #include "popup_dlg_generated.h" @@ -194,7 +194,7 @@ public: m_buttonCancel->Hide(); //set std order after button visibility was set - setStandardButtonOrder(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonAffirmative)); + setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonAffirmative)); setAsStandard(*m_buttonAffirmative); GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize() } @@ -212,7 +212,7 @@ public: m_buttonNegative->Hide(); //set std order after button visibility was set - setStandardButtonOrder(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonAffirmative).setCancel(m_buttonCancel)); + setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonAffirmative).setCancel(m_buttonCancel)); setAsStandard(*m_buttonAffirmative); GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize() } @@ -237,7 +237,7 @@ public: updateGui(); //set std order after button visibility was set - setStandardButtonOrder(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonAffirmative).setNegative(m_buttonNegative).setCancel(m_buttonCancel)); + setStandardButtonLayout(*bSizerStdButtons, StdButtons().setAffirmative(m_buttonAffirmative).setNegative(m_buttonNegative).setCancel(m_buttonCancel)); setAsStandard(*m_buttonAffirmative); GetSizer()->SetSizeHints(this); //~=Fit() + SetMinSize() } diff --git a/wx+/popup_dlg_generated.cpp b/wx+/popup_dlg_generated.cpp index bb804026..31eed451 100644 --- a/wx+/popup_dlg_generated.cpp +++ b/wx+/popup_dlg_generated.cpp @@ -11,79 +11,79 @@ PopupDialogGenerated::PopupDialogGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) { - this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize ); - this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); - - wxBoxSizer* bSizer24; - bSizer24 = new wxBoxSizer( wxVERTICAL ); - - m_panel33 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_panel33->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); - - wxBoxSizer* bSizer165; - bSizer165 = new wxBoxSizer( wxHORIZONTAL ); - - m_bitmapMsgType = new wxStaticBitmap( m_panel33, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 ); - bSizer165->Add( m_bitmapMsgType, 0, wxALL, 10 ); - - wxBoxSizer* bSizer16; - bSizer16 = new wxBoxSizer( wxVERTICAL ); - - m_staticTextMain = new wxStaticText( m_panel33, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextMain->Wrap( -1 ); - bSizer16->Add( m_staticTextMain, 0, wxTOP|wxBOTTOM|wxRIGHT, 15 ); - - m_textCtrlTextDetail = new wxTextCtrl( m_panel33, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER ); - bSizer16->Add( m_textCtrlTextDetail, 1, wxEXPAND, 5 ); - - - bSizer165->Add( bSizer16, 1, wxEXPAND, 5 ); - - - m_panel33->SetSizer( bSizer165 ); - m_panel33->Layout(); - bSizer165->Fit( m_panel33 ); - bSizer24->Add( m_panel33, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); - - m_staticline6 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizer24->Add( m_staticline6, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 ); - - wxBoxSizer* bSizer25; - bSizer25 = new wxBoxSizer( wxVERTICAL ); - - m_checkBoxCustom = new wxCheckBox( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer25->Add( m_checkBoxCustom, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 ); - - bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL ); - - m_buttonAffirmative = new wxButton( this, wxID_YES, _("dummy"), wxDefaultPosition, wxSize( -1,30 ), 0 ); - bSizerStdButtons->Add( m_buttonAffirmative, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - m_buttonNegative = new wxButton( this, wxID_NO, _("dummy"), wxDefaultPosition, wxSize( -1,30 ), 0 ); - bSizerStdButtons->Add( m_buttonNegative, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - - m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 ); - bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - - - bSizer25->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 ); - - - bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); - - - this->SetSizer( bSizer24 ); - this->Layout(); - bSizer24->Fit( this ); - - this->Centre( wxBOTH ); - - // Connect Events - this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( PopupDialogGenerated::OnClose ) ); - m_checkBoxCustom->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PopupDialogGenerated::OnCheckBoxClick ), NULL, this ); - m_buttonAffirmative->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::OnButtonAffirmative ), NULL, this ); - m_buttonNegative->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::OnButtonNegative ), NULL, this ); - m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::OnCancel ), NULL, this ); + this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize ); + this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); + + wxBoxSizer* bSizer24; + bSizer24 = new wxBoxSizer( wxVERTICAL ); + + m_panel33 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_panel33->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); + + wxBoxSizer* bSizer165; + bSizer165 = new wxBoxSizer( wxHORIZONTAL ); + + m_bitmapMsgType = new wxStaticBitmap( m_panel33, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 ); + bSizer165->Add( m_bitmapMsgType, 0, wxALL, 10 ); + + wxBoxSizer* bSizer16; + bSizer16 = new wxBoxSizer( wxVERTICAL ); + + m_staticTextMain = new wxStaticText( m_panel33, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextMain->Wrap( -1 ); + bSizer16->Add( m_staticTextMain, 0, wxTOP|wxBOTTOM|wxRIGHT, 15 ); + + m_textCtrlTextDetail = new wxTextCtrl( m_panel33, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER ); + bSizer16->Add( m_textCtrlTextDetail, 1, wxEXPAND, 5 ); + + + bSizer165->Add( bSizer16, 1, wxEXPAND, 5 ); + + + m_panel33->SetSizer( bSizer165 ); + m_panel33->Layout(); + bSizer165->Fit( m_panel33 ); + bSizer24->Add( m_panel33, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + + m_staticline6 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + bSizer24->Add( m_staticline6, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 ); + + wxBoxSizer* bSizer25; + bSizer25 = new wxBoxSizer( wxVERTICAL ); + + m_checkBoxCustom = new wxCheckBox( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer25->Add( m_checkBoxCustom, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + + bSizerStdButtons = new wxBoxSizer( wxHORIZONTAL ); + + m_buttonAffirmative = new wxButton( this, wxID_YES, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); + bSizerStdButtons->Add( m_buttonAffirmative, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + m_buttonNegative = new wxButton( this, wxID_NO, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); + bSizerStdButtons->Add( m_buttonNegative, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + + m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); + bSizerStdButtons->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + + + bSizer25->Add( bSizerStdButtons, 0, wxALIGN_RIGHT, 5 ); + + + bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); + + + this->SetSizer( bSizer24 ); + this->Layout(); + bSizer24->Fit( this ); + + this->Centre( wxBOTH ); + + // Connect Events + this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( PopupDialogGenerated::OnClose ) ); + m_checkBoxCustom->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PopupDialogGenerated::OnCheckBoxClick ), NULL, this ); + m_buttonAffirmative->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::OnButtonAffirmative ), NULL, this ); + m_buttonNegative->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::OnButtonNegative ), NULL, this ); + m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PopupDialogGenerated::OnCancel ), NULL, this ); } PopupDialogGenerated::~PopupDialogGenerated() diff --git a/wx+/popup_dlg_generated.h b/wx+/popup_dlg_generated.h index 0afd1f55..cc5a2ad7 100644 --- a/wx+/popup_dlg_generated.h +++ b/wx+/popup_dlg_generated.h @@ -37,35 +37,35 @@ /////////////////////////////////////////////////////////////////////////////// /// Class PopupDialogGenerated /////////////////////////////////////////////////////////////////////////////// -class PopupDialogGenerated : public wxDialog +class PopupDialogGenerated : public wxDialog { -private: - -protected: - wxPanel* m_panel33; - wxStaticBitmap* m_bitmapMsgType; - wxStaticText* m_staticTextMain; - wxTextCtrl* m_textCtrlTextDetail; - wxStaticLine* m_staticline6; - wxCheckBox* m_checkBoxCustom; - wxBoxSizer* bSizerStdButtons; - wxButton* m_buttonAffirmative; - wxButton* m_buttonNegative; - wxButton* m_buttonCancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } - virtual void OnCheckBoxClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnButtonAffirmative( wxCommandEvent& event ) { event.Skip(); } - virtual void OnButtonNegative( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); } - - -public: - - PopupDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~PopupDialogGenerated(); - + private: + + protected: + wxPanel* m_panel33; + wxStaticBitmap* m_bitmapMsgType; + wxStaticText* m_staticTextMain; + wxTextCtrl* m_textCtrlTextDetail; + wxStaticLine* m_staticline6; + wxCheckBox* m_checkBoxCustom; + wxBoxSizer* bSizerStdButtons; + wxButton* m_buttonAffirmative; + wxButton* m_buttonNegative; + wxButton* m_buttonCancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } + virtual void OnCheckBoxClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnButtonAffirmative( wxCommandEvent& event ) { event.Skip(); } + virtual void OnButtonNegative( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); } + + + public: + + PopupDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~PopupDialogGenerated(); + }; #endif //__POPUP_DLG_GENERATED_H__ diff --git a/wx+/std_button_order.h b/wx+/std_button_layout.h index 71fc2334..b7b1af3a 100644 --- a/wx+/std_button_order.h +++ b/wx+/std_button_layout.h @@ -7,6 +7,7 @@ #ifndef STD_BUTTON_ORDER_H_18347032147831732143214 #define STD_BUTTON_ORDER_H_18347032147831732143214 +#include <algorithm> #include <wx/sizer.h> #include <wx/button.h> @@ -24,7 +25,7 @@ struct StdButtons wxButton* btnCancel; }; -void setStandardButtonOrder(wxBoxSizer& sizer, const StdButtons& buttons = StdButtons()); +void setStandardButtonLayout(wxBoxSizer& sizer, const StdButtons& buttons = StdButtons()); //sizer width will change! => call wxWindow::Fit and wxWindow::Layout @@ -39,7 +40,7 @@ void setStandardButtonOrder(wxBoxSizer& sizer, const StdButtons& buttons = StdBu //--------------- impelementation ------------------------------------------- inline -void setStandardButtonOrder(wxBoxSizer& sizer, const StdButtons& buttons) +void setStandardButtonLayout(wxBoxSizer& sizer, const StdButtons& buttons) { assert(sizer.GetOrientation() == wxHORIZONTAL); @@ -79,21 +80,26 @@ void setStandardButtonOrder(wxBoxSizer& sizer, const StdButtons& buttons) #elif defined ZEN_MAC //OS X Human Interface Guidelines: http://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/Windows/Windows.html const int spaceH = 14; //OK - const int spaceRimH = 20; //OK - const int spaceRimV = 11; //compromise; custom button height (of 30 pix) is considered, although the button is drawn smaller; otherwise 15 seems to have been optimal + const int spaceRimH = 24; //OK + const int spaceRimV = 14; //OK #endif - bool firstButtonSet = false; + bool settingFirstButton = true; auto attach = [&](wxButton* btn) { if (btn) { - if (firstButtonSet) - sizer.Add(spaceH, 0); + assert(btn->GetMinSize().GetHeight() == -1); //let OS or this routine do the sizing! note: OS X does not allow changing the (visible!) button height! +#if defined ZEN_WIN || defined ZEN_LINUX + const int defaultHeight = wxButton::GetDefaultSize().GetHeight(); //buffered by wxWidgets + btn->SetMinSize(wxSize(-1, std::max(defaultHeight, 30))); //default button height is much too small => increase! +#endif + + if (settingFirstButton) + settingFirstButton = false; else - firstButtonSet = true; + sizer.Add(spaceH, 0); sizer.Add(btn, 0, wxTOP | wxBOTTOM | wxALIGN_CENTER_VERTICAL, spaceRimV); - assert(btn->GetSize().GetHeight() == 30); //see comment for OS X above } }; @@ -126,7 +132,7 @@ void setStandardButtonOrder(wxBoxSizer& sizer, const StdButtons& buttons) if (buttonsTmp.btnNo) { attach(buttonsTmp.btnNo); - sizer.Add(42 - spaceH, 0); //OS X Human Interface Guidelines: "position it at least 24 pixels away from the safe buttons" -> however 42 is used in practice! + sizer.Add(83 - spaceH, 0); //OS X Human Interface Guidelines: "position it at least 24 pixels away from the safe buttons" -> however 83 is used in practice! } attach(buttonsTmp.btnCancel); attach(buttonsTmp.btnYes); diff --git a/zen/file_handling.cpp b/zen/file_handling.cpp index 0b544ed5..cf92f346 100644 --- a/zen/file_handling.cpp +++ b/zen/file_handling.cpp @@ -928,7 +928,7 @@ namespace void copySecurityContext(const Zstring& source, const Zstring& target, ProcSymlink procSl) //throw FileError { security_context_t contextSource = nullptr; - const int rv = procSl == SYMLINK_FOLLOW ? + const int rv = procSl == ProcSymlink::FOLLOW ? ::getfilecon(source.c_str(), &contextSource) : ::lgetfilecon(source.c_str(), &contextSource); if (rv < 0) @@ -943,7 +943,7 @@ void copySecurityContext(const Zstring& source, const Zstring& target, ProcSymli { security_context_t contextTarget = nullptr; - const int rv2 = procSl == SYMLINK_FOLLOW ? + const int rv2 = procSl == ProcSymlink::FOLLOW ? ::getfilecon(target.c_str(), &contextTarget) : ::lgetfilecon(target.c_str(), &contextTarget); if (rv2 < 0) @@ -961,7 +961,7 @@ void copySecurityContext(const Zstring& source, const Zstring& target, ProcSymli } } - const int rv3 = procSl == SYMLINK_FOLLOW ? + const int rv3 = procSl == ProcSymlink::FOLLOW ? ::setfilecon(target.c_str(), contextSource) : ::lsetfilecon(target.c_str(), contextSource); if (rv3 < 0) diff --git a/zen/win_ver.h b/zen/win_ver.h index 8797b596..766c0ee9 100644 --- a/zen/win_ver.h +++ b/zen/win_ver.h @@ -54,7 +54,7 @@ inline std::uint64_t getOsVersion() { OSVERSIONINFO osvi = {}; - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + osvi.dwOSVersionInfoSize = sizeof(osvi); if (!::GetVersionEx(&osvi)) //38 ns per call! (yes, that's nano!) -> we do NOT miss C++11 thread safe statics right now... return 0; return toBigOsNumber(osvi.dwMajorVersion, osvi.dwMinorVersion); |