diff --git a/doc/Building.txt b/doc/Building.md similarity index 68% rename from doc/Building.txt rename to doc/Building.md index 324fb46..7a26386 100644 --- a/doc/Building.txt +++ b/doc/Building.md @@ -6,66 +6,87 @@ Prerequisites Building Fuel from source requires Qt version 4 or 5. Qt is available at: http://www.qt.io/download-open-source/ -To run Fuel a compiled binary of Fossil must be available either in the system +To run Fuel a compiled binary of Fossil must be available either in the system path or in the same folder as the Fuel executable. You can find the latest Fossil binaries from the Fossil homepage at: - http://www.fossil-scm.org/download.html - + https://www.fossil-scm.org/download.html Retrieving the source ------------------------------------------------------------------------------- The source is available as a tar.gz archive at the following location - http://fuelscm.org/fossil/wiki?name=Downloads + + https://fuel-scm.org/fossil/wiki?name=Downloads Additionally you can clone the source code directly from our site using fossil + mkdir fuel cd fuel - fossil clone http://fuelscm.org/fossil fuel.fossil + fossil clone https://fuel-scm.org/fossil fuel.fossil fossil open fuel.fossil -Windows (Qt4) +Windows (Qt4 / MinGW) ------------------------------------------------------------------------------- 1. Open a Command Prompt and cd into the folder containing the Fuel source code - cd fuel + + cd fuel 2. Make a build folder and cd into it - md build - cd build -3.1 Build with MinGW - 3.1.1 Generate the makefile with qmake + md build + cd build + +3. Generate the makefile with qmake + C:\QtSDK\Desktop\Qt\4.8.1\mingw\bin\qmake ..\fuel.pro -r -spec win32-g++ CONFIG+=release - 3.1.2 Build the project +4. Build the project + c:\QtSDK\mingw\bin\mingw32-make - 3.1.3 Copy the Qt DLLs +5. Copy the Qt DLLs + copy C:\QtSDK\Desktop\Qt\4.8.1\mingw\bin\QtCore4.dll release copy C:\QtSDK\Desktop\Qt\4.8.1\mingw\bin\QtGui4.dll release - 3.1.4 Copy the MinGW DLLs +6. Copy the MinGW DLLs + copy C:\QtSDK\mingw\bin\libgcc_s_dw2-1.dll release copy C:\QtSDK\mingw\bin\mingwm10.dll release - -3.2 Build with Visual Studio 2010 - 3.2.1 Generate the Visual Studio project makefile with qmake + + +Windows (Qt4 / MSVC) +------------------------------------------------------------------------------- +1. Open a Command Prompt and cd into the folder containing the Fuel source code + + cd fuel + +2. Make a build folder and cd into it + + md build + cd build + +3. Generate the Visual Studio project makefile with qmake + C:\QtSDK\Desktop\Qt\4.8.1\msvc2010\bin\qmake ..\fuel.pro -tp vc -spec win32-msvc2010 - 3.2.2 Open the generated project +4. Open the generated project + start fuel.vcxproj - - 3.2.3 Build the project - - Alternatively you can build via MSBuild + +5. Build the project + Use the IDE to build the project or alternatively you can use via MSBuild + c:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild Fuel.vcxproj /t:build /p:Configuration=Release - - 3.2.4 Copy the Qt DLLs + +6. Copy the Qt DLLs + copy C:\QtSDK\Desktop\Qt\4.8.1\msvc2010\bin\QtCore4.dll release copy C:\QtSDK\Desktop\Qt\4.8.1\msvc2010\bin\QtGui4.dll release - + 4. Enjoy - release\Fuel.exe + + release\Fuel.exe Mac OS X @@ -73,46 +94,59 @@ Mac OS X Build Steps: 1. Open a Terminal and add your Qt bin folder to the path - export PATH=$PATH:/path/to/qt/version/clang_64/bin + + export PATH=$PATH:/path/to/qt/version/clang_64/bin 2. Go into the folder containing the Fuel source code - cd fuel + + cd fuel 3. Generate localization files - intl/convert.sh + + intl/convert.sh 4. Generate the makefile with qmake - qmake fuel.pro -spec macx-clang CONFIG+=release + + qmake fuel.pro -spec macx-clang CONFIG+=release 5. Build the project - make + + make 6. (Optional) Include the Fossil executable within the Fuel application bundle - cp /location/to/fossil Fuel.app/Contents/MacOS + + cp /location/to/fossil Fuel.app/Contents/MacOS 7. Package Qt dependencies into Fuel to make a standalone application bundle - macdeployqt Fuel.app + + macdeployqt Fuel.app 8. Enjoy - open Fuel.app + + open Fuel.app -Unix-based OSs +Unix-based OS ------------------------------------------------------------------------------- Build Steps: 1. cd into the folder containing the Fuel source code - cd fuel + + cd fuel 2. Generate localization files - intl/convert.sh + + intl/convert.sh 3. Generate the makefile with qmake - qmake fuel.pro + + qmake fuel.pro 4. Build the project - make + + make 5. Enjoy - ./Fuel + + ./Fuel diff --git a/doc/Changes.txt b/doc/Changes.md similarity index 75% rename from doc/Changes.txt rename to doc/Changes.md index f524de4..722dab5 100644 --- a/doc/Changes.txt +++ b/doc/Changes.md @@ -1,15 +1,22 @@ +Fuel V1.0.1 (2015-07-XX) +================================================================================ +- Reformated Docs into Markdown +- Added Localisations: + - Italian (Thanks maxxlupi and Zangune) + - Dutch (Thanks Rick Van Lieshout and Fly Man) + Fuel V1.0.0 (2015-03-28) -============ +================================================================================ - Feature: Long Operations can now be aborted by pressing the Escape key - Improvement: Better support for commit messages with international characters - Improvement: Fossil queries about CR/NL inconsistencies are now handled better - Improvement: Files in Conflicted state are now shown - Localisations: - Russian (Thanks Mouse166) - Portuguese (Thanks emansije) + - Russian (Thanks Mouse166) + - Portuguese (Thanks emansije) Fuel V0.9.7 (Unreleased) -============ +================================================================================ - Feature: Optionally use the internal browser for the Fossil UI - Feature: Support for persisting the state (Column order and sizes) of the File View - Feature: Dropping a Fossil checkout file or workspace folder on Fuel now opens that workspace @@ -18,15 +25,15 @@ Fuel V0.9.7 (Unreleased) and Escape aborts it - Feature: Support for localization - Localisations: - French (Thanks Fringale) - German (Thanks stayawake) - Greek - Spanish (Thanks djnavas) + - French (Thanks Fringale) + - German (Thanks stayawake) + - Greek + - Spanish (Thanks djnavas) - Feature: Support for QT5 - Distribution: Fuel is now available in the Arch User Repository Fuel V0.9.6 (2012-05-13) -============ +================================================================================ - Feature: Support for fossil stashes - Feature: Support for dragging and dropping files out of Fuel - Feature: Allow for opening workspaces via the checkout file or a workspace folder @@ -42,3 +49,4 @@ Fuel V0.9.6 (2012-05-13) - Bug Fix: Fixed issue where a complete repository would be committed even when the user has a specific set of files marked for commit - Misc: Minor GUI bug fixes and usability enhancements + diff --git a/fuel.pro b/fuel.pro index 13b940f..e9ad182 100644 --- a/fuel.pro +++ b/fuel.pro @@ -139,5 +139,5 @@ TRANSLATIONS += \ intl/fr_FR.ts \ intl/ru_RU.ts \ intl/pt_PT.ts \ - intl/it_IT.ts - + intl/it_IT.ts \ + intl/nl_NL.ts \ diff --git a/intl/convert.bat b/intl/convert.bat index 276524e..e9ca6cc 100755 --- a/intl/convert.bat +++ b/intl/convert.bat @@ -17,5 +17,6 @@ REM Convert all except the en_US which is the original text in the code %QTPATH%\bin\lrelease ru_RU.ts -qm ..\rsrc\intl\ru_RU.qm %QTPATH%\bin\lrelease pt_PT.ts -qm ..\rsrc\intl\pt_PT.qm %QTPATH%\bin\lrelease it_IT.ts -qm ..\rsrc\intl\it_IT.qm +%QTPATH%\bin\lrelease nl_NL.ts -qm ..\rsrc\intl\nl_NL.qm endlocal diff --git a/intl/nl_NL.ts b/intl/nl_NL.ts new file mode 100644 index 0000000..6b26ef5 --- /dev/null +++ b/intl/nl_NL.ts @@ -0,0 +1,1375 @@ + + + BrowserWidget + + + + Back + Terug + + + + + Forward + Vooruit + + + + + Refresh + Verversen + + + + Stop + Stop + + + + CloneDialog + + + Clone Repository + Kloon Archief + + + + URL + URL + + + + The URL of the source repository + De URL naar het bronarchief + + + + User Name + Gebruikersnaam + + + + The user name used to access the remote repository. Leave blank if not required + De gebruikersnaam dat gebruikt moet worden om het externe archief te benaderen. Laat leeg als er geen gebruikersnaam nodig is. + + + + Password + Wachtwoord + + + + The password used to access the remote repository. Leave blank if not required + Het wachtwoord dat gebruikt moet worden om het externe archief te benaderen. Laat leeg als er geen wachtwoord nodig is. + + + + Repository + Archief + + + + Path to the local repository file + Pad naar het lokale archief + + + + ... + ... + + + + + + Error + Foutmelding + + + + Invalid URL. + Foutieve URL + + + + Invalid Repository File. + Ongeldig archiefbestand. + + + + Fossil Repository + Fossil archief + + + + Select Fossil Repository + Selecteer Fossil archief + + + + This repository file already exists. + Dit archiefbestand bestaat al. + + + + CommitDialog + + + Commit + Toevertrouwen + + + + FileActionDialog + + + File Action + Bestandsbewerking + + + + MainWindow + + + Fuel + Fuel + + + + Log + Logboek + + + + Browser + Webbrowser + + + + &File + Bestand + + + + &Help + &Help + + + + &View + Weerga&ve + + + + Main Toolbar + Hoofd taakbalk + + + + Refresh + Verversen + + + + + Refresh the views + Vensters verversen + + + + F5 + F5 + + + + Commit + Toevertrouwen + + + + + Commit modifications + Veranderingen toevertrouwen + + + + Ctrl+M + Ctrl+M + + + + Diff + Verschil + + + + + Display the differences between the current and last committed version + Toon de verschillen tussen de huidige en de vorige versie + + + + Ctrl+D + Ctrl+D + + + + Add + Toevoegen + + + + + Add files to the repository + Bestanden toevoegen aan het archief + + + + Ctrl++ + Ctrl++ + + + + Delete + Verwijder + + + + + Delete files from the repository + Verwijder bestanden uit het archief + + + + Ctrl+- + Ctrl+- + + + + &New... + &Nieuw... + + + + + Make a new Fossil repository + Maak een nieuw Fossil archief + + + + Ctrl+N + Ctrl+N + + + + &Open... + &Open... + + + + + Open a Fossil repository or workspace folder + Open een Fossil archief of een werkruimtemap + + + + Ctrl+O + Ctrl+O + + + + &Close + &Sluiten + + + + + Close the current workspace + De huidige werkruimte afsluiten + + + + Clone... + Kloon... + + + + Clone a remote repository + Kloon een extern archief + + + + Push + Duw + + + + + Push changes to the remote repository + Duw de veranderingen naar het externe archief + + + + Ctrl+P + Ctrl+P + + + + Pull + Trek + + + + + Pull changes from the remote repository + Trek de veranderingen uit een extern archief + + + + Ctrl+L + Ctrl+L + + + + + Rename + Hernoemen + + + + + Rename the selected file + Hernoem het geselecteerde bestand + + + + Ctrl+R + Ctrl+R + + + + &Quit + Afsluiten + + + + Quit + Afsluiten + + + + Ctrl+Q + Ctrl+Q + + + + History + Geschiedenis + + + + + Display the version history of a file via the Fossil UI + Toon de geschiedenis van een bestand in Fossil + + + + Ctrl+H + Ctrl+H + + + + Fossil UI + Fossil UI + + + + + Starts the Fossil UI in the Web Browser + Open Fossil in de Webbrowser + + + + Open File + Open Bestand + + + + + View files as a list + Bestanden weergeven in een lijst + + + + + View Stashed Changes + Bekijk verborgen veranderingen + + + + Revert + Terugdraaien + + + + + Revert files to the last commited version + Draai de veranderingen terug naar de vorige versie + + + + Clear Log + Wis log + + + + Clears the log + Wist alle logboekregels + + + + Ctrl+K + Ctrl+K + + + + Timeline + Tijdslijn + + + + + Display the change history of the Fossil repository + Toon de tijdslijn met verandering van het Fossil archief + + + Open file + + + + + + Open the selected file + Open het geselecteerde bestand + + + + Ctrl+Return + Ctrl+Return + + + + Open Containing + Open bevattende + + + + + Open the folder containing the selected file + Open de map met het geselecteerde bestand + + + + Alt+Return + Alt+Return + + + + + Undo + Ongedaan maken + + + + + Undo the last Fossil action + Laatste Fossil actie ongedaan maken + + + + Ctrl+Z + Ctrl+Z + + + + &About... + Over... + + + + About Fuel + Over Fuel + + + + + Update + Bijwerken + + + + + Update the workspace to the latest version + Werkruimte bijwerken tot op heden + + + + Ctrl+U + Ctrl+U + + + + &Preferences... + &Instellingen... + + + + + Fuel Preferences + Fuel instellingen + + + + &Modified + &Gewijzigd + + + + Show modifed files + Toon gewijzigde bestanden + + + + &Unchanged + Origineel + + + + Show unchanged files + Toon originele bestanden + + + + Un&known + Onbe&kend + + + + Show unknown files + Toon onbekende bestanden + + + + &Ignored + Genegeerde + + + + Show ignored files + Toon genegeerde bestanden + + + + File &List + Bestanden &Lijst + + + View as files as a list + + + + + View the workspace as a list of files + Toon de werkruimte als een lijst met bestanden + + + + Open Folder + Map openen + + + + + Open the selected folder + Open de geselecteerde map + + + + + + Rename Folder + Map hernoemen + + + + + Rename the selected folder + Geselecteerde map hernoemen + + + + + Stash changes + Verberg veranderingen + + + Show the stash + + + + + + Apply Stash + Verborgen veranderingen toepassen + + + + + Apply stashed changes + Verborgen veranderingen toepassen + + + + &Stashed Changes + Verborgen veranderingen + + + View the Stash + + + + + Show the list of stashed changes + Toon de lijst met verborgen veranderingen + + + + Delete Stash + Verborgen veranderingen verwijderen + + + + Diff Stash + Verschillen met verborgen veranderingen + + + + + + + + + + + + + + + + + + + + + + + + + + Error + Fout + + + + Could not change current directory to '%0' + Kan de huidige map niet wijzigen in '%0' + + + + Open Workspace + Werkruimte openen + + + + A workspace does not exist in this folder. +Would you like to create one here? + Er bestaat geen werkruimte in deze map. +Wilt u hier een nieuwe werkruimte aanmaken? + + + + + Select Workspace Folder + Selecteer werkruimtemap + + + + + Could not change current directory + Kon de huidige map niet wijzigen. + + + + + Could not open repository. + Kon het archief niet openen. + + + + Fossil Files + Fossil bestanden + + + + Open Fossil Repository + Open Fossil archief + + + + Fossil Repositories + Fossil archieven + + + + New Fossil Repository + Nieuw Fossil archief + + + + A repository file already exists. +Repository creation aborted. + Er bestaat al een archiefbestand. +Aanmaken van een archief afgebroken. + + + + Create Workspace + Werkruimte maken + + + + Would you like to create a workspace in the same folder? + Wilt u een werkruimte maken in dezelfde map? + + + + Could not create repository. + Kon geen archief maken. + + + + Close Workspace + Sluit werkruimte + + + Are you sure want to close this workspace? + + + + + Cannot close the workspace. +Are there still uncommitted changes available? + Kon de werkruimte niet sluiten. +Zijn er nog niet verwerkte veranderingen? + + + + Could not clone the repository + Kon het archief niet klonen + + + + No workspace detected. + Geen werkruimte gevonden. + + + + Old repository schema detected. Consider running 'fossil rebuild' + Oude archiefindeling. Overweeg om 'fossil rebuild' uit te voeren + + + + Scanning Workspace... + Werkruimte analyseren... + + + + Updating... + Bijwerken... + + + + Folders + Mappen + + + + File + Bestand + + + + Modified + Gewijzigd + + + + Path + Bestandspad + + + + Status + Status + + + + Extension + Extensie + + + + Are you sure you want to close this workspace? + Deze werkruimte zeker sluiten? + + + + Edited + Bewerkt + + + + Unchanged + Onveranderd + + + + Added + Toegevoegd + + + + Deleted + Verwijderd + + + + Renamed + Hernoemd + + + + Missing + Vermist + + + + Unknown + Onbekend + + + + Stashes + Verborgen veranderingen + + + + Running Fossil + Fossil uitvoeren + + + + Could not start Fossil executable '%0' + Kon het Fossil programma '%0' niet starten + + + + Terminated + Afgesloten + + + + Fossil UI is already running + De Fossil UI is al gestart + + + + Starting Fossil browser UI. Please wait. + Bezig met het starten van de Fossil web interface... + + + + Could not start Fossil executable '%s' + Kon Fossil niet starten: '%s' + + + + + A remote repository has not been specified. +Use the preferences window to set the remote repostory location + Er is geen extern archief opgegeven. +Gebruik het instellingen scherm om de locatie van een extern archief op te geven. + + + + Commit Changes + Veranderingen toevertrouwen + + + + + Could not generate comment file + Kon het commentaarbestand niet genereren. + + + + + Add files + Bestanden toevoegen + + + + + The following files will be added. + De volgende bestanden zullen worden toegevoegd. + + + + + + + + + + + + Are you sure? + Weet u het zeker? + + + + Remove files + Verwijder bestanden + + + + The following files will be removed from the repository. + De volgende bestanden zullen worden verwijderd uit het archief. + + + + Also delete the local files + Lokale bestanden ook verwijderen + + + + Revert files + Terugdraaien veranderingen van bestanden + + + + The following files will be reverted. + De veranderingen in de volgende bestanden zullen ongedaan worden gemaakt. + + + + + New name + Nieuwe naam + + + + File '%0' already exists. +Rename aborted. + Bestand '%0' bestaat al. +Hernoemen afgebroken. + + + + The following actions will be undone. + De volgende bewerkingen zullen ongedaan worden gemaakt. + + + + Fossil version %0 + Fossil versie %0 + + + + QT version %0 + QT versie %0 + + + + About Fuel... + Over Fuel... + + + + a GUI frontend to the Fossil SCM +by Kostas Karanikolas +Released under the GNU GPL + Een GUI voor Fossil SCM +door Kostas Karanikolas +Dit werk valt onder de GNU GPL + + + + Icons by Deleket - Jojo Mendoza +Available under the CC Attribution Noncommercial No Derivative 3.0 License + Iconen door Deleket - Jojo Mendoza +Beschikbaar onder een CC Naamsvermelding-NietCommercieel-GeenAfgeleideWerken 3.0 licentie. + + + + Translations with the help of: + Vertalingen met de hulp van: + + + + The following files will be updated. + De volgende bestanden zullen worden bijgewerkt. + + + + + Cannot rename folder. + Kan de map niet hernoemen. + + + + Folder name contains invalid characters. + De naam van de map bevat ongeldige tekens. + + + + This folder exists already. + Deze map bestaat al. + + + + Renaming folder '%0' to '%1' +The following files will be moved in the repository. + Map '%0' hernoemen naar '%1' +De volgende bestanden worden verplaatst naar het archief. + + + + Also move the workspace files + Bestanden in de werkruimte ook verplaatsen + + + + Move aborted due to errors + Verplaatsen afgebroken i.v.m. foutmeldingen + + + + Creating folder '%0' + Map '%0' aanmaken + + + + Cannot make target folder '%0' + Doelmap '%0' aanmaken is mislukt + + + + Target file '%0' exists already + Doelbestand '%0' bestaat al + + + + Copying file '%0' to '%1' + Bestand kopiëren van '%0' naar '%1' + + + + Cannot copy file '%0' to '%1' + Kon bestanden niet kopiëren van '%0' naar '%1' + + + + Removing old file '%0' + Oude bestand '%0' verwijderen + + + + Source file '%0' does not exist + Bronbestand '%0' bestaat niet + + + + Cannot remove file '%0' + Kan bestand '%0' niet verwijderen + + + + Folder renamed completed. Don't forget to commit! + Map hernoemd. Vergeet niet om dit te toevertrouwen! + + + + Revert stashed files + Terugdraaien verborgen bestanden + + + + Stash Changes + Verberg veranderingen + + + + Invalid stash name + Ongeldige naam voor verborgen veranderingen + + + + This stash already exists + Deze naam voor de verborgen veranderingen bestaat al + + + + The following stashes will be applied. + De volgende verborgen veranderingen zullen worden toegepast. + + + + Delete after applying + Verwijder na toepassen + + + + Stash application aborted due to errors + Verborgen veranderingen toepassen afgebroken i.v.m. foutmeldingen + + + + + Stash deletion aborted due to errors + Verborgen veranderingen verwijderen afgebroken i.v.m. foutmeldingen + + + + Delete Stashes + Verborgen veranderingen verwijderen + + + + The following stashes will be deleted. + De volgende verborgen veranderingen zullen worden verwijderd. + + + + SettingsDialog + + + Settings + Instellingen + + + + Application + Applicatie + + + + Fossil Path + Pad naar Fossil + + + + Path to the Fossil executable. Leave blank to use the default Fossil + Pad naar het uitvoerbare bestand van Fossil. Laat leeg om de meegeleverde Fossil versie te gebruiken. + + + + + + ... + ... + + + + Graphical Diff + Graphical Diff + + + + Path to graphical diff tool + Pad naar het programma om verschillen (diff) mee te bekijken + + + + Graphical Merge + Graphical Merge + + + + Path to the graphical merge tool + Pad naar het programma waarmee we grafisch verschillen kunnen samenvoegen + + + + HTTP Port + HTTP Poort + + + + HTTP port to use for the Fossil web interface + HTTP poort dat we gebruiken voor de Fossil web interface + + + + Commit Messages + Toevertrouwingsberichten + + + + Clear the commit message history + Wis de historie van toevertrouwingsberichten + + + + Clear + Wis + + + + Web Browser + Webbrowser + + + + Web browser to use for the Fossil web interface + Webbrowser die we gebruiken om de Fossil web interface te tonen + + + + Double-click Action + Actie bij een muis dubbelklik + + + + Action to perfom when double-clicking a file + Uit te voeren actie als we dubbelklikken op een bestand + + + + Language + Taal + + + + Language for the user interface + Taalinstelling + + + + Repository + Archief + + + + Remote Url + Externe URL + + + + The remote url used to push/pull changes. +URL style user names and passwords are also supported. +For example http://username:password@server.com/fossil + Het externe archief om veranderingen heen te duwen/vandaan te trekken. +Gebruikersnaam en wachtwoord opnemen in de URL is toegestaan. +Bijvoorbeeld: http://gebruikersnaam:wachtwoord@server.com/fossil + + + + Ignore List + Negeerlijst + + + + A comma separated list of glob-style file/path patterns ignored in Fossil file operations + Een komma gescheiden lijst van glob-stijl' bestand/pad patronen die Fossil negeert bij bewerkingen + + + + Ignore CR/NL + Negeer CR/LF + + + + A comma separated list of glob-style file patterns to exclude from Fossil's CR/NL consistency checking + Een komma gescheiden lijst van glob-stijl bestand/pad patronen die Fossil negeert bij CR/LF consistentie controle. + + + + Applications + Applicaties + + + + Diff File + Diff bestand + + + + Open File + Open bestand + + + + Open Containing Folder + Open houdende map + + + + System + Systeem + + + + Internal + Intern + + + + Restart required + Herstart nodig + + + + The language change will take effect after restarting the application + De geselecteerde taal zal worden gebruikt zodra het programma wordt herstart. + + + + Select Fossil executable + Selecteer Fossil programma + + + + Select Graphical Diff application + Selecteer de applicatie om te gebruiken om de verschillen in weer te geven. + + + + Select Graphical Merge application + Selecteer de applicatie om te gebruiken om de verschillen mee samen te voegen + + + + Clear Commit Message History + Wis toevertrouwingsberichtenhistorie + + + + Are you sure you want to clear the commit message history? + Zeker de historie van toevertrouwingsberichten wissen? + + + Are you sure want to clear the commit message history? + + + + \ No newline at end of file diff --git a/manifest b/manifest index bb37610..8050c3d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fixed\sWindows\sbuild\n -D 2015-07-11T16:26:48.784 +C Merged\schanges\sfrom\sfossil-v1\n\n +D 2015-07-23T13:05:55.316 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b @@ -12,8 +12,8 @@ F debian/source/format 1064dc0ce263680c076a1005f35ec906a5cf5a32 F debian/watch 34f0921ff100a3e16a7ad84dcc303731de830a60 F dist/arch/PKGBUILD 26623327e467028a883cd13963daa36baf10dfa3 F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e -F doc/Building.txt 17b43fa23da764b5d1b828cc48c5a95e612bbd8f -F doc/Changes.txt b03302545e4a6c0b16a30d623a7627f8aef65ef6 +F doc/Building.md 149d959751ae488829e084a9f88449a08220c1d1 w doc/Building.txt +F doc/Changes.md 8fe4787ae5a12dd51e686cca08d16ef763d1e21a w doc/Changes.txt F doc/License.txt 4cc77b90af91e615a64ae04893fdffa7939db84c F ext/qtkeychain/CMakeLists.txt fc1afa05034f2765ba243ce758a7e9d6b6efe2d6 F ext/qtkeychain/COPYING d0f83c8198fdd5464d2373015b7b64ce7cae607e @@ -37,8 +37,8 @@ F ext/qtkeychain/qkeychain_export.h d756528188ef9bf3c4461ecc80048f06c362b54b F ext/qtkeychain/testclient.cpp cb1290a9584b627306a7bfdf1c02a8bbae503f5f F ext/qtkeychain/translations/qtkeychain_de.ts 0a70c8205c066c30ed8172f0670942de1fc5eede F ext/qtkeychain/translations/qtkeychain_ro.ts f16939382fd1a047b0692426bc82847347f14b32 -F fuel.pro 9c43639bbc1ec72fa377cd385f3cac560d6d944d -F intl/convert.bat efd797fce71fca57c9a1c5f963da1f83263f6e9a x +F fuel.pro b40c8488e2469eb5b22f48105a0badd72183a628 +F intl/convert.bat b51d86691d7e1ac50a33e680f10c68922143bee3 x F intl/convert.sh ac6edc8d99b575601cf9c6b85b18c9e25875b6e0 x F intl/de_DE.ts e2faceab920ac60c97bbc6fba038e261d51fc741 F intl/el_GR.ts 1b805ee57309d02059d9e3e4cb49d945f9d9ac82 @@ -46,6 +46,7 @@ F intl/en_US.ts 7917816efedf35d5f4f798d18896d7aa0cb3c71b F intl/es_ES.ts fbddd3374f7999e602536de9870ae1fef0c28ea8 F intl/fr_FR.ts 8d2c00ab00927ee5239c1d273f380bbe4cfb2464 F intl/it_IT.ts 54b962cc19ce2e86268da67cea63db53beb751af +F intl/nl_NL.ts ff9b6ae9da5b6ffacc74fc1075a14ad80ebc0429 F intl/pt_PT.ts f93bcc3df5447ab1d85407e1dec4cd68c03d2245 F intl/ru_RU.ts 74189b3ee2b30b0b47b2db5bd7c9935db84947fc F intl/update.sh 39d4561630ba6681bb27e7beadc225a31469728f x @@ -206,7 +207,7 @@ F rsrc/icons/Zoom-01.png 67ca532922e9166325c5c75fce1ca3fbb0d2b6a6 F rsrc/icons/fuel.icns 81e535004b62db801a02f3e15d0a33afc9d4070b F rsrc/icons/fuel.ico eb529ab3332a17b9302ef3e851db5b9ebce2a038 F rsrc/icons/fuel.png 40daf53b7f6bdcdd0d6aa5ef433d078ec5ea4342 -F rsrc/resources.qrc 02eb8d6d563b940167824abc136dc0516aa0e9c0 +F rsrc/resources.qrc dad2e36c06327830923d7cc7591372c130a6c055 F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056 F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597 F src/CloneDialog.cpp c341622b01d493387d6e4928018b3392d92471e8 @@ -225,7 +226,7 @@ F src/FslSettingsDialog.cpp 2531d3709f0eab66651671e3edead2ca720d07d5 F src/FslSettingsDialog.h dfe2a61884a55a74cbb9206b6f6b482b979725e7 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 -F src/MainWindow.cpp a6dffbc663a7d14e10252815650435da84c1a933 +F src/MainWindow.cpp d98c68af2fd5b0b4b6c2f292592d69a37e563215 F src/MainWindow.h c819e6a574fedcdb1bc1a261443fd0d372233555 F src/RemoteDialog.cpp 8540cc5e2e41c4127ed8a028d84691604fa6ecac F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d @@ -235,7 +236,7 @@ F src/SearchBox.cpp d4209c575baa9933e1ce5ed376e785b289a145ba F src/SearchBox.h 0c78d3a68136dab3e0e71b83ae36f22bd2688ab2 F src/Settings.cpp 258d3f466f6a125ce2b8519d6d57a312cbc44a3f F src/Settings.h 0a10b0b83fe804bdc7dac58eed06b5b6ee422055 -F src/SettingsDialog.cpp e7ac5f38b057bb545179a579e982f890d5260048 +F src/SettingsDialog.cpp 55fac64ae4f779c01c6e18911fe97c55fd396939 F src/SettingsDialog.h 5eb3ae2cbb00ab5544e1889860f5376f69fe47cd F src/Utils.cpp 6d9a08603f40fff3cb237259ecc6b1e534472d8f F src/Utils.h aa7a91ef3b4b9b0d873b2c9675403bbe928892bc @@ -253,7 +254,7 @@ F ui/MainWindow.ui 10181826a25056ed5aba2b23a7d110159be7c043 F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd F ui/SettingsDialog.ui 47b9a31e28ad523f14a1c4cd361270b6babbdf7d -P 945c7455e0fa0198d51933965cc4c332d0096a1e -R 94c0939d65ac02083adf4a26de35d271 +P c2a08cf305f24922fac8c70654d652b6477ee7b4 c2bac983bbd7ac0b30a8911f9491af593a8b8989 +R c1c65c54b74b818cfdf3fe0ff870037e U kostas -Z e283461260ace77678cb6fc02bb37725 +Z 41c62551885350cc595a7ae74cab6032 diff --git a/manifest.uuid b/manifest.uuid index 5b03105..7838ae6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c2a08cf305f24922fac8c70654d652b6477ee7b4 \ No newline at end of file +1e30709d8ed7635a10080655c65e51ac9cde2706 \ No newline at end of file diff --git a/rsrc/resources.qrc b/rsrc/resources.qrc index a2d92a2..c55adaa 100644 --- a/rsrc/resources.qrc +++ b/rsrc/resources.qrc @@ -164,5 +164,6 @@ intl/ru_RU.qm intl/pt_PT.qm intl/it_IT.qm + intl/nl_NL.qm diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 798d212..0f7fd39 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -1717,6 +1717,8 @@ void MainWindow::on_actionAbout_triggered() "emansije: pt_PT\n" "maxxlupi: it_IT\n" "Zangune: it_IT\n" + "Fly Man: nl_NL\n" + "Rick Van Lieshout: nl_NL\n" ); } diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp index 77eb523..ad39849 100644 --- a/src/SettingsDialog.cpp +++ b/src/SettingsDialog.cpp @@ -122,6 +122,7 @@ void SettingsDialog::CreateLangMap() langMap.append(LangMap("de_DE", "German (DE)")); langMap.append(LangMap("el_GR", "Greek (GR)")); langMap.append(LangMap("it_IT", "Italian (IT)")); + langMap.append(LangMap("nl_NL", "Dutch (NL)")); langMap.append(LangMap("pt_PT", "Portuguese (PT)")); langMap.append(LangMap("ru_RU", "Russian (RU)")); langMap.append(LangMap("es_ES", "Spanish (ES)"));