From 7e706cf64654aea466c059c307e5723e2423ed5d Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:20:50 +0200 Subject: 5.6 --- Application.cpp | 71 +- Application.h | 16 +- BUILD/Changelog.txt | 17 + BUILD/FreeFileSync.chm | Bin 667844 -> 667830 bytes BUILD/Help/html/Comparison Settings.html | 10 +- BUILD/Languages/dutch.lng | 204 ++--- BUILD/Languages/french.lng | 2 +- BUILD/Languages/german.lng | 48 +- BUILD/Languages/norwegian.lng | 195 ++-- BUILD/Languages/portuguese.lng | 75 +- BUILD/Languages/portuguese_br.lng | 18 +- BUILD/Languages/scottish_gaelic.lng | 1450 ++++++++++++++++++++++++++++++ BUILD/Languages/slovenian.lng | 18 +- BUILD/Languages/ukrainian.lng | 2 +- BUILD/Resources.zip | Bin 263865 -> 264614 bytes FreeFileSync.cbp | 13 +- FreeFileSync.vcxproj | 1 + Makefile | 3 +- RealtimeSync/application.cpp | 17 +- RealtimeSync/main_dlg.cpp | 2 +- RealtimeSync/resources.h | 6 +- algorithm.cpp | 248 +++-- algorithm.h | 7 +- comparison.cpp | 78 +- file_hierarchy.cpp | 7 +- file_hierarchy.h | 298 ++---- lib/binary.cpp | 8 +- lib/db_file.cpp | 226 +---- lib/dir_lock.cpp | 9 +- lib/error_log.h | 43 + lib/generate_logfile.h | 15 +- lib/hard_filter.h | 4 +- lib/localization.cpp | 22 +- lib/perf_check.cpp | 4 +- lib/process_xml.cpp | 104 ++- lib/process_xml.h | 2 + process_callback.h | 4 +- structures.cpp | 2 +- structures.h | 4 +- synchronization.cpp | 214 +++-- synchronization.h | 4 +- ui/batch_config.cpp | 4 +- ui/batch_status_handler.cpp | 10 +- ui/column_attr.h | 57 +- ui/custom_grid.cpp | 448 +++++---- ui/custom_grid.h | 15 +- ui/grid_view.cpp | 2 +- ui/gui_generated.cpp | 40 +- ui/gui_generated.h | 6 +- ui/gui_status_handler.cpp | 49 +- ui/main_dlg.cpp | 925 ++++++++++--------- ui/main_dlg.h | 50 +- ui/search.cpp | 56 +- ui/search.h | 4 +- ui/tree_view.cpp | 10 +- ui/tree_view.h | 2 +- ui/triple_splitter.cpp | 230 +++++ ui/triple_splitter.h | 87 ++ version/version.h | 2 +- version/version.rc | 4 +- wx+/file_drop.h | 3 +- wx+/graph.cpp | 10 +- wx+/graph.h | 11 +- wx+/grid.cpp | 553 +++++++----- wx+/grid.h | 100 ++- wx+/image_tools.h | 50 +- wx+/serialize.h | 538 ----------- wx+/zlib_wrap.cpp | 2 +- wx+/zlib_wrap.h | 2 +- zen/FindFilePlus/find_file_plus.cpp | 21 +- zen/FindFilePlus/find_file_plus.h | 1 + zen/IFileOperation/file_op.cpp | 2 +- zen/assert_static.h | 2 +- zen/basic_math.h | 2 +- zen/debug_log.h | 2 +- zen/debug_new.h | 9 +- zen/dir_watcher.cpp | 2 +- zen/file_handling.cpp | 38 +- zen/file_handling.h | 2 +- zen/file_io.cpp | 71 +- zen/file_traverser.cpp | 45 +- zen/fixed_list.h | 2 +- zen/recycler.h | 2 +- zen/serialize.h | 244 +++++ zen/string_base.h | 2 +- zen/string_tools.h | 19 +- zen/symlink_target.h | 64 +- 87 files changed, 4593 insertions(+), 2678 deletions(-) create mode 100644 BUILD/Languages/scottish_gaelic.lng create mode 100644 lib/error_log.h create mode 100644 ui/triple_splitter.cpp create mode 100644 ui/triple_splitter.h delete mode 100644 wx+/serialize.h create mode 100644 zen/serialize.h diff --git a/Application.cpp b/Application.cpp index 6f16f004..26cd3b03 100644 --- a/Application.cpp +++ b/Application.cpp @@ -11,9 +11,6 @@ #include #include //wxWidgets v2.9 #include -#include -#include -#include #include #include "comparison.h" #include "algorithm.h" @@ -24,6 +21,8 @@ #include "lib/resources.h" #include "lib/ffs_paths.h" #include "lib/lock_holder.h" +#include "lib/process_xml.h" +#include "lib/error_log.h" #ifdef FFS_LINUX #include @@ -32,8 +31,13 @@ using namespace zen; using namespace xmlAccess; + IMPLEMENT_APP(Application) +void runGuiMode(const xmlAccess::XmlGuiConfig& guiCfg, const XmlGlobalSettings& settings); +void runGuiMode(const std::vector& cfgFileName, const XmlGlobalSettings& settings); +void runBatchMode(const Zstring& filename, XmlGlobalSettings& globSettings, FfsReturnCode& returnCode); + #ifdef FFS_WIN namespace @@ -156,11 +160,16 @@ void Application::OnStartApplication(wxIdleEvent&) wxToolTip::SetAutoPop(7000); //tooltip visibilty in ms, 5s seems to be default for Windows #endif + xmlAccess::XmlGlobalSettings globalSettings; //settings used by GUI, batch mode or both + setLanguage(globalSettings.programLanguage); //set default language tentatively + try //load global settings from XML: they are written on exit, so read them FIRST { if (fileExists(toZ(getGlobalConfigFile()))) - readConfig(globalSettings); + readConfig(globalSettings); //throw FfsXmlError //else: globalSettings already has default values + + setLanguage(globalSettings.programLanguage); } catch (const xmlAccess::FfsXmlError& error) { @@ -171,9 +180,6 @@ void Application::OnStartApplication(wxIdleEvent&) wxMessageBox(error.toString(), _("Error"), wxOK | wxICON_ERROR); } - //set program language - setLanguage(globalSettings.programLanguage); - //determine FFS mode of operation std::vector commandArgs = getCommandlineArgs(*this); @@ -232,7 +238,7 @@ void Application::OnStartApplication(wxIdleEvent&) { case MERGE_BATCH: //pure batch config files if (commandArgs.size() == 1) - runBatchMode(utfCvrtTo(commandArgs[0]), globalSettings); + runBatchMode(utfCvrtTo(commandArgs[0]), globalSettings, returnCode); else runGuiMode(commandArgs, globalSettings); break; @@ -278,12 +284,7 @@ int Application::OnRun() auto processException = [](const std::wstring& msg) { //it's not always possible to display a message box, e.g. corrupted stack, however low-level file output works! - try - { - saveBinStream(getConfigDir() + Zstr("LastError.txt"), utfCvrtTo(msg)); //throw FileError - } - catch (const FileError&) {} - + logError(utfCvrtTo(msg)); wxSafeShowMessage(_("An exception occurred!") + L" - FFS", msg); }; @@ -306,25 +307,6 @@ int Application::OnRun() } -int Application::OnExit() -{ - //get program language - globalSettings.programLanguage = getLanguage(); - - try //save global settings to XML - { - xmlAccess::writeConfig(globalSettings); - } - catch (const xmlAccess::FfsXmlError&) - { - //wxMessageBox(error.msg(), _("Error"), wxOK | wxICON_ERROR); -> not that important/might be tedious in silent batch? - assert(false); //get info in debug build - } - - return 0; -} - - void Application::OnQueryEndSession(wxEvent& event) { //alas wxWidgets screws up once again: http://trac.wxwidgets.org/ticket/3069 @@ -336,21 +318,21 @@ void Application::OnQueryEndSession(wxEvent& event) } -void Application::runGuiMode(const xmlAccess::XmlGuiConfig& guiCfg, xmlAccess::XmlGlobalSettings& settings) +void runGuiMode(const xmlAccess::XmlGuiConfig& guiCfg, const XmlGlobalSettings& settings) { MainDialog* frame = new MainDialog(std::vector(), guiCfg, settings, true); frame->Show(); } -void Application::runGuiMode(const std::vector& cfgFileNames, xmlAccess::XmlGlobalSettings& settings) +void runGuiMode(const std::vector& cfgFileNames, const XmlGlobalSettings& settings) { MainDialog* frame = new MainDialog(cfgFileNames, settings); frame->Show(); } -void Application::runBatchMode(const Zstring& filename, xmlAccess::XmlGlobalSettings& globSettings) +void runBatchMode(const Zstring& filename, XmlGlobalSettings& globSettings, FfsReturnCode& returnCode) { //load XML settings XmlBatchConfig batchCfg; //structure to receive gui settings @@ -358,9 +340,9 @@ void Application::runBatchMode(const Zstring& filename, xmlAccess::XmlGlobalSett { readConfig(filename, batchCfg); } - catch (const xmlAccess::FfsXmlError& error) + catch (const xmlAccess::FfsXmlError& e) { - wxMessageBox(error.toString(), _("Error"), wxOK | wxICON_ERROR); //batch mode: break on errors AND even warnings! + wxMessageBox(e.toString(), _("Error"), wxOK | wxICON_ERROR); //batch mode: break on errors AND even warnings! return; } //all settings have been read successfully... @@ -449,4 +431,17 @@ void Application::runBatchMode(const Zstring& filename, xmlAccess::XmlGlobalSett } } catch (BatchAbortProcess&) {} //exit used by statusHandler + + + try //save global settings to XML: e.g. ignored warnings + { + xmlAccess::writeConfig(globSettings); //FfsXmlError + } + catch (const xmlAccess::FfsXmlError& e) + { + if (batchCfg.handleError == ON_ERROR_POPUP) + wxMessageBox(e.toString(), _("Error"), wxOK | wxICON_ERROR); //batch mode: break on errors AND even warnings! + else + logError(utfCvrtTo(e.toString())); + } } diff --git a/Application.h b/Application.h index 0d247796..de5a7cf7 100644 --- a/Application.h +++ b/Application.h @@ -14,21 +14,15 @@ class Application : public wxApp { -public: - bool OnInit(); - int OnRun(); - int OnExit(); - bool OnExceptionInMainLoop(); +private: + virtual bool OnInit(); + virtual int OnRun(); + virtual int OnExit() { return 0; } + virtual bool OnExceptionInMainLoop(); void OnStartApplication(wxIdleEvent& event); void OnQueryEndSession(wxEvent& event); -private: - void runGuiMode(const xmlAccess::XmlGuiConfig& guiCfg, xmlAccess::XmlGlobalSettings& settings); - void runGuiMode(const std::vector& cfgFileName, xmlAccess::XmlGlobalSettings& settings); - void runBatchMode(const Zstring& filename, xmlAccess::XmlGlobalSettings& globSettings); - - xmlAccess::XmlGlobalSettings globalSettings; //settings used by GUI, batch mode or both zen::FfsReturnCode returnCode; }; diff --git a/BUILD/Changelog.txt b/BUILD/Changelog.txt index 122f17fa..b64c9933 100644 --- a/BUILD/Changelog.txt +++ b/BUILD/Changelog.txt @@ -2,6 +2,23 @@ |FreeFileSync| -------------- +Changelog v5.6 +-------------- +Resize left and right grids equally +Allow to move middle grid position via mouse +Automatically resize file name columns +Do not follow reparse points other than symlinks and mount points +Warn if Recycle Bin is not available during manual deletion +Fixed error when saving logfile into volume root directory +Show files which differ in attributes only in the same category as "equal" files +Apply hidden attribute to lock file +Fixed potential "access denied" problem when updating the database file +Show errors when saving configuration files during exit (ignore for batch mode) +Mark begin of comparison phase in the log file +More detailed tooltip describing items that differ in attributes only +Added Scottish Gaelic translation + + Changelog v5.5 -------------- New database format for variant: old database files are converted automatically diff --git a/BUILD/FreeFileSync.chm b/BUILD/FreeFileSync.chm index 94ea4923..97363d82 100644 Binary files a/BUILD/FreeFileSync.chm and b/BUILD/FreeFileSync.chm differ diff --git a/BUILD/Help/html/Comparison Settings.html b/BUILD/Help/html/Comparison Settings.html index 55b49830..7cf2207d 100644 --- a/BUILD/Help/html/Comparison Settings.html +++ b/BUILD/Help/html/Comparison Settings.html @@ -5,7 +5,7 @@ - + @@ -149,10 +149,10 @@ called symlinks or soft links):

    Note

    -

  • In - Windows the symbolic link options apply to "Reparse - Points". Reparse Points are a more general concept - including symbolic links, junctions and mount points.

    +

  • Under + Windows the symbolic link options apply to all symbolic links, + "volume mount points" and "NTFS junction + points".

  • Copying symbolic links requires administrator rights.

    diff --git a/BUILD/Languages/dutch.lng b/BUILD/Languages/dutch.lng index 7c79112d..cc79add7 100644 --- a/BUILD/Languages/dutch.lng +++ b/BUILD/Languages/dutch.lng @@ -1,6 +1,6 @@
    Nederlands - Edwin Dierssen + Edwin Dierssen && Jochem Sparla nl_NL holland.png 2 @@ -10,8 +10,20 @@ Searching for folder %x... Bezig met zoeken naar map %x... +Batch execution +Taak uitvoeren + +Items processed: +Onderdelen verwerkt: + +Items remaining: +Onderdelen te gaan: + +Total time: +Totale tijd: + Show in Explorer -Toon in de verkenner +Toon in Verkenner Open with default application Open met standaardapplicatie @@ -29,10 +41,10 @@ Fout Select alternate comparison settings -Selecteer alternatieve vergelijkings instellingen +Selecteer alternatieve vergelijkingsinstellingen Select alternate synchronization settings -Selecteer alternatieve synchronisatie instellingen +Selecteer alternatieve synchronisatieinstellingen Filter is active Filter is actief @@ -44,16 +56,16 @@ Verwijder alternatieve instellingen Clear filter settings -Verwijder filter instellingen +Verwijder filterinstellingen Create a batch job Creëer een taaklijst Synchronization settings -Synchronisatie instellingen +Synchronisatieinstellingen Comparison settings -Vergelijk instellingen +Vergelijksinstellingen About Informatie @@ -62,7 +74,7 @@ Bevestig Configure filter -Filter configuratie +Filterconfiguratie Global settings Algemene instellingen @@ -107,13 +119,13 @@ Waarschuwing Fatal Error -Fatale fout +Kritieke fout Windows Error Code %x: -Windows Fout Code %x: +Windows Foutcode %x: Linux Error Code %x: -Linux Fout Code %x: +Linux Foutcode %x: Cannot resolve symbolic link %x. Kan snelkoppeling %x niet vinden. @@ -137,16 +149,16 @@ Database file %x is incompatible. -Database bestand %x is niet compatibel. +Databasebestand %x is niet compatibel. Initial synchronization: -Initiële synchronisatie: +Initiële synchronisatie: Database file %x does not yet exist. -Database bestand %x bestaat nog niet. +Databasebestand %x bestaat nog niet. Database file is corrupt: - +Databasebestand is corrupt: Out of memory! Onvoldoende geheugen! @@ -158,7 +170,7 @@ Kan bestand %x niet vinden. Database files do not share a common session. -Database bestanden delen geen gezamelijke sessie. +Databasebestanden delen geen gezamelijke sessie. An exception occurred! Er heeft een uitzondering plaatsgevonden! @@ -170,7 +182,7 @@ Kan geen procesinformatie verkrijgen. Waiting while directory is locked (%x)... -Wacht totdat map is vergrendeld (%x)... +Wachten totdat map is vergrendeld (%x)... Cannot set directory lock %x. Kan directory %x niet sluiten. @@ -191,7 +203,7 @@ Doorzoekt: Encoding extended time information: %x -Coderen uitgebreide tijd informatie: %x +Coderen uitgebreide tijdinformatie: %x [1 Thread] @@ -212,7 +224,7 @@ Bestand %x bevat geen valide configuratie. Configuration file %x loaded partially only. -Configuratie bestand %x alleen deels geladen. +Configuratiebestand %x alleen deels geladen. Cannot access Volume Shadow Copy Service. Kan de Volume Schaduwkopie Service niet benaderen. @@ -236,7 +248,7 @@ &Open... Save &As... - +Ops&laan als... &Quit &Afsluiten @@ -248,7 +260,7 @@ &Inhoud &About -&Over +O&ver &Help &Help @@ -295,7 +307,7 @@ The command is triggered if: - new folders arrive (e.g. USB stick insert) -De opdracht word geactiveerd als>: +De opdracht word geactiveerd als: - bestanden of subfolders veranderen - nieuwe folders worden gevonden (bijvoorbeeld bij invoeging van USB stick) @@ -313,7 +325,7 @@ De opdracht word geactiveerd als>: (Build: %x) All files - +Alle bestanden &Restore &Herstellen @@ -322,19 +334,19 @@ De opdracht word geactiveerd als>: &Afsluiten Monitoring active... -Observeren actief... +Controle actief... Waiting for missing directories... -Wacht op missende mappen... +Wacht op ontbrekende mappen... A folder input field is empty. - +Een map invoerveld is leeg. Logging Loggen File time and size -Bestands tijd-en grootte +Bestandstijd- en grootte File content Bestandsinhoud @@ -352,22 +364,7 @@ De opdracht word geactiveerd als>: Aangepast FreeFileSync batch - - -Batch execution -Taak uitvoeren - -Items processed: -Onderdelen verwerkt: - -Items remaining: -Onderdelen te gaan: - -Total time: -Totale tijd: - -Stop -Stop +FreeFileSync taak Synchronization aborted! Synchronisatie afgebroken! @@ -376,7 +373,7 @@ De opdracht word geactiveerd als>: Synchronisatie is met fouten afgerond! Nothing to synchronize! -Niks om te synchroniseren! +Niets om te synchroniseren! Synchronization completed successfully! Synchronisatie succesvol afgerond! @@ -388,10 +385,10 @@ De opdracht word geactiveerd als>: Bezig met omschakelen naar het FreeFileSync hoofdscherm. Unable to connect to sourceforge.net! -Niet in staat verbinding te maken met sourceforge.net! +Kan geen verbinding maken met sourceforge.net! A new version of FreeFileSync is available: - +Er is een nieuwe versie van FreeFileSync beschikbaar: Download now? Nu downloaden? @@ -412,7 +409,7 @@ De opdracht word geactiveerd als>: -Map + Full path Volledig pad @@ -436,10 +433,10 @@ De opdracht word geactiveerd als>: Extensie Size: - +Grootte: Date: - +Datum: Action Actie @@ -475,7 +472,7 @@ De opdracht word geactiveerd als>: &Nieuw &Save - +O&pslaan &Language &Taal @@ -544,7 +541,7 @@ De opdracht word geactiveerd als>: Aantal bestanden en mappen die verwijderd zullen worden Total bytes to copy - +Aantal bytes om te kopiëren Items found: Onderdelen gevonden: @@ -553,16 +550,16 @@ De opdracht word geactiveerd als>: Snelheid: Time remaining: - +Resterende tijd: Time elapsed: - +Verstreken tijd: Batch job Taaklijst Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe .ffs_batch -Maak een batch bestand om synchronisatie te automatiseren. Dubbelklik op dit bestand of plan dit in de systeem taakplanner: FreeFileSync.exe .ffs_batch +Maak een taakbestand om synchronisatie te automatiseren. Dubbelklik op dit bestand of plan dit in de systeem taakplanner: FreeFileSync.exe .ffs_batch Help Help @@ -589,10 +586,10 @@ De opdracht word geactiveerd als>: Maximale aantal van logbestanden: Select folder to save log files: -Selecteer de map voor het bewaren van log bestanden: +Selecteer de map voor het bewaren van logbestanden: Batch settings -Batch instellingen +Batchinstellingen Select variant: Selecteer een variant: @@ -601,7 +598,7 @@ De opdracht word geactiveerd als>: Identificeer en verspreid veranderingen aan beide kanten met behulp van een database. Verwijderingen, hernoemingen en conflicten worden automatisch gedetecteerd. Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization. -Spiegel backup van linker map. Rechter map is bewerkt om na synchronisatie een exacte kopie te zijn van de linker map. +Spiegel backup van linker map. Rechter map is na synchronisatie een exacte kopie van de linker map. Copy new or updated files to right folder. Kopiëer nieuwe of geupdate bestanden naar de rechter map. @@ -613,7 +610,7 @@ De opdracht word geactiveerd als>: Verwijder-afhandeling On completion: -Bij voltooiing +Bij voltooiing: Configuration Configuratie @@ -649,7 +646,7 @@ Files are found equal if are the same -Bestanden worden als gelijk bevonden indien, +Bestanden worden als gelijk bevonden indien - de laatste schrijf tijd en datum - de bestandsgrootte gelijk zijn @@ -661,7 +658,7 @@ Files are found equal if is the same -Bestanden worden als gelijk beschouwd indien, +Bestanden worden als gelijk beschouwd indien - de bestandsinhoud overeenkomt @@ -745,7 +742,7 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Fail-safe bestandskopie Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error. -Schrijf eerst naar een tijdelijk bestand (*.ffs_tmp) en hernoem dan. Dit garandeert een consistente toestand, zelfs in het geval van een fatale fout. +Schrijf eerst naar een tijdelijk bestand (*.ffs_tmp) en hernoem daarna. Dit garandeert een consistente toestand, zelfs in het geval van een fatale fout. Copy locked files Kopiëer vergrendelde bestanden @@ -757,7 +754,7 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Kopiëer toegangsrechten van bestand. Transfer file and folder permissions (Requires Administrator rights) -Overdragen van bestands en maps permissies (Administrator rechten nodig) +Overdragen van bestands- en mappermissies (Administrator rechten nodig) Restore hidden dialogs Herstel verborgen dialogen @@ -805,7 +802,7 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Stel richting in: Exclude temporarily -Sluit tijdelijk uit +Tijdelijk uitsluiten Include temporarily Tijdelijk opnemen @@ -820,7 +817,7 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Verwijderen Include all -Alles insluiten +Alles opnemen Exclude all Alles uitsluiten @@ -853,16 +850,16 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Configuratie opgeslagen! Never save changes -Veranderingen nooit opslaan +Wijzigingen nooit opslaan Do you want to save changes to %x? - +Wilt u de wijzigingen in %x opslaan? Save - +Opslaan Don't Save - +Niet opslaan Configuration loaded! Configuratie geladen! @@ -901,7 +898,7 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Toon bestanden die gelijk zijn Hide files that are different -Verberg bestanden die verschillen +Verberg bestanden die verschillend zijn Show files that are different Toon bestanden die verschillend zijn @@ -913,43 +910,43 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Toon conflicten Hide files that will be created on the left side -Verberg bestanden die aan de linkerzijde zullen worden aangemaakt +Verberg bestanden die aan de linkerzijde aangemaakt zullen worden Show files that will be created on the left side Toon bestanden die aan de linkerzijde aangemaakt zullen worden Hide files that will be created on the right side -Verberg bestanden die aan de rechterzijde zullen worden aangemaakt +Verberg bestanden die aan de rechterzijde aangemaakt zullen worden Show files that will be created on the right side Toon bestanden die aan de rechterzijde aangemaakt zullen worden Hide files that will be deleted on the left side -Verberg bestanden die aan de linkerzijde zullen worden verwijderd +Verberg bestanden die aan de linkerzijde aangemaakt zullen worden Show files that will be deleted on the left side Toon bestanden die van de linkerzijde verwijderd zullen worden Hide files that will be deleted on the right side -Verberg bestanden die aan de rechterzijde zullen worden verwijderd +Verberg bestanden die aan de rechterzijde verwijderd zullen worden Show files that will be deleted on the right side Toon bestanden die van de rechterzijde verwijderd zullen worden Hide files that will be overwritten on left side -Verberg bestanden die aan de linkerzijde zullen worden overschreven +Verberg bestanden die aan de linkerzijde overschreven zullen worden Show files that will be overwritten on left side Toon bestanden die aan de linkerzijde overschreven zullen worden Hide files that will be overwritten on right side -Verberg bestanden die aan de rechterzijde zullen worden overschreven +Verberg bestanden die aan de rechterzijde overschreven zullen worden Show files that will be overwritten on right side Toon bestanden die aan de rechterzijde overschreven zullen worden Hide files that won't be copied -Verberg bestanden die niet zullen worden gekopiëerd +Verberg bestanden die niet gekopiëerd zullen worden Show files that won't be copied Toon bestanden die niet gekopiëerd zullen worden @@ -958,7 +955,7 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Alle mappen zijn gesynchroniseerd! Comma separated list -Komma gescheiden lijst +Kommagescheiden bestand Legend Legenda @@ -1090,7 +1087,7 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Integreer externe applicaties in het context menu. De volgende macros zijn beschikbaar: - full file or folder name -- volledige bestands of maps naam +- volledige bestands- of mapnaam - folder part only - alleen het map gedeelte @@ -1102,7 +1099,7 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! - Tegenhanger andere zijde naar %dir Make hidden dialogs and warning messages visible again? -Maak verborgen dialogen en waarschuwings berichten opnieuw zichtbaar? +Verborgen dialogen en waarschuwings berichten opnieuw zichtbaar maken? Do you really want to move the following object to the Recycle Bin? @@ -1126,10 +1123,10 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Beschouw als onopgelost conflict Delete permanently -Verwijder onomkeerbaar +Definitief verwijderen Delete or overwrite files permanently -Verwijder of overschrijf bestanden onomkeerbaar +Bestanden definitief verwijderen of overschrijven Use Recycle Bin when deleting or overwriting files Gebruik de prullenbak bij verwijderen of overschrijven van bestanden @@ -1186,13 +1183,13 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Kan locatie %x niet controleren. Conversion error: -Converteer fout: +Converteerfout: Cannot delete file %x. Kan bestand %x niet verwijderen. The file is locked by another process: -Het bestand is op afgesloten door een ander proces: +Het bestand is in gebruik door een ander proces: Cannot move file %x to %y. Kan bestand %x niet verplaatsen naar %y. @@ -1204,7 +1201,7 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Kan bestandskenmerken van %x niet schrijven. Cannot write modification time of %x. -Kan wijzigings tijd van %x niet toevoegen. +Kan wijzigingstijd van %x niet toevoegen. Cannot find system function %x. Kan systeemfunctie %x niet vinden. @@ -1252,11 +1249,14 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Geen veranderingen sinds de laatste synchronisatie! The corresponding database entries are not in sync considering current settings. - +De volgende databaseregels zijn niet gesynchroniseerd volgens de huidige instellingen. Setting default synchronization directions: Old files will be overwritten with newer files. Stel standaard synchronisatie richtingen in: Oude bestanden worden door nieuwere bestanden overschreven. +Recycle Bin is not available for the following paths! Files will be deleted permanently instead: +Prullenbak is niet beschikbaar voor de volgende locaties! De bestanden worden permanent verwijderd: + You can ignore this error to consider the folder as empty. U kunt deze waarschuwing negeren om de map als leeg te laten gelden. @@ -1266,6 +1266,9 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Directories are dependent! Be careful when setting up synchronization rules: Mappen zijn afhankelijk van elkaar! Wees voorzichtig met het maken van synchronisatieregels: +Start comparison + + Preparing synchronization... Synchronisatie voorbereiden @@ -1278,6 +1281,9 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Files %x have the same date but a different size! Bestanden %x hebben dezelfde datums maar een afwijkende grootte! +Items have different attributes +Items hebben verschillende attributen + Symbolic links %x have the same date but a different target. Snelkoppelingen %x hebben dezelfde datum maar een verschillend doel. @@ -1293,9 +1299,6 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Both sides are equal Beide kanten zijn gelijk -Items have different attributes -Items hebben verschillende attributen - Copy new item to left Kopieër nieuw item naar de linkerkant @@ -1342,13 +1345,13 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Verwijderen van snelkoppeling %x Moving file %x to recycle bin -Bezig met verplaatsen van bestand %x naar prullenbak +Bezig met verplaatsen van bestand %x naar de prullenbak Moving folder %x to recycle bin -Bezig met verplaatsen van map %x naar prullenbak +Bezig met verplaatsen van map %x naar de prullenbak Moving symbolic link %x to recycle bin -Bezig met verplaatsen van snelkoppeling %x naar prullenbak +Bezig met verplaatsen van snelkoppeling %x naar de prullenbak Moving file %x to %y Bezig met verplaatsen van bestand %x naar %y @@ -1381,13 +1384,13 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Attributen bijwerken van %x Target folder input field must not be empty. - +Doelmap mag niet leeg zijn. Folder input field for versioning must not be empty. - +Bronmap voor versiebeheer mag niet leeg zijn. Source folder %x not found. - +Bronmap %x niet gevonden. Unresolved conflicts existing! Er bestaan onopgeloste conflicten! @@ -1405,22 +1408,19 @@ Opmerking: Bestandsnamen moeten relatief zijn aan de basis mappen! Niet genoeg vrije schijfruimte beschikbaar op: Required: - +Vereist: Available: - - -Recycle Bin is not available for the following paths! Files will be deleted permanently instead: -Prullenbak is niet beschikbaar voor de volgende locaties! De bestanden worden permanent verwijderd: +Beschikbaar: A folder will be modified which is part of multiple folder pairs. Please review synchronization settings. Een map die onderdeel is van meerdere map paren word aangepast. Kijk alstublieft uw synchronisatie instellingen na. -Processing folder pair: -Verwerking van gekoppelde mappen: +Synchronize folder pair: + Target folder %x already existing. - +Doelmap %x bestaat al. Generating database... Genereren van database... diff --git a/BUILD/Languages/french.lng b/BUILD/Languages/french.lng index 6db32565..db263be5 100644 --- a/BUILD/Languages/french.lng +++ b/BUILD/Languages/french.lng @@ -198,7 +198,7 @@ [%x Threads] -[1 Tâche] +[%x Tâche] [%x Tâches] diff --git a/BUILD/Languages/german.lng b/BUILD/Languages/german.lng index 9e8c9a8d..ddcb4832 100644 --- a/BUILD/Languages/german.lng +++ b/BUILD/Languages/german.lng @@ -10,6 +10,18 @@ Searching for folder %x... Suche Ordner %x... +Batch execution +Batchlauf + +Items processed: +Verarbeitete Elemente: + +Items remaining: +Verbleibende Elemente: + +Total time: +Gesamtzeit: + Show in Explorer Im Explorer anzeigen @@ -354,21 +366,6 @@ Die Befehlszeile wird ausgelöst wenn: FreeFileSync batch FreeFileSync Batch -Batch execution -Batchlauf - -Items processed: -Verarbeitete Elemente: - -Items remaining: -Verbleibende Elemente: - -Total time: -Gesamtzeit: - -Stop -Stop - Synchronization aborted! Synchronisation abgebrochen! @@ -433,7 +430,7 @@ Die Befehlszeile wird ausgelöst wenn: Datum Extension -Dateiendung +Erweiterung Size: Größe: @@ -1257,6 +1254,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein! Setting default synchronization directions: Old files will be overwritten with newer files. Setze Standardwerte für Synchronisationsrichtungen: Alte Dateien werden durch neuere überschrieben. +Recycle Bin is not available for the following paths! Files will be deleted permanently instead: +Der Papierkorb ist für die folgenden Pfade nicht verfügbar! Die Dateien werden stattdessen permanent gelöscht: + You can ignore this error to consider the folder as empty. Dieser Fehler kann ignoriert werden, um den Ordner als leer anzusehen. @@ -1266,6 +1266,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein! Directories are dependent! Be careful when setting up synchronization rules: Die Verzeichnisse sind voneinander abhängig! Achtung beim Festlegen der Synchronisationsregeln: +Start comparison +Starte Vergleich + Preparing synchronization... Bereite Synchronisation vor... @@ -1278,6 +1281,9 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein! Files %x have the same date but a different size! Die Dateien %x haben dasselbe Datum, aber unterschiedliche Größen! +Items have different attributes +Die Elemente haben unterschiedliche Attribute + Symbolic links %x have the same date but a different target. Die Symbolischen Links %x haben dasselbe Datum, aber ein unterschiedliches Ziel. @@ -1293,9 +1299,6 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein! Both sides are equal Beide Seiten sind gleich -Items have different attributes -Die Elemente haben unterschiedliche Attribute - Copy new item to left Kopiere neues Element nach links @@ -1410,14 +1413,11 @@ Achtung: Dateinamen müssen relativ zu den Basisverzeichnissen sein! Available: Verfügbar: -Recycle Bin is not available for the following paths! Files will be deleted permanently instead: -Der Papierkorb ist auf nachfolgenden Verzeichnissen nicht verfügbar! Die Dateien werden stattdessen permanent gelöscht: - A folder will be modified which is part of multiple folder pairs. Please review synchronization settings. Ein Ordner wird verändert werden, der Teil mehrerer Ordnerpaare ist. Bitte überprüfen Sie die Synchronisationseinstellungen. -Processing folder pair: -Bearbeite Ordnerpaar: +Synchronize folder pair: +Synchronisiere Ordnerpaar: Target folder %x already existing. Der Zielordner %x existiert bereits. diff --git a/BUILD/Languages/norwegian.lng b/BUILD/Languages/norwegian.lng index 3cf0f3d6..6ac894b0 100644 --- a/BUILD/Languages/norwegian.lng +++ b/BUILD/Languages/norwegian.lng @@ -1,6 +1,6 @@
    Norsk - FreewareTips + Bjørn Snoen nb_NO norway.png 2 @@ -8,7 +8,19 @@
    Searching for folder %x... - +Leter etter mappen %x + +Batch execution +Batch-kjøring + +Items processed: +Elementer behandlet: + +Items remaining: +Elementer igjen: + +Total time: +Total tid: Show in Explorer Vis i Utforsker @@ -17,7 +29,7 @@ Åpne med standardprogram Browse directory -Bla gjennom mappe +Utforsk mappe Abort requested: Waiting for current operation to finish... Avbrytelse forespurt: Venter på at gjeldende handling avsluttes... @@ -29,10 +41,10 @@ Feil Select alternate comparison settings -Velg alternative sammenligningsinnstillinger +Velg alternative innstillinger for sammenligning Select alternate synchronization settings -Velg alternative synkroniseringsinnstillinger +Velg alternative innstillinger for synkronisering Filter is active Filter er aktivt @@ -44,16 +56,16 @@ Fjern alternative innstillinger Clear filter settings -Fjern filterinnstillinger +Nullstill filterinnstillinger Create a batch job Opprett en batch-jobb Synchronization settings -Synkroniseringsinnstillinger +Innstillinger for synkronisering Comparison settings -Sammenligningsinnstillinger +Innstillinger for sammenligning About Om @@ -68,7 +80,7 @@ Felles innstillinger Summary - +Oppsummering Find Søk @@ -77,16 +89,16 @@ Velg tidsområde Show pop-up -Vis oppsprettsvindu +Vis pop-up Show pop-up on errors or warnings -Vis oppsprettsvindu ved feil eller advarsler +Vis pop-upvindu ved feil eller advarsler Ignore errors Ignorer feil Hide all error and warning messages -Skjul meldinger om feil og advarsler +Skjul feilmeldinger og advarsler Exit instantly Avslutt med en gang @@ -116,7 +128,7 @@ Linux feilkode %x: Cannot resolve symbolic link %x. -Kan ikke bestemme symbolsk lenke %x. +Kan ikke følge symbolsk lenke %x. %x MB %x MB @@ -133,7 +145,7 @@ 1 Byte -%x Bytes +%x Byte Database file %x is incompatible. @@ -146,7 +158,7 @@ Databasefil %x finnes ikke ennå. Database file is corrupt: - +Databasefilen er korrupt Out of memory! For lite minne! @@ -164,7 +176,7 @@ En unntagelse skjedde! Cannot read file attributes of %x. -Kan ikke lese filattributter til %x. +Kan ikke lese filattributter fra %x. Cannot get process information. Kan ikke hente prosessinformasjon. @@ -180,8 +192,8 @@ %x sec -1 sek -%x sek +1 sekund +%x sekunder Error parsing file %x, row %y, column %z. @@ -203,7 +215,7 @@     /sec -/sek +/sekund Cannot find file %x. Kan ikke finne filen %x. @@ -233,10 +245,10 @@ Kan ikke lese følgende XML-elementer: &Open... - +&Åpne Save &As... - +Lagre &som... &Quit &Avslutt @@ -257,7 +269,7 @@ Bruk: 1. Select folders to watch. - +1. Velg mapper å overvåke. 2. Enter a command line. 2. Oppfør en kommandolinje. @@ -266,10 +278,10 @@ 3. Trykk 'Start'. To get started just import a .ffs_batch file. - +Importer en .ffs_barch-fil for å komme i gang Folders to watch - +Mapper å overvåke Add folder Legg til mappe @@ -281,10 +293,10 @@ Velg en mappe Delay [seconds] - +Vent [sekunder] Idle time between last detected change and execution of command - +Ventetid mellom forrige endring og utførelse av kommando Command line Kommandolinje @@ -294,7 +306,11 @@ The command is triggered if: - files or subfolders change - new folders arrive (e.g. USB stick insert) - + +Kommandoen utløses hvis: +- filer eller mapper endres +- nye mapper legges til (f.eks. en USB-pinne kobles til) + Start Start @@ -309,7 +325,7 @@ The command is triggered if: (Build: %x) All files - +Alle filer &Restore &Gjenopprett @@ -324,7 +340,7 @@ The command is triggered if: Venter på manglende mapper... A folder input field is empty. - +Et mappefelt er tomt. Logging Logging @@ -348,22 +364,7 @@ The command is triggered if: Brukerdefinert FreeFileSync batch - - -Batch execution -Batch-kjøring - -Items processed: -Elementer behandlet: - -Items remaining: -Elementer igjen: - -Total time: -Total tid: - -Stop -Stopp +FreeFileSync batch Synchronization aborted! Synkronisering avbrutt! @@ -387,7 +388,7 @@ The command is triggered if: Ikke i stand til å koble til sourceforge.net! A new version of FreeFileSync is available: - +En ny versjon av FreeFileSync er tilgjengelig Download now? Laste ned nå? @@ -408,7 +409,7 @@ The command is triggered if: - + Full path Full bane @@ -420,7 +421,7 @@ The command is triggered if: Relativ bane Base folder - +Grunnmappe Size Størrelse @@ -432,10 +433,10 @@ The command is triggered if: Filendelse Size: - +Størrelse: Date: - +Dato: Action Handling @@ -471,7 +472,7 @@ The command is triggered if: &Ny &Save - +&Lagre &Language &Språk @@ -531,16 +532,16 @@ The command is triggered if: Skjul filtrerte eller midlertidig ekskluderte filer Number of files and folders that will be created - +Antall filer og mapper som vil opprettes Number of files that will be overwritten Antall filer som blir overskrevet Number of files and folders that will be deleted - +Antall filer og mapper som vil slettes Total bytes to copy - +Mengde bytes å kopiere Items found: Elementer funnet: @@ -549,16 +550,16 @@ The command is triggered if: Hastighet: Time remaining: - +Gjenstående tid: Time elapsed: - +Tid gått: Batch job Batch-jobb Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe .ffs_batch - +Lag en batch-fil for å automatisere synkronisering. Dobbelklikk denne filen eller legg til i ditt systems planlegger: FreFileSync.exe .ffs_batch Help Hjelp @@ -585,7 +586,7 @@ The command is triggered if: Maksimale antall loggfiler: Select folder to save log files: - +Velg en mappe for loggfiler: Batch settings Batch-innstillinger @@ -615,22 +616,22 @@ The command is triggered if: Innstilling Item exists on left side only - +Element eksisterer kun på venstre side Item exists on right side only - +Element eksisterer kun på høyre side Left side is newer - +Venstre side er nyere Right side is newer - +Høyre side er nyere Items have different content - +Elementer har forskjellig innhold Conflict/item cannot be categorized - +Konflikt/element kan ikke kategoriseres OK OK @@ -738,7 +739,7 @@ Merk: Filnavn må være relative til basismapper! &Standard Fail-safe file copy - +Trygg filkopi Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error. Skriv til en midlertidig fil (*.ffs_tmp) først så endre navn på den. Dette garanterer en konsistent tilstand selv ved alvorlige feil. @@ -753,7 +754,7 @@ Merk: Filnavn må være relative til basismapper! Kopier filadgangstillatelser Transfer file and folder permissions (Requires Administrator rights) - +Overfør tilgangspreferanser for filer og mapper (krever administratortilgang) Restore hidden dialogs Gjenopprett skjulte dialoger @@ -852,13 +853,13 @@ Merk: Filnavn må være relative til basismapper! Aldri lagre endringer Do you want to save changes to %x? - +Vil du lagre endringene til %x? Save - +Lagre Don't Save - +Ikke lagre Configuration loaded! Innstilling lastet! @@ -1086,10 +1087,10 @@ Merk: Filnavn må være relative til basismapper! Integrer eksterne programmer i høyreklikkmeny. Følgende makroer er tilgjengelige: - full file or folder name - +- full fil- eller mappenavn - folder part only - +- kun mapper - Other side's counterpart to %name - Andre sides motstykke til %name @@ -1134,7 +1135,7 @@ Merk: Filnavn må være relative til basismapper! Versjonshåndtering Move files into a time-stamped subfolder - +Flytt filer til en undermappe med tidsstempel Files Filer @@ -1230,7 +1231,7 @@ Merk: Filnavn må være relative til basismapper! Kan ikke lese mappen %x. Detected endless directory recursion. - +Fant uendelig dyp mappestruktur (lenker til mapper høyere opp i strukturen) Cannot set privilege %x. Kan ikke sette privilegie %x. @@ -1248,16 +1249,19 @@ Merk: Filnavn må være relative til basismapper! Ingen endringer siden siste synkronisering! The corresponding database entries are not in sync considering current settings. - +De tilsvarende databaseoppføringene er ikke synkroniserte i forhold til innstillingene. Setting default synchronization directions: Old files will be overwritten with newer files. Stiller inn standard synkroniseringsretning: Gamle filer blir overskrevet med nyere filer. +Recycle Bin is not available for the following paths! Files will be deleted permanently instead: +Papirkurv er ikke tilgjengelig for de følgende baner! Filer blir isteden slettet permanent: + You can ignore this error to consider the folder as empty. - +Du kan ignorere denne feilen og anse mappen som top Cannot find folder %x. - +Kan ikke finne mappen %x. Directories are dependent! Be careful when setting up synchronization rules: Mapper er avhengige av hverandre! Vær forsiktig når du setter opp synkroniseringsregler: @@ -1274,6 +1278,9 @@ Merk: Filnavn må være relative til basismapper! Files %x have the same date but a different size! Filer %x har den samme datoen, men forskjellig størrelse! +Items have different attributes +Elementer har forskjellige attributter + Symbolic links %x have the same date but a different target. Symbolske lenker %x har den samme datoen, men forskjellige mål. @@ -1289,20 +1296,17 @@ Merk: Filnavn må være relative til basismapper! Both sides are equal Begge sider er like -Items have different attributes - - Copy new item to left - +Kopier nytt element til venstre Copy new item to right - +Kopier nytt element til høyre Delete left item - +Slett venstre element Delete right item - +Slett høyre element Move file on left Flytt venstre fil @@ -1311,19 +1315,19 @@ Merk: Filnavn må være relative til basismapper! Flytt høyre fil Overwrite left item - +Skriv over venstre element Overwrite right item - +Skriv over høyre element Do nothing Ikke gjør noe Update attributes on left - +Oppdater attributter til venstre Update attributes on right - +Oppdater attributter til høyre Multiple... Flere... @@ -1377,13 +1381,13 @@ Merk: Filnavn må være relative til basismapper! Oppdaterer attributter til %x Target folder input field must not be empty. - +Feltet for målmappe kan ikke være tomt. Folder input field for versioning must not be empty. - +Mappefeltet for versjon kan ikke være tomt. Source folder %x not found. - +Kildemappe %x finnes ikke. Unresolved conflicts existing! Uløste konflikter finnes! @@ -1401,22 +1405,19 @@ Merk: Filnavn må være relative til basismapper! Ikke nok ledig diskplass tilgjengelig på: Required: - +Nødvendig: Available: - - -Recycle Bin is not available for the following paths! Files will be deleted permanently instead: -Papirkurv er ikke tilgjengelig for de følgende baner! Filer blir isteden slettet permanent: +Tilgjengelig: A folder will be modified which is part of multiple folder pairs. Please review synchronization settings. - +En mappe vil endres som er en del av flere mappepar. Se over innstillingene for synkronisering. Processing folder pair: Behandler mappepar: Target folder %x already existing. - +Målmappe %x eksisterer allerede. Generating database... Oppretter database... diff --git a/BUILD/Languages/portuguese.lng b/BUILD/Languages/portuguese.lng index b75ffb70..af35040b 100644 --- a/BUILD/Languages/portuguese.lng +++ b/BUILD/Languages/portuguese.lng @@ -10,6 +10,18 @@ Searching for folder %x... À procura da pasta %x... +Batch execution +Execução do batch + +Items processed: +Elementos processados: + +Items remaining: +Elementos restantes: + +Total time: +Tempo total: + Show in Explorer Mostrar no Explorer @@ -146,7 +158,7 @@ Base de dados %x não existe. Database file is corrupt: - +Ficheiro de base de dados está corrompido: Out of memory! Sem memória disponível! @@ -236,10 +248,10 @@ &Abrir... Save &As... - +Guar&dar como... &Quit -S&air +&Sair &Program &Programa @@ -248,7 +260,7 @@ C&onteúdo &About -&Sobre +So&bre &Help A&juda @@ -313,7 +325,7 @@ O comando é executado se: (Build: %x) All files - +Todos os ficheiros &Restore &Restaurar @@ -328,7 +340,7 @@ O comando é executado se: A aguardar pelos directórios em falta... A folder input field is empty. - +Um dos campos de directório para comparar está vazio. Logging A escrever em log @@ -352,22 +364,7 @@ O comando é executado se: Personalizado FreeFileSync batch - - -Batch execution -Execução do batch - -Items processed: -Elementos processados: - -Items remaining: -Elementos restantes: - -Total time: -Tempo total: - -Stop -Parar +FreeFileSync batch Synchronization aborted! Sincronização abortada! @@ -391,7 +388,7 @@ O comando é executado se: Não é possível ligar a sourceforge.net! A new version of FreeFileSync is available: - +Uma nova versão do FreeFileSync está disponível: Download now? Fazer download agora? @@ -436,10 +433,10 @@ O comando é executado se: Extensão Size: - +Tamanho: Date: - +Data: Action Ação @@ -475,7 +472,7 @@ O comando é executado se: &Novo &Save - +G&uardar &Language &Língua @@ -544,7 +541,7 @@ O comando é executado se: Número de ficheiros e pastas a ser eliminados Total bytes to copy - +Total em bytes a copiar Items found: Elementos encontrados: @@ -553,10 +550,10 @@ O comando é executado se: Velocidade: Time remaining: - +Tempo restante: Time elapsed: - +Tempo decorrido Batch job Ficheiro Batch @@ -855,13 +852,13 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base! Nunca guardar alterações Do you want to save changes to %x? - +Deseja guardar as alterações a %x? Save - +Guardar Don't Save - +Não Guardar Configuration loaded! Configuração carregada! @@ -1251,7 +1248,7 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base! Não há alterações desde a última sincronização! The corresponding database entries are not in sync considering current settings. - +As entradas da base de dados correspondentes não estão sincronizadas, considerando as opções actuais. Setting default synchronization directions: Old files will be overwritten with newer files. Escolher direcção de sincronização por defeito: Os ficheiros antigos serão substituídos pelos novos. @@ -1380,13 +1377,13 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base! Actualizar atributos de %x Target folder input field must not be empty. - +Campo de directório de destino não deve estar vazio. Folder input field for versioning must not be empty. - +Campo do directório para manter versões não deve estar vazio. Source folder %x not found. - +Directório %x não encontrado. Unresolved conflicts existing! Existem conflitos por resolver! @@ -1404,10 +1401,10 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base! Não há espaço livre suficiente em: Required: - +Requirido: Available: - +Disponível: Recycle Bin is not available for the following paths! Files will be deleted permanently instead: Reciclagem não disponível para os seguintes caminhos! Os ficheiros serão apagados permanentemente: @@ -1419,7 +1416,7 @@ Nota: Nome dos ficheiros tem que ser relativo aos diretórios base! A processar o par do directorio: Target folder %x already existing. - +Directório de destino %x já existe. Generating database... A gerar base de dados... diff --git a/BUILD/Languages/portuguese_br.lng b/BUILD/Languages/portuguese_br.lng index 6a7f1332..bac56f55 100644 --- a/BUILD/Languages/portuguese_br.lng +++ b/BUILD/Languages/portuguese_br.lng @@ -144,7 +144,7 @@ %x Bytes -1 Byte +%x Byte %x Bytes @@ -192,7 +192,7 @@ %x sec -1 seg +%x seg %x segs @@ -210,7 +210,7 @@ [%x Threads] -[1 Thread] +[%x Thread] [%x Threads] @@ -977,7 +977,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base! %x directories -1 diretório +%x diretório %x diretórios @@ -986,7 +986,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base! %x files -1 arquivo +%x arquivo %x arquivos @@ -995,7 +995,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base! %x of %y rows in view -%x de 1 linha +%x de %y linha %x de %y linhas @@ -1157,7 +1157,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base! %x min -1 min +%x min %x mins @@ -1166,7 +1166,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base! %x hours -1 hora +%x hora %x horas @@ -1175,7 +1175,7 @@ Nota: Os nomes dos arquivos devem ser relativos aos diretórios base! %x days -1 dia +%x dia %x dias diff --git a/BUILD/Languages/scottish_gaelic.lng b/BUILD/Languages/scottish_gaelic.lng new file mode 100644 index 00000000..d5f01eef --- /dev/null +++ b/BUILD/Languages/scottish_gaelic.lng @@ -0,0 +1,1450 @@ +
    + Gàidhlig + Michael Bauer aka Akerbeltz + gd + scotland.png + 4 + (n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3 +
    + +Searching for folder %x... +A' lorg a' phasgain %x... + +Batch execution +Cur an gnìomh batch + +Items processed: +Nithean a tha deiseil: + +Items remaining: +Nithean a tha ri dhèanamh: + +Total time: +An ùine gu lèir: + +Show in Explorer +Seall san taisgealaiche + +Open with default application +Fosgail leis an aplacaid bhunaiteach + +Browse directory +Rùraich an t-eòlaire + +Abort requested: Waiting for current operation to finish... +Tha thu airson sgur dheth: A' feitheamh gus an crìochnaich an gnìomh làithreach... + +RealtimeSync - Automated Synchronization +RealtimeSync - Sioncronachadh fèin-obrachail + +Error +Mearachd + +Select alternate comparison settings +Tagh roghainnean coimeasaidh eile + +Select alternate synchronization settings +Tagh roghainnean sioncronachaidh eile + +Filter is active +Tha a' chriathrag gnìomhach + +No filter selected +Cha deach criathrag a thaghadh + +Remove alternate settings +Thoir air falbh na roghainnean eile + +Clear filter settings +Falamhaich roghainnean na criathraige + +Create a batch job +Cruthaich batch job + +Synchronization settings +Roghainnean an t-sioncronachaidh + +Comparison settings +Roghainnean a' choimeasaidh + +About +Mu dheidhinn + +Confirm +Dearbh + +Configure filter +Rèitich a' chriathrag + +Global settings +Na roghainnean uile-choitcheann + +Summary +Gearr-chunntas + +Find +Lorg + +Select time span +Tagh an raon-ama + +Show pop-up +Seall na priob-uinneagan + +Show pop-up on errors or warnings +Seall priob-uinneagan a thaobh mhearachdan no rabhaidhean + +Ignore errors +Leig seachad mearachdan + +Hide all error and warning messages +Falaich gach teachdaireachd mu mhearachdan no rabhaidhean + +Exit instantly +Fàg sa bhad + +Abort synchronization immediately +Sguir dhen t-sioncronachadh sa bhad + +Browse +Rùraich + +Invalid command line: +Loidhne-àithne mhì-dhligheach: + +Info +Fiosrachadh + +Warning +Rabhadh + +Fatal Error +Mearachd mharbhtach + +Windows Error Code %x: +Còd mearachd Windows %x: + +Linux Error Code %x: +Còd mearachd Linux %x: + +Cannot resolve symbolic link %x. +Cha ghabh an symbolic link %x fhuasgladh. + +%x MB +%x MB + +%x KB +%x KB + +%x GB +%x GB + + +1 Byte +%x Bytes + + +%x bhaidht +%x bhaidht +%x baidht +%x baidht + + +Database file %x is incompatible. +Chan eil am faidhle stòir-dhàta %x co-chòrdail. + +Initial synchronization: +A' chiad sioncronachadh: + +Database file %x does not yet exist. +Chan eil am faidhle stòir-dhàta %x ann fhathast. + +Database file is corrupt: +Tha am faidhle stòir-dhàta coirbte: + +Out of memory! +Chan eil cuimhne gu leòr ann! + +Cannot write file %x. +Cha ghabh am faidhle %x a sgrìobhadh. + +Cannot read file %x. +Cha ghabh am faidhle %x a leughadh. + +Database files do not share a common session. +Chan eil seisean an cumantas aig na faidhlichean stòir-dhàta. + +An exception occurred! +Thachair eisgeachd! + +Cannot read file attributes of %x. +Cha ghabh buadhan an fhaidhle %x a leughadh. + +Cannot get process information. +Chan urrainn dhuinn greim fhaighinn air fiosrachadh a' phròiseis. + +Waiting while directory is locked (%x)... +A' feitheamh fhad 's a tha an t-eòlaire glaiste (%x)... + +Cannot set directory lock %x. +Cha ghabh glas an eòlaire %x a shuidheachadh. + + +1 sec +%x sec + + +%x diog +%x dhiog +%x diogan +%x diog + + +Error parsing file %x, row %y, column %z. +Mearachd le parsadh an fhaidhle %x, loidhne %y, colbh %z. + +Scanning: +'Ga sganadh: + +Encoding extended time information: %x +A' còdachadh fiosrachadh leudaichte an ama: %x + + +[1 Thread] +[%x Threads] + + +[%x snàithlean] +[%x shnàithlean] +[%x snàithleanan] +[%x snàithlean] + + +/sec +/diog + +Cannot find file %x. +Cha deach am faidhle %x a lorg. + +File %x does not contain a valid configuration. +Chan eil rèiteachadh dligheach san fhaidhle %x. + +Configuration file %x loaded partially only. +Cha deach faidhle an rèiteachaidh %x a luchdadh gu tur. + +Cannot access Volume Shadow Copy Service. +Chan fhaigh sinn cothrom air seirbheis lethbhreacan-sgàile nan clàr. + +Please use FreeFileSync 64-bit version to create shadow copies on this system. +Nach cleachd sibh an tionndadh 64 biot de FreeFileSync gus lethbhreacan-sgàile a chruthachadh air an t-siostam seo? + +Cannot load file %x. +Cha ghabh am faidhle %x a lorg. + +Path %x does not contain a volume name. +CHan eil ainm clàir san t-slighe %x. + +Volume name %x not part of file name %y! +Chan eil an t-ainm clàir %x 'na phàirt dhen ainm fhaidhle %y! + +Cannot read the following XML elements: +Chan urrainn dhuinn na h-eileamaidean XML a leanas a leughadh: + +&Open... +F&osgail... + +Save &As... +&Sàbhail mar... + +&Quit +&Fàg + +&Program +&Prògram + +&Content +S&usbaint + +&About +&Mu dheidhinn + +&Help +&Cobhair + +Usage: +Cleachdadh: + +1. Select folders to watch. +1. Tagh na pasgain air an cumar sùil. + +2. Enter a command line. +2. Cuir a-steach àithne. + +3. Press 'Start'. +3. Briog air "Tòisich". + +To get started just import a .ffs_batch file. +Cha leig thu leas ach faidhle .ffs_batch ion-phortadh airson toiseach tòiseachaidh. + +Folders to watch +Na pasgain air an cumar sùil + +Add folder +Cuir pasgan ris + +Remove folder +Thoir am pasgan air falbh + +Select a folder +Tagh pasgan + +Delay [seconds] +Dàil [diogan] + +Idle time between last detected change and execution of command +An tàmh eadar an t-atharrachadh mu dheireadh agus gnìomhachadh na h-àithne + +Command line +Loidhne-àithne + + +The command is triggered if: +- files or subfolders change +- new folders arrive (e.g. USB stick insert) + + +Thèid an loidhne-àithne a chur gu dol: +- ma dh'atharraicheas faidhlichean no fo-phasgain +- ma nochdas pasgain ùra (m.e. ma chuireas tu a-steach bioran USB) + + +Start +Tòisich + +&Retry +&Feuch ris a-rithist + +Cancel +Sguir dheth + +(Build: %x) +(Build: %x) + +All files +Gach faidhle + +&Restore +&Aisig + +&Exit +&Fàg an-seo + +Monitoring active... +A' cumail sùil... + +Waiting for missing directories... +A' feitheamh ris na h-eòlairean a tha a dhìth... + +A folder input field is empty. +Tha co-dhiù aon raon pasgain ann a tha falamh. + +Logging +Logadh + +File time and size +Ceann-là is meud + +File content +Susbaint an fhaidhle + + + + +Mirror ->> +Sgàthanaich ->> + +Update -> +Ùraich -> + +Custom +Gnàthaichte + +FreeFileSync batch +FreeFileSync batch + +Synchronization aborted! +Sguireadh dhen t-sioncronachadh! + +Synchronization completed with errors! +Chaidh an sioncronachadh a choileanadh ach bha mearachdan ann! + +Nothing to synchronize! +Chan eil dad ri shioncronachadh! + +Synchronization completed successfully! +Chaidh an sioncronachadh a choileanadh! + +Press "Switch" to resolve issues in FreeFileSync main dialog. +Briog air "Gearr leum" gus duilgheadasan a rèiteachadh sa phrìomh-chòmhradh aig FreeFileSync. + +Switching to FreeFileSync main dialog... +A' gearradh leum gu prìomh-chòmhradh FreeFileSyncs... + +Unable to connect to sourceforge.net! +Cha b' urrainn dhuinn ceangal a dhèanamh ri Sourceforge.net! + +A new version of FreeFileSync is available: +Tha tionndadh ùr de FreeFileSync ann: + +Download now? +A bheil thu airson a luchdadh a-nuas an-dràsta? + +FreeFileSync is up to date! +Tha FreeFileSync cho ùr 's a ghabhas! + +Information +Fiosrachadh + +Do you want FreeFileSync to automatically check for updates every week? +A bheil thu airson 's gun doir FreeFileSync sùil gach seachdain ach a bheil ùrachadh ann? + +(Requires an Internet connection!) +(Tha feum air ceangal ris an eadar-lìon!) + + + + + + + +Full path +Slighe shlan + +Name +Ainm + +Relative path +An t-slighe dhàimheach + +Base folder +Bun-phasgan + +Size +Meud + +Date +Ceann-là + +Extension +Leudachan + +Size: +Meud: + +Date: +Ceann-là: + +Action +Gnìomh + +Category +Roinn seòrsa + +Drag && drop +Slaod ┐ leig às + +Close progress dialog +Dùin còmhradh an adhartais + +Standby +Cuir 'na fhuireachas + +Log off +Clàraich a-mach + +Shut down +Dùin sìos + +Hibernate +Geamhraich + +1. &Compare +1. &Dèan coimeas + +2. &Synchronize +2. &Dèan sioncronachadh + +&New +Ù&r + +&Save +&Sàbhail + +&Language +&Cànan + +&Global settings... +&Na roghainnean uile-choitcheann... + +&Create batch job... +Cr&uthaich batch job... + +&Export file list... +Às-p&hortaich liosta nam faidhle... + +&Advanced +&Adhartach + +&Check for new version +&Thoir sùil ach a bheil tionndadh nas ùire ann + +Compare +Dèan coimeas + +Compare both sides +Dèan coimeas air an dà thaobh + +&Abort +&Sguir dheth + +Synchronize +Dèan sioncronachadh + +Start synchronization +Tòisich air an t-sioncronachadh + +Add folder pair +Cuir paidhir de phasgain ris + +Remove folder pair +Thoir air falbh am paidhir seo de phasgain + +Swap sides +Cuir an dà thaobh an àite a chèile + +Load configuration from file +Luchdaich an rèiteachadh on fhaidhle + +Save current configuration to file +Sàbhail an rèiteachadh làithreach ann am faidhle + +Last used configurations (press DEL to remove from list) +An rèiteachadh mu dheireadh a chaidh a chleachdadh (brùth DEL gus rudan a thoirt air falbh on liosta) + +Hide excluded items +Falaich rudan a chaidh an dùnadh às + +Hide filtered or temporarily excluded files +Falaich faidhlichean a chaidh a chriathradh às no a chaidh a dhùnadh às gu sealach + +Number of files and folders that will be created +Àireamh nam faidhle 's nam pasgan a thèid a chruthachadh + +Number of files that will be overwritten +Àireamh nam faidhle a thèid sgrìobhadh thairis orra + +Number of files and folders that will be deleted +Àireamh nam faidhle 's nam pasgan a thèid a sguabadh às + +Total bytes to copy +Co mheud baidht a thèid lethbhreac a dhèanamh dhiubh + +Items found: +Rudan a chaidh a lorg: + +Speed: +Astar: + +Time remaining: +An ùine a tha air fhàgail: + +Time elapsed: +An ùine a dh'fhalbh: + +Batch job +Batch job + +Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe .ffs_batch +Cruthaich faidhle batch airson sioncronachadh fèin-obrachail. Dèan briogadh dùbailte air an fhaidhle seo no cuir e air sgeideal an t-siostaim agad: FreeFileSync.exe .ffs_batch. + +Help +Cobhair + +Filter files +Criathraich na faidhlichean + +Left +Clì + +Right +Deas + +Status feedback +Fiosrachadh mun staid + +Show progress dialog +Seall còmhradh an adhartais + +Error handling +Làimhseachadh mhearachdan + +Maximum number of log files: +An àireamh as motha de dh'fhaidhlichean loga a tha ceadaichte: + +Select folder to save log files: +Tagh am pasgan far an dèid na logaichean a shàbhaladh: + +Batch settings +Roghainnean a' batch + +Select variant: +Tagh seòrsa: + +Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically. +Lorg is cuir an sàs atharraichean air an dà thaobh le stòr-dàta. Mothaichear do rudan a chaidh sguabadh às, a chaidh ainmean ùra a thoirt orra no còmhstrithean gu fèin-obrachail. + +Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization. +Dèan lethbhreac-glèidhidh 's tu a' sgàthanadh a' phasgain air an taobh chlì. Thèid am pasgan air an taobh deas a chur air gleus ach am bi e gu tur co-ionnann ris a' phasgan air an taobh chlì as dèidh dha sioncronachadh. + +Copy new or updated files to right folder. +Cuir lethbhreac de dh'fhaidhlichean a tha ùr no ùraichte dhan phasgan air an taobh deas. + +Configure your own synchronization rules. +Sònraich riaghailtean sioncronachaidh thu fhèin. + +Deletion handling +Mar a dhèiligear ri sguabadh às + +On completion: +Nuair a bhios e deiseil: + +Configuration +Rèiteachadh + +Item exists on left side only +Chan eil an nì seo ann ach air an taobh chlì + +Item exists on right side only +Chan eil an nì seo ann ach air an taobh deas + +Left side is newer +Tha an taobh clì nas ùire + +Right side is newer +Tha an taobh deas nas ùire + +Items have different content +Tha diofar susbaint sna nithean + +Conflict/item cannot be categorized +Tha còmhstri/nì ann nach urrainn dhuinn aithneachadh + +OK +Ceart ma-thà + +Compare by... +Dèan coimeas a-rèir... + + +Files are found equal if + - last write time and date + - file size +are the same + + +Bidh dà fhaidhle co-ionnann 'nar beachd-sa + - ma tha àm is ceann-là an sgrìobhaidh mu dheireadh + - ma tha am meud +co-ionnann + + + +Files are found equal if + - file content +is the same + + +Bidh dà fhaidhle co-ionnann 'nar beachd-sa + - susbaint an dà fhaidhle co-ionnann + + +Symbolic Link handling +Làimhseachadh nan symbolic links + +Synchronizing... +A' sioncronachadh... + +&Pause +&Cuir 'na stad + +Source code written in C++ utilizing: +Chaidh an còd tùsail a sgrìobhadh ann an C++ le taic: + +If you like FreeFileSync +Ma tha FreeFileSync a' còrdadh riut + +Donate with PayPal +Nach doir sibh tabhartas le PayPal? + +Big thanks for localizing FreeFileSync goes out to: +Taing mhòr dha na daoine a leanas a rinn eadar-theangachadh air FreeFileSync: + +Feedback and suggestions are welcome +Tha sinn a' cur fàilte mhòr air beachd is moladh sam bith + +Homepage +An duilleag-dhachaigh + +FreeFileSync at Sourceforge +FreeFileSync air Sourceforge + +Email +Post-d + +Published under the GNU General Public License +Air fhoillseachadh fo GNU General Public License + +Use Recycle Bin +Cleachd am biona ath-chuairteachaidh + +Delete on both sides +Sguab às air an dà thaobh + +Delete on both sides even if the file is selected on one side only +Sguab às air an dà thaobh fiù mur an deach am faidhle a thaghadh ach air aon taobh + + +Only files that match all filter settings will be synchronized. +Note: File names must be relative to base directories! + + +Cha dèid ach na faidhlichean a fhreagras ri gach roghainn na criathraige a shioncronachadh. +An aire: Feumaidh ainmean nam faidhlichean a bhi dàimheach ris na bun-eòlairean aca! + + +Include +Gabh a-steach + +Exclude +Dùin a-mach + +Time span +Raon-ama + +File size +Meudh an fhaidhle + +Minimum +Air a' char as lugha + +Maximum +Air a' char as motha + +&Default +&Bun-roghainn + +Fail-safe file copy +Dèan lethbhreac nach gabh fàilligeadh + +Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error. +Sgrìobh faidhle sealach (*.ffs_tmp) an toiseach agus cuir ainm eile air an uairsin. Bidh seo mar bharantas air staid sheasmhach, fiù ma thachras mearachd mharbhtach. + +Copy locked files +Dèan lethbhreac de dh'fhaidhlichean glaiste + +Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights) +Dèan lethbhreac de dh'fhaidhlichean glaiste no co-roinnte le seirbheis lethbhreacan-sgàile nan clàr (feumaidh seo còraichean rianaire) + +Copy file access permissions +Dèan lethbhreac de cheadan-inntrigidh nam faidhle + +Transfer file and folder permissions (Requires Administrator rights) +Tar-chuir ceadan nam faidhle 's nam pasgan (feumaidh seo còraichean rianaire) + +Restore hidden dialogs +Aisig na còmhraidhean falaichte + +External applications +Aplacaidean air an taobh a-muigh + +Description +Tuairisgeul + +Variant +Eugsamhail + +Statistics +Stats + +Do not show this dialog again +Na seall an còmhradh seo a-rithist + +Find what: +Lorg na leanas: + +Match case +An aire do litrichean mòra 's beaga + +&Find next +&Lorg an ath-fhear + +Operation aborted! +Sguireadh dhen ghnìomh! + +Main bar +Am prìomh-bhàr + +Folder pairs +Paidhrichean phasgan + +Overview +Foir-shealladh + +Select view +Tagh sealladh + +Set direction: +Suidhich a' chomhair: + +Exclude temporarily +Dùin a-mach gu sealach + +Include temporarily +Gabh a-steach gu sealach + +Exclude via filter: +Dùin a-mach le criathrag: + + + + +Delete +Sguab às + +Include all +Gabh a-steach na h-uile + +Exclude all +Dùin a-mach na h-uile + +Show icons: +Meud nan ìomhaigheagan: + +Small +Beag + +Medium +Meadhanach + +Large +Mòr + +Select time span... +Tagh an raon-ama... + +Default view +An sealladh bunaiteach + +Show "%x" +Seall "%x" + + + + +Configuration saved! +Chaidh an rèiteachadh a shàbhaladh! + +Never save changes +Na sàbhail atharraichean idir + +Do you want to save changes to %x? +An sàbhail sinn dhut na h-atharraichean air %x? + +Save +Sàbhailibh + +Don't Save +Na sàbhailibh + +Configuration loaded! +Chaidh an rèiteachadh a luchdadh! + +Folder Comparison and Synchronization +Coimeas eadar na pasgain is sioncronachadh + +Hide files that exist on left side only +Na falaich ach faidhlichean a tha air an taobh chlì a-mhàin + +Show files that exist on left side only +Na seall ach faidhlichean a tha air an taobh chlì a-mhàin + +Hide files that exist on right side only +Na falaich ach faidhlichean a tha air an taobh deas a-mhàin + +Show files that exist on right side only +Na seall ach faidhlichean a tha air an taobh deas a-mhàin + +Hide files that are newer on left +Falaich faidhlichean a tha nas ùire air an taobh chlì + +Show files that are newer on left +Seall faidhlichean a tha nas ùire air an taobh chlì + +Hide files that are newer on right +Falaich faidhlichean a tha nas ùire air an taobh deas + +Show files that are newer on right +Seall faidhlichean a tha nas ùire air an taobh deas + +Hide files that are equal +Falaich faidhlichean a tha co-ionnann + +Show files that are equal +Seall faidhlichean a tha co-ionnann + +Hide files that are different +Falaich faidhlichean a tha eadar-dhealaichte + +Show files that are different +Seall faidhlichean a tha eadar-dhealaichte + +Hide conflicts +Falaich còmhstrithean + +Show conflicts +Seall còmhstrithean + +Hide files that will be created on the left side +Falaich faidhlichean a thèid a chruthachadh air an taobh chlì + +Show files that will be created on the left side +Seall faidhlichean a thèid a chruthachadh air an taobh chlì + +Hide files that will be created on the right side +Falaich faidhlichean a thèid a chruthachadh air an taobh deas + +Show files that will be created on the right side +Seall faidhlichean a thèid a chruthachadh air an taobh deas + +Hide files that will be deleted on the left side +Falaich faidhlichean a thèid a sguabadh às air an taobh chlì + +Show files that will be deleted on the left side +Seall faidhlichean a thèid a sguabadh às air an taobh chlì + +Hide files that will be deleted on the right side +Falaich faidhlichean a thèid a sguabadh às air an taobh deas + +Show files that will be deleted on the right side +Seall faidhlichean a thèid a sguabadh às air an taobh deas + +Hide files that will be overwritten on left side +Falaich faidhlichean a thèid a thar-sgrìobhadh air an taobh chlì + +Show files that will be overwritten on left side +Seall faidhlichean a thèid a thar-sgrìobhadh air an taobh chlì + +Hide files that will be overwritten on right side +Falaich faidhlichean a thèid a thar-sgrìobhadh air an taobh deas + +Show files that will be overwritten on right side +Seall faidhlichean a thèid a thar-sgrìobhadh air an taobh deas + +Hide files that won't be copied +Falaich faidhlichean nach dèid lethbhreac a dhèanamh dhiubh + +Show files that won't be copied +Seall faidhlichean nach dèid lethbhreac a dhèanamh dhiubh + +All directories in sync! +Tha gach eòlaire air sioncronachadh! + +Comma separated list +Liosta air a sgaradh le cromagan + +Legend +Treòir + +File list exported! +Chaidh liosta nam faidhle às-phortadh! + + +Object deleted successfully! +%x objects deleted successfully! + + +Chaidh %x oibseact a sguabadh às! +Chaidh %x oibseact a sguabadh às! +Chaidh %x oibseactan a sguabadh às! +Chaidh %x oibseact a sguabadh às! + + + +1 directory +%x directories + + +%x eòlaire +%x eòlaire +%x eòlairean +%x eòlaire + + + +1 file +%x files + + +%x fhaidhle +%x fhaidhle +%x faidhlichean +%x faidhle + + + +%x of 1 row in view +%x of %y rows in view + + +A' sealltainn %x ràgh +A' sealltainn %x à %y ràgh +A' sealltainn %x à %y ràghan +A' sealltainn %x à %y ràgh + + +Ignore further errors +Leig seachad mearachd sam bith eile + +&Ignore +&Leig seachad + +&Switch +&Dèan suids + +Question +Ceist + +&Yes +&Tha + +&No +&Chan eil + +Scanning... +'Ga sganadh... + +Comparing content... +A' dèanamh coimeas eadar an cuid susbaint... + +Paused +'Na stad + +Initializing... +A' tòiseachadh... + +Aborted +Air sgur dheth + +Completed +Deiseil + +Continue +Lean air + +Pause +Cuir 'na stad + +Cannot find %x +Chan urrainn dhuinn %x a lorg. + +Inactive +Neo-ghnìomhach + +Today +An-diugh + +This week +An t-seachdain seo + +This month +Am mìos seo + +This year +Am bliadhna + +Last x days +Na x làithean seo chaidh + +Byte +Baidht + +KB +KB + +MB +MB + +Filter +Criathrag + +Direct +Dìreach + +Follow +Lean + +Copy NTFS permissions +Dèan lethbhreac de cheadan NTFS + +Integrate external applications into context menu. The following macros are available: +Amalaichidh seo aplacaidean air an taobh a-muigh dhan chlàr-taice cho-theacsail. Tha na macrothan a leanas ri làimh: + +- full file or folder name +- ainm slàn dhen fhaidhle no dhen phasgan + +- folder part only +- cuid a' phasgain a-mhàin + +- Other side's counterpart to %name +- seise %s an taoibh eile + +- Other side's counterpart to %dir +- seise %dir an taoibh eile + +Make hidden dialogs and warning messages visible again? +A bheil thu airson na còmhraidhean is rabhaidhean falaichte fhaicinn a-rithist? + + +Do you really want to move the following object to the Recycle Bin? +Do you really want to move the following %x objects to the Recycle Bin? + + +A bheil thu cinnteach gu bheil thu airson an %x oibseact seo a chur dhan bhiona ath-chuairteachaidh? +A bheil thu cinnteach gu bheil thu airson an %x oibseact seo a chur dhan bhiona ath-chuairteachaidh? +A bheil thu cinnteach gu bheil thu airson na %x oibseactan seo a chur dhan bhiona ath-chuairteachaidh? +A bheil thu cinnteach gu bheil thu airson na %x oibseact seo a chur dhan bhiona ath-chuairteachaidh? + + + +Do you really want to delete the following object? +Do you really want to delete the following %x objects? + + +A bheil thu cinnteach gu bheil thu airson an %x oibseact seo a sguabadh às? +A bheil thu cinnteach gu bheil thu airson an %x oibseact seo a sguabadh às? +A bheil thu cinnteach gu bheil thu airson na %x oibseactan seo a sguabadh às? +A bheil thu cinnteach gu bheil thu airson na %x oibseact seo a sguabadh às? + + +Leave as unresolved conflict +Fàg mar còmhstri gun rèiteachadh + +Delete permanently +Sguab às gu buan + +Delete or overwrite files permanently +Sguab às no sgrìobh thairis air faidhlichean gu buan + +Use Recycle Bin when deleting or overwriting files +Cleachd am biona ath-chuairteachaidh nuair a thèid faidhlichean a sguabadh às no ma thèid sgrìobhadh thairis orra + +Versioning +Versioning + +Move files into a time-stamped subfolder +Gluais na faidhlichean dha fo-phasgan air a bheil stampa-ama + +Files +Faidhlichean + +Percentage +Ceudad + +%x TB +%x TB + +%x PB +%x PB + +%x% +%x% + + +1 min +%x min + + +%x mhionaid +%x mhionaid +%x mionaidean +%x mionaid + + + +1 hour +%x hours + + +%x uair a thìde +%x uair a thìde +%x uairean a thìde +%x uair a thìde + + + +1 day +%x days + + +%x latha +%x latha +%x làithean +%x latha + + +Cannot monitor directory %x. +Chan urrainn dhuinn sùil a chumail air %x. + +Conversion error: +Mearachd iompachaidh: + +Cannot delete file %x. +Cha ghabh am faidhle %x a sguabadh às. + +The file is locked by another process: +Tha am faidhle glaiste aig pròiseas eile: + +Cannot move file %x to %y. +Cha ghabh am faidhle %x a ghluasad dha %y. + +Cannot delete directory %x. +Cha ghabh an t-eòlaire %x a sguabadh às. + +Cannot write file attributes of %x. +Chan urrainn dhuinn buadhan an fhaidhle %x a sgrìobhadh. + +Cannot write modification time of %x. +Cha ghabh àm atharrachaidh %x a sgrìobhadh. + +Cannot find system function %x. +Chan urrainn dhuinn foincsean an t-siostaim %x a lorg. + +Cannot read security context of %x. +Cha ghabh susbaint tèarainteachd %x a leughadh. + +Cannot write security context of %x. +Cha ghabh susbaint tèarainteachd %x a sgrìobhadh. + +Cannot read permissions of %x. +Cha ghabh ceadan %x a leughadh. + +Cannot write permissions of %x. +Cha ghabh ceadan %x a sgrìobhadh. + +Cannot create directory %x. +Cha ghabh an t-eòlaire %x a chruthachadh. + +Cannot copy symbolic link %x to %y. +Chan ghabh lethbhreac dhen symbolic link %x a chur gu %y. + +Cannot copy file %x to %y. +Cha ghabh lethbhreac an fhaidhle %x a chur gu %y. + +Cannot read directory %x. +Cha ghabh an t-eòlaire %x a leughadh. + +Detected endless directory recursion. +Mhothaich sinn dha ath-chùrsadh eòlaire gun chrìoch. + +Cannot set privilege %x. +Cha ghabh a' phribhleid %x a shuidheachadh. + +Unable to move %x to the Recycle Bin! +Chan urrainn dhuinn %x a ghluasad dhan bhiona ath-chuairteachaidh! + +Both sides have changed since last synchronization! +Chaidh an dà thaobh atharrachadh on t-sioncronachadh mu dheireadh! + +Cannot determine sync-direction: +Cha ghabh comhair an t-sioncronachaidh aithneachadh: + +No change since last synchronization! +Cha deach dad atharrachadh on t-sioncronachadh mu dheireadh! + +The corresponding database entries are not in sync considering current settings. +Chan eil seisean nan innteartan san stòr-dàta sioncronaichte a-rèir nan roghainnean làithreach. + +Setting default synchronization directions: Old files will be overwritten with newer files. +A' suidheachadh comhair bhunaiteach an t-sioncronachaidh: Thèid faidhlichean nas ùire a sgrìobhadh thairis air seann-fhaidhlichean. + +Recycle Bin is not available for the following paths! Files will be deleted permanently instead: +Chan eil am biona ath-chuairteachaidh ri làimh nan slighean a leanas! Thèid na faidhlichean a sguabhadh às gu buan an àite sin: + +You can ignore this error to consider the folder as empty. +'S urrainn dhut a' mhearachd seo a leigeil seachad gus am pasgan a làimhseachadh mar gum biodh e falamh. + +Cannot find folder %x. +Chan urrainn dhuinn am pasgan %x a lorg. + +Directories are dependent! Be careful when setting up synchronization rules: +Tha eòlairean an eisimeil a chèile! Bi faiceallach nuair a shuidhicheas tu na riaghailtean sioncronachaidh: + +Preparing synchronization... +Ag ullachadh an t-sioncronachaidh... + +Conflict detected: +Mhothaich sinn do chòmhstri: + +File %x has an invalid date! +Tha ceann-là mì-dhligheach aig an fhaidhle %x! + +Files %x have the same date but a different size! +Tha an dearbh cheann-là aig na faidhlichean %x ach chan eil am meud co-ionnann! + +Items have different attributes +Tha diofar buadhan aig na nithean + +Symbolic links %x have the same date but a different target. +Tha an dearbh cheann-là aig na symbolic links %x ach targaidean eadar-dhealaichte. + +Comparing content of files %x +A' dèanamh coimheas eadar na faidhlichean %x + +Comparing files by content failed. +Dh'fhàillig coimeasadh nam faidhlichean a thaobh susbaint. + +Generating file list... +A' gintinn liosta nam faidhle... + +Both sides are equal +Tha an dà thaobh co-ionnann + +Copy new item to left +Cuir lethbhreac dhen nì ùr dhan taobh chlì + +Copy new item to right +Cuir lethbhreac dhen nì ùr dhan taobh deas + +Delete left item +Sguab às an nì air an taobh chlì + +Delete right item +Sguab às an nì air an taobh deas + +Move file on left +Gluais am faidhle a tha air an taobh chlì + +Move file on right +Gluais am faidhle a tha air an taobh deas + +Overwrite left item +Sgrìobh thairis air an nì chlì + +Overwrite right item +Sgrìobh thairis air an nì deas + +Do nothing +Na dèan dad + +Update attributes on left +Ùraich na buadhan air an taobh chlì + +Update attributes on right +Ùraich na buadhan air an taobh deas + +Multiple... +Iomadh fear... + +Deleting file %x +A' sguabadh às an fhaidhle %x + +Deleting folder %x +A' sguabadh às a' phasgain %x + +Deleting symbolic link %x +A' sguabadh às an symbolic link %x + +Moving file %x to recycle bin +A' gluasad an fhaidhle %x dhan bhiona ath-chuairteachaidh + +Moving folder %x to recycle bin +A' gluasad a' phasgain %x dhan bhiona ath-chuairteachaidh + +Moving symbolic link %x to recycle bin +A' gluasad an symbolic link %x dhan bhiona ath-chuairteachaidh + +Moving file %x to %y +A' gluasad an fhaidhle %x gu %y + +Moving folder %x to %y +A' gluasad a' phasgain %x gu %y + +Moving symbolic link %x to %y +A' gluasad an symbolic link %x gu %y + +Creating file %x +A' cruthachadh an fhaidhle %x + +Creating symbolic link %x +A' cruthachadh an symbolic link %x + +Creating folder %x +A' cruthachadh a' phasgain %x + +Overwriting file %x +A' sgrìobhadh thairis air an fhaidhle %x + +Overwriting symbolic link %x +A' sgrìobhadh thairis air an symbolic link %x + +Verifying file %x +A' dearbhadh an fhaidhle %x + +Updating attributes of %x +Ag ùrachadh buadhan %x + +Target folder input field must not be empty. +Chan fhaod raon a' phasgain a bhith falamh. + +Folder input field for versioning must not be empty. +Chan fhaod raon a' pasgain airson versioning a bhith falamh. + +Source folder %x not found. +Cha deach am pasgan tùsail %x a lorg. + +Unresolved conflicts existing! +Tha còmhstrithean gun rèiteachadh ann! + +You can ignore conflicts and continue synchronization. +'S urrainn dhut na còmhstrithean a leigeil seachad is leantainn air an t-sioncronachadh. + +Significant difference detected: +Chaidh diofar mòr a lorg: + +More than 50% of the total number of files will be copied or deleted! +Tha thu an impis barrachd air an dàrna leth dhe na faidhlichean uile sguabadh às no lethbhreac a dhèanamh dhiubh! + +Not enough free disk space available in: +Chan eil rùm saor gu leòr air an diosga: + +Required: +Na tha feum air: + +Available: +Na tha ri làimh: + +A folder will be modified which is part of multiple folder pairs. Please review synchronization settings. +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? + +Processing folder pair: +A' pròiseasadh a' phaidhir de phasgain: + +Target folder %x already existing. +Tha am pasgan-uidhe %x ann mu thràth. + +Generating database... +A' gintinn an stòir-dhàta... + +Data verification error: Source and target file have different content! +Mearachd dearbhadh an dàta: Tha susbaint eadar-dhealaichte san fhaidhle tùsail is san targaid! + diff --git a/BUILD/Languages/slovenian.lng b/BUILD/Languages/slovenian.lng index 21511cea..9fa57752 100644 --- a/BUILD/Languages/slovenian.lng +++ b/BUILD/Languages/slovenian.lng @@ -132,7 +132,7 @@ %x Bytes -1 Bajt +%x Bajt %x Bajta %x Bajti %x Bajtov @@ -182,7 +182,7 @@ %x sec -1 sek +%x sek %x sek %x sek %x sek @@ -202,7 +202,7 @@ [%x Threads] -[1 nit] +[%x nit] [%x niti] [%x niti] [%x niti] @@ -988,7 +988,7 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom! %x directories -1 imenik +%x imenik %x imenika %x imeniki %x imenikov @@ -999,7 +999,7 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom! %x files -1 datoteka +%x datoteka %x datoteki %x datoteke %x datotek @@ -1010,7 +1010,7 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom! %x of %y rows in view -%x od 1 vrstice v prikazu +%x od %y vrstice v prikazu %x od %y vrstic v prikazu %x od %y vrstic v prikazu %x od %y vrstic v prikazu @@ -1178,7 +1178,7 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom! %x min -1 min +%x min %x min %x min %x min @@ -1189,7 +1189,7 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom! %x hours -1 ura +%x ura %x uri %x ure %x ur @@ -1200,7 +1200,7 @@ Opomba: Imena datoteka morajo biti relativna osnovnim imenikom! %x days -1 dan +%x dan %x dni %x dni %x dni diff --git a/BUILD/Languages/ukrainian.lng b/BUILD/Languages/ukrainian.lng index 9de06b00..bdfd7db7 100644 --- a/BUILD/Languages/ukrainian.lng +++ b/BUILD/Languages/ukrainian.lng @@ -212,7 +212,7 @@ [%x Threads] -[1 Нить виконання] +[%x Нить виконання] [%x Ниті виконання] [%x Нитей виконання] diff --git a/BUILD/Resources.zip b/BUILD/Resources.zip index 2f132d17..44b9749e 100644 Binary files a/BUILD/Resources.zip and b/BUILD/Resources.zip differ diff --git a/FreeFileSync.cbp b/FreeFileSync.cbp index e874a6e0..4c324148 100644 --- a/FreeFileSync.cbp +++ b/FreeFileSync.cbp @@ -373,6 +373,14 @@