From 403588911e3f201f0c502f976aaac9f0903a5614 Mon Sep 17 00:00:00 2001 From: kostas Date: Wed, 4 Jun 2014 16:21:42 +0000 Subject: [PATCH] Added Russian localization (Thanks mouse166) FossilOrigin-Name: eb4cdf56ed9074850e909a18946a5f7c4c42707e --- dist/arch/PKGBUILD | 4 +- doc/Changes.txt | 14 +- fuel.pro | 1 + intl/de_DE.ts | 276 ++++++++++++++++++------------------- intl/el_GR.ts | 274 +++++++++++++++++++------------------ intl/en_US.ts | 274 +++++++++++++++++++------------------ intl/es_ES.ts | 276 ++++++++++++++++++------------------- intl/fr_FR.ts | 302 +++++++++++++++++++---------------------- manifest | 32 ++--- manifest.uuid | 2 +- rsrc/resources.qrc | 1 + src/MainWindow.cpp | 1 + src/SettingsDialog.cpp | 1 + 13 files changed, 733 insertions(+), 725 deletions(-) diff --git a/dist/arch/PKGBUILD b/dist/arch/PKGBUILD index 9a06316..d48b731 100644 --- a/dist/arch/PKGBUILD +++ b/dist/arch/PKGBUILD @@ -6,8 +6,8 @@ pkgdesc="A GUI front-end to Fossil SCM" arch=(i686 x86_64) url="http://code.google.com/p/fuel-scm/" license=('GPL2') -depends=('qt4>=4.7.0', 'qtwebkit>=2.2.2' 'fossil') -source=("http://fuel-scm.googlecode.com/files/${pkgname}-${pkgver}-test.tar.gz") +depends=('qt5>=5.2.0', 'qtwebkit>=5.2.0' 'fossil') +source=("http://fuelscm.org/files/releases/${pkgname}-${pkgver}.tar.gz") md5sums=(ce86b6879871b3e8193d9469c985899e) #generate with 'makepkg -g' diff --git a/doc/Changes.txt b/doc/Changes.txt index ddd911d..659f267 100644 --- a/doc/Changes.txt +++ b/doc/Changes.txt @@ -1,16 +1,24 @@ -Fuel V0.9.7 (2013-XX-XX) +Fuel V0.9.8 (2014-XX-XX) +============ +- Improved query handling +- Localisations: + Russian (Thanks Mouse166) + +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 +- Feature: Dropping a Fossil checkout file or workspace folder on Fuel now opens that workspace - Feature: Dropping a file on Fuel now adds that file to Fossil - Feature: Commit Dialog: Pressing Ctrl-Enter within the comment box commences the commit whereas Escape aborts it - Feature: Support for localization - Localisations: - Greek + 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) diff --git a/fuel.pro b/fuel.pro index 1c935cb..6644e58 100644 --- a/fuel.pro +++ b/fuel.pro @@ -82,4 +82,5 @@ TRANSLATIONS += \ intl/de_DE.ts \ intl/es_ES.ts \ intl/fr_FR.ts \ + intl/ru_RU.ts diff --git a/intl/de_DE.ts b/intl/de_DE.ts index d6f4cd6..50eb669 100644 --- a/intl/de_DE.ts +++ b/intl/de_DE.ts @@ -1,7 +1,6 @@ - -UTF-8 + BrowserWidget @@ -333,7 +332,7 @@ - + Rename Umbenennen @@ -388,7 +387,7 @@ Starts the Fossil UI in the Web Browser - + Starte das Fossil UI im Browser @@ -407,10 +406,6 @@ View Stashed Changes - - Starts the Fossil UI in the Web Browser - Starte das Fossil UI im Browser - Revert @@ -481,7 +476,7 @@ - + Undo Rückgängig @@ -508,7 +503,7 @@ - + Update Aktualisieren @@ -601,8 +596,8 @@ - - + + Rename Folder Ordner umbenennen @@ -624,7 +619,7 @@ - + Apply Stash Stash anwenden @@ -659,111 +654,111 @@ Stash diffen - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Error Fehler - + Could not change current directory to '%0' Konnte aktuelles Verzeichnis nicht nach '%0' verändern. - + Open Workspace Öffne Arbeitsumgebung - + A workspace does not exist in this folder. Would you like to create one here? Eine Arbeitsumgebung existiert nicht in diesem Ordner. Möchtest du hier eine erstellen? - - + + Select Workspace Folder Wähle Arbeitsumgebungsordner aus - - + + Could not change current directory Konnte aktuelles Verzeichnis nicht ändern. - - + + Could not open repository. Konnte Repository nicht öffnen - + Fossil Files - + Open Fossil Repository Öffne Fossil Repository - + Fossil Repositories - + New Fossil Repository Neues Fossil Repository - + A repository file already exists. Repository creation aborted. Eine Repositorydatei existiert bereits. Erstellung abgebrochen. - + Create Workspace Erstelle Arbeitsumgebung - + Would you like to create a workspace in the same folder? Möchtest du eine neue Arbeitsumgebung im gleichen Ordner erstellen? - + Could not create repository. Konnte Repository nicht erstellen - + Close Workspace Arbeitsumgebung schließen @@ -772,40 +767,40 @@ Erstellung abgebrochen. Bist du sicher, das du die Arbeitsumgebung schließen möchtest? - + Cannot close the workspace. Are there still uncommitted changes available? Kann Arbeitsumgebung nicht schließen. Gibt es noch nicht comittete Änderungen? - + Could not clone the repository Konnte Repository nicht klonen - + No workspace detected. Keine Arbeitsumgebung gefunden. - + Old repository schema detected. Consider running 'fossil rebuild' Altes Repository Schema erkannt. Bitte perpektivisch 'fossil rebuild' ausführen - + Scanning Workspace... Durchsuche Arbeitsumgebung - + Updating... Aktualisiere... - + Folders Ordner @@ -835,175 +830,184 @@ Bitte perpektivisch 'fossil rebuild' ausführen - + Are you sure you want to close this workspace? - + Edited - + Unchanged - + Added - + Deleted - + Renamed - + Missing - + Unknown - + Stashes Zurücksetzungen - + Running Fossil Fossil ausführen - - + Could not start Fossil executable '%0' Konnte Fossildatei '%0' nicht starten - + Terminated Beendet - + Fossil UI is already running Fossil UI läuft bereits - + Starting Fossil browser UI. Please wait. Starte Fossil Browser UI. Bitte warten - - + + Could not start Fossil executable '%s' + + + + + A remote repository has not been specified. Use the preferences window to set the remote repostory location Es wurde kein Repositorz angegeben. Benutz das Optionenfenster um den Ort des nicht lokalen Repositories auszuwählen - + Commit Changes Änderungen committen - - + + Could not generate comment file Konnte Kommentardatei nicht erstellen - - + + Add files Dateien hinzufügen - - + + The following files will be added. Die folgenden Dateien werden hinzugefügt. - - - - - - - - - + + + + + + + + + Are you sure? Bist du sicher? - + Remove files Dateien entfernen - + The following files will be removed from the repository. Die folgenden Dateien werden aus dem Repository entfernt - + Also delete the local files Auch die lokalen Dateien entfernen - + Revert files Dateien yurücksetzen - + The following files will be reverted. Die folgenden Dateien werden zurückgesetzt - - + + New name Neuer Name - + File '%0' already exists. Rename aborted. Datei '%0' existiert bereits. Umbenennung abgebrochen - + The following actions will be undone. Die folgenden Aktionen werden rückg#ängig gemacht - + Fossil version %0 Fossil version %0 - + + QT version %0 + + + + About Fuel... Über Fuel... - + a GUI frontend to the Fossil SCM by Kostas Karanikolas Released under the GNU GPL @@ -1012,148 +1016,148 @@ von Kostas Karanikolas Veröffentlicht unter der GNU GPL - + Icons by Deleket - Jojo Mendoza Available under the CC Attribution Noncommercial No Derivative 3.0 License Icons von Deleket - Jojo Mendoya Verfügbar unter CC Attribution Noncommercial No Derivative 3.0 Lizenz - + Translations with the help of: - + The following files will be updated. Die folgenden Dateien werden aktualisiert - - + + Cannot rename folder. Kann Ordner nicht umbenennen - + Folder name contains invalid characters. Ordnername enthält ungültige Zeichen - + This folder exists already. Dieser Ordner existiert bereits. - + Renaming folder '%0' to '%1' The following files will be moved in the repository. Benenne Ordner '%0' in '%1' um. Die folgenden Dateien werden in das Repository verschoben. - + Also move the workspace files Auch die Arbeitsumgebungsdateien verschieben - + Move aborted due to errors Verschieben aufgrund von Fehler abgebrochen - + Creating folder '%0' Erstelle Ordner '%0' - + Cannot make target folder '%0' Kann Zielordner '%0' nicht erstellen - + Target file '%0' exists already Zieldatei '%0' existiert bereits - + Copying file '%0' to '%1' Kopiere Datei '%0' nach '%1' - + Cannot copy file '%0' to '%1' Kann Datei '%0' nicht nach '%1' kopieren - + Removing old file '%0' Entferene alte Datei '%0' - + Source file '%0' does not exist Quelldatei '%0' existiert nicht - + Cannot remove file '%0' Kann Datei '%0' nicht entfernen - + Folder renamed completed. Don't forget to commit! Ordnerumbenennung fertig. Vergiss nicht zu comitten! - + Revert stashed files gestashte Dateien zurücksetzen - + Stash Changes Veränderungen stashen - + Invalid stash name Ungültiger Stashname - + This stash already exists Dieser Stash existiert bereits - + The following stashes will be applied. Die folgenden Stashes werden angewendet. - + Delete after applying Nach Anwendung entfernen - + Stash application aborted due to errors Anwendung der Stashes aufgrund von Fehlern abgebrochen. - - + + Stash deletion aborted due to errors Stashentfernung aufgrund von Fehlern abgebrochen - + Delete Stashes Stashes entfernen - + The following stashes will be deleted. Die folgenden Stashes werden entfernt diff --git a/intl/el_GR.ts b/intl/el_GR.ts index 6147c26..b359dad 100644 --- a/intl/el_GR.ts +++ b/intl/el_GR.ts @@ -1,7 +1,6 @@ - -UTF-8 + BrowserWidget @@ -333,7 +332,7 @@ - + Rename Μετονομασία @@ -407,10 +406,6 @@ View Stashed Changes Προβολή των στοιβών - - Starts the Fossil UI in the Web Browser - Εκκίνηση του Fossil UI μέσω του Web Browser - Revert @@ -481,7 +476,7 @@ - + Undo Αναίρεση @@ -508,7 +503,7 @@ - + Update Ενημέρωση @@ -601,8 +596,8 @@ - - + + Rename Folder Μετονομασία Φακέλου @@ -624,7 +619,7 @@ - + Apply Stash Εφαρμογή Στοίβας @@ -659,111 +654,111 @@ Σύγκριση Στοίβας - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Error Σφάλμα - + Could not change current directory to '%0' Η αλλαγή του τρέχοντος φακέλου στο '%0' δεν ήταν δυνατή - + Open Workspace Άνοιγμα Χώρου Εργασίας - + A workspace does not exist in this folder. Would you like to create one here? Δεν υπάρχει χώρος εργασίας σε αυτό το φάκελο. Θα θέλατε να δημιουργήσετε έναν εδώ; - - + + Select Workspace Folder Επιλέξτε Φάκελο Χώρου Εργασίας - - + + Could not change current directory Η αλλαγή του τρέχοντος φακέλου δεν ήταν δυνατή - - + + Could not open repository. Το άνοιγμα του αποθετηρίου δεν ήταν δυνατό. - + Fossil Files Αρχεία Fossil - + Open Fossil Repository Άνοιγμα Αποθετηρίου Fossil - + Fossil Repositories Αποθετήρια Fossil - + New Fossil Repository Νέο Αποθετήριο Fossil - + A repository file already exists. Repository creation aborted. Ένα αρχείο αποθετηρίου υπάρχει ήδη. Η δημιουργία αποθετηρίου ακυρώθηκε. - + Create Workspace Δημιουργία Χώρου Εργασίας - + Would you like to create a workspace in the same folder? Θα θέλατε να δημιουργήσετε ένα χώρο εργασίας στον ίδιο φάκελο; - + Could not create repository. Η δημιουργία αποθετηρίου δεν ήταν δυνατή. - + Close Workspace Κλείσιμο Χώρου Εργασίας @@ -772,39 +767,39 @@ Repository creation aborted. Είστε σίγουροι ότι θέλετε να κλείσετε αυτό τον χώρο εργασίας; - + Cannot close the workspace. Are there still uncommitted changes available? Το κλείσιμο του χώρου εργασίας δεν ήταν δυνατό. Μήπως υπάρχουν ακόμα αλλαγές που δεν καταχωρηθεί; - + Could not clone the repository Η αντιγραφή του αποθετηρίου δεν ήταν δυνατή - + No workspace detected. Δεν βρέθηκε χώρος εργασίας. - + Old repository schema detected. Consider running 'fossil rebuild' Εντοπίστηκε παλιό σχήμα αποθετηρίου. Εκτελέστε 'fossil rebuild' - + Scanning Workspace... Έλεγχος Χώρου Εργασίας... - + Updating... Ενημέρωση... - + Folders Φάκελοι @@ -834,175 +829,184 @@ Are there still uncommitted changes available? Προέκταση - + Are you sure you want to close this workspace? Είσαστε σίγουροι ότι θέλετε να κλείσετε αυτό τον χώρο εργασίας; - + Edited Τροποποιημένο - + Unchanged Αμετάβλητο - + Added Προσθεμένο - + Deleted Διεγραμμένο - + Renamed Μετονομασμένο - + Missing Απών - + Unknown Άγνωστο - + Stashes Στοίβες - + Running Fossil Εκτέλεση Fossil - - + Could not start Fossil executable '%0' Η εκκίνηση του εκτελέσιμου Fossil '%0' δεν ήταν δυνατή - + Terminated Διακόπηκε - + Fossil UI is already running Το UI του Fossil εκτελείται ήδη - + Starting Fossil browser UI. Please wait. Εκκίνηση του Fossil UI. Παρακαλώ περιμένετε. - - + + Could not start Fossil executable '%s' + + + + + A remote repository has not been specified. Use the preferences window to set the remote repostory location Το απομακρυσμένο αποθετήριο δεν έχει οριστεί. Χρησιμοποιήστε το παράθυρο ρυθμίσεων για να ορίσετε την τοποθεσία του - + Commit Changes Καταχώρηση Αλλαγών - - + + Could not generate comment file Η δημιουργία του αρχείου σχολίων δεν ήταν δυνατή - - + + Add files Προσθήκη αρχείων - - + + The following files will be added. Τα παρακάτω αρχεία θα προστεθούν. - - - - - - - - - + + + + + + + + + Are you sure? Είσαστε σίγουροι; - + Remove files Αφαίρεση αρχείων - + The following files will be removed from the repository. Τα παρακάτω αρχεία θα αφαιρεθούν από το αποθετήριο. - + Also delete the local files Διαγραφή των τοπικών αρχείων επίσης - + Revert files Επαναφορά αρχείων - + The following files will be reverted. Τα παρακάτω αρχεία θα επαναφερθούν. - - + + New name Νέο όνομα - + File '%0' already exists. Rename aborted. Το αρχείο '%0' υπάρχει ήδη. Η μετονομασία ακυρώθηκε. - + The following actions will be undone. Οι παρακάτω ενέργειες θα αναιρεθούν. - + Fossil version %0 Έκδοση Fossil %0 - + + QT version %0 + + + + About Fuel... Σχετικά με το Fuel... - + a GUI frontend to the Fossil SCM by Kostas Karanikolas Released under the GNU GPL @@ -1011,148 +1015,148 @@ Released under the GNU GPL Διατίθεται σύμφωνα με τους όρους του GPL - + Icons by Deleket - Jojo Mendoza Available under the CC Attribution Noncommercial No Derivative 3.0 License Εικονίδια από τον Deleket - Jojo Mendoza Διατίθεται σύμφωνα με τους όρους CC Attribution Noncommercial No Derivative 3.0 - + Translations with the help of: Μεταφράσεις με την βοήθεια των: - + The following files will be updated. Τα παρακάτω αρχεία θα ενημερωθούν. - - + + Cannot rename folder. Η μετονομασία του φακέλου δεν ήταν δυνατή. - + Folder name contains invalid characters. Το όνομα του φακέλου περιέχει μη αποδεκτούς χαρακτήρες. - + This folder exists already. Αυτός ο φάκελος υπάρχει ήδη. - + Renaming folder '%0' to '%1' The following files will be moved in the repository. Μετονομασία του φακέλου '%0' σε '%1' Τα παρακάτω αρχεία θα μετακινηθούν στο αποθετήριο. - + Also move the workspace files Μετακίνηση των αρχείων του χώρου εργασίας επίσης - + Move aborted due to errors Η μετακίνηση ακυρώθηκε λόγω σφαλμάτων - + Creating folder '%0' Δημιουργία φακέλου '%0' - + Cannot make target folder '%0' Η δημιουργία του φακέλου '%0' δεν ήταν δυνατή - + Target file '%0' exists already Το αρχείο '%0' υπάρχει ήδη - + Copying file '%0' to '%1' Αντιγραφή του αρχείου '%0' στο '%1' - + Cannot copy file '%0' to '%1' Η αντιγραφή του αρχείου από '%0' στο '%1' δεν ήταν δυνατή - + Removing old file '%0' Διαγραφή παλαιού αρχείου '%0' - + Source file '%0' does not exist Το αρχείο πηγής '%0' δεν υπάρχει - + Cannot remove file '%0' Η διαγραφή του αρχείου '%0' δεν ήταν δυνατή - + Folder renamed completed. Don't forget to commit! Η μετονομασία του φακέλου ολοκληρώθηκε. Μην ξεχάσετε να κάνετε καταχώρηση! - + Revert stashed files Επαναφορά αρχείων στοίβας - + Stash Changes Στοίβαξη Αλλαγών - + Invalid stash name Μη επιτρεπτό όνομα στοίβας - + This stash already exists Αυτή η στοίβα υπάρχει ήδη - + The following stashes will be applied. Οι παρακάτω στοίβες θα εφαρμοστούν. - + Delete after applying Διαγραφή μετά από την εφαρμογή - + Stash application aborted due to errors Η εφαρμογή της στοίβας ακυρώθηκε λόγω σφαλμάτων - - + + Stash deletion aborted due to errors Η διαγραφή της στοίβας ακυρώθηκε λόγω σφαλμάτων - + Delete Stashes Διαγραφή Στοίβων - + The following stashes will be deleted. Οι παρακάτω στοίβες θα διαγραφούν. diff --git a/intl/en_US.ts b/intl/en_US.ts index ecd09e8..eed73a5 100644 --- a/intl/en_US.ts +++ b/intl/en_US.ts @@ -1,7 +1,6 @@ - -UTF-8 + BrowserWidget @@ -333,7 +332,7 @@ - + Rename Rename @@ -407,10 +406,6 @@ View Stashed Changes View Stashed Changes - - Starts the Fossil UI in the Web Browser - Starts the Fossil UI in the Web Browser - Revert @@ -481,7 +476,7 @@ - + Undo Undo @@ -508,7 +503,7 @@ - + Update Update @@ -601,8 +596,8 @@ - - + + Rename Folder Rename Folder @@ -624,7 +619,7 @@ - + Apply Stash Apply Stash @@ -659,111 +654,111 @@ Diff Stash - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Error Error - + Could not change current directory to '%0' Could not change current directory to '%0' - + Open Workspace Open Workspace - + A workspace does not exist in this folder. Would you like to create one here? A workspace does not exist in this folder. Would you like to create one here? - - + + Select Workspace Folder Select Workspace Folder - - + + Could not change current directory Could not change current directory - - + + Could not open repository. Could not open repository. - + Fossil Files Fossil Files - + Open Fossil Repository Open Fossil Repository - + Fossil Repositories Fossil Repositories - + New Fossil Repository New Fossil Repository - + A repository file already exists. Repository creation aborted. A repository file already exists. Repository creation aborted. - + Create Workspace Create Workspace - + Would you like to create a workspace in the same folder? Would you like to create a workspace in the same folder? - + Could not create repository. Could not create repository. - + Close Workspace Close Workspace @@ -772,39 +767,39 @@ Repository creation aborted. Are you sure want to close this workspace? - + Cannot close the workspace. Are there still uncommitted changes available? Cannot close the workspace. Are there still uncommitted changes available? - + Could not clone the repository Could not clone the repository - + No workspace detected. No workspace detected. - + Old repository schema detected. Consider running 'fossil rebuild' Old repository schema detected. Consider running 'fossil rebuild' - + Scanning Workspace... Scanning Workspace... - + Updating... Updating... - + Folders Folders @@ -834,175 +829,184 @@ Are there still uncommitted changes available? Extension - + Are you sure you want to close this workspace? Are you sure you want to close this workspace? - + Edited Edited - + Unchanged Unchanged - + Added Added - + Deleted Deleted - + Renamed Renamed - + Missing Missing - + Unknown Unknown - + Stashes Stashes - + Running Fossil Running Fossil - - + Could not start Fossil executable '%0' Could not start Fossil executable '%0' - + Terminated Terminated - + Fossil UI is already running Fossil UI is already running - + Starting Fossil browser UI. Please wait. Starting Fossil browser UI. Please wait. - - + + Could not start Fossil executable '%s' + + + + + A remote repository has not been specified. Use the preferences window to set the remote repostory location A remote repository has not been specified. Use the preferences window to set the remote repostory location - + Commit Changes Commit Changes - - + + Could not generate comment file Could not generate comment file - - + + Add files Add files - - + + The following files will be added. The following files will be added. - - - - - - - - - + + + + + + + + + Are you sure? Are you sure? - + Remove files Remove files - + The following files will be removed from the repository. The following files will be removed from the repository. - + Also delete the local files Also delete the local files - + Revert files Revert files - + The following files will be reverted. The following files will be reverted. - - + + New name New name - + File '%0' already exists. Rename aborted. File '%0' already exists. Rename aborted. - + The following actions will be undone. The following actions will be undone. - + Fossil version %0 Fossil version %0 - + + QT version %0 + + + + About Fuel... About Fuel... - + a GUI frontend to the Fossil SCM by Kostas Karanikolas Released under the GNU GPL @@ -1011,148 +1015,148 @@ by Kostas Karanikolas Released under the GNU GPL - + Icons by Deleket - Jojo Mendoza Available under the CC Attribution Noncommercial No Derivative 3.0 License Icons by Deleket - Jojo Mendoza Available under the CC Attribution Noncommercial No Derivative 3.0 License - + Translations with the help of: Translations with the help of: - + The following files will be updated. The following files will be updated. - - + + Cannot rename folder. Cannot rename folder. - + Folder name contains invalid characters. Folder name contains invalid characters. - + This folder exists already. This folder exists already. - + Renaming folder '%0' to '%1' The following files will be moved in the repository. Renaming folder '%0' to '%1' The following files will be moved in the repository. - + Also move the workspace files Also move the workspace files - + Move aborted due to errors Move aborted due to errors - + Creating folder '%0' Creating folder '%0' - + Cannot make target folder '%0' Cannot make target folder '%0' - + Target file '%0' exists already Target file '%0' exists already - + Copying file '%0' to '%1' Copying file '%0' to '%1' - + Cannot copy file '%0' to '%1' Cannot copy file '%0' to '%1' - + Removing old file '%0' Removing old file '%0' - + Source file '%0' does not exist Source file '%0' does not exist - + Cannot remove file '%0' Cannot remove file '%0' - + Folder renamed completed. Don't forget to commit! Folder renamed completed. Don't forget to commit! - + Revert stashed files Revert stashed files - + Stash Changes Stash Changes - + Invalid stash name Invalid stash name - + This stash already exists This stash already exists - + The following stashes will be applied. The following stashes will be applied. - + Delete after applying Delete after applying - + Stash application aborted due to errors Stash application aborted due to errors - - + + Stash deletion aborted due to errors Stash deletion aborted due to errors - + Delete Stashes Delete Stashes - + The following stashes will be deleted. The following stashes will be deleted. diff --git a/intl/es_ES.ts b/intl/es_ES.ts index e31d704..8903959 100644 --- a/intl/es_ES.ts +++ b/intl/es_ES.ts @@ -1,7 +1,6 @@ - -UTF-8 + BrowserWidget @@ -333,7 +332,7 @@ - + Rename Renombrar @@ -388,7 +387,7 @@ Starts the Fossil UI in the Web Browser - + Iniciar la IU de Fossil en el explorador web @@ -407,10 +406,6 @@ View Stashed Changes - - Starts the Fossil UI in the Web Browser - Iniciar la IU de Fossil en el explorador web - Revert @@ -481,7 +476,7 @@ - + Undo Deshacer @@ -508,7 +503,7 @@ - + Update Actualizar @@ -601,8 +596,8 @@ - - + + Rename Folder Renombrar carpeta @@ -624,7 +619,7 @@ - + Apply Stash Aplicar lo apartado @@ -659,111 +654,111 @@ Diferencias en lo apartado - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Error Error - + Could not change current directory to '%0' No se pudo cambiar el directorio actual a %0 - + Open Workspace Abrir área de trabajo - + A workspace does not exist in this folder. Would you like to create one here? No existe un área de trabajo en esta carpeta. ¿Le gustaría crear una aquí? - - + + Select Workspace Folder Carpeta del área de trabajo seleccionada - - + + Could not change current directory No pude cambiar el directorio actual - - + + Could not open repository. No puedo abrir el depósito - + Fossil Files Archivos de Fossil - + Open Fossil Repository Abrir depósito de Fossil - + Fossil Repositories Depósitos de Fossil - + New Fossil Repository Nuevo depósito de Fossil - + A repository file already exists. Repository creation aborted. El archivo del depósito ya existe. Se ha abortado la creación del depósito. - + Create Workspace Crear área de trabajo - + Would you like to create a workspace in the same folder? ¿Le gustaría crear un área de trabajo en la misma carpeta? - + Could not create repository. No se ha podido crear un depósito. - + Close Workspace Cerrar área de trabajo. @@ -772,39 +767,39 @@ Se ha abortado la creación del depósito. ¿Está seguro que quiere cerrar el área de trabajo? - + Cannot close the workspace. Are there still uncommitted changes available? No puedo cerrar el área de trabajo. ¿Hay aún disponibles cambios sin entregar? - + Could not clone the repository No se pudo clonar el depósito - + No workspace detected. No se detectó área de trabajo - + Old repository schema detected. Consider running 'fossil rebuild' Se detectó el esquema viejo del depósito. Considere ejecutar 'fossil rebuild' - + Scanning Workspace... Explorando el área de trabajo - + Updating... Actualizando... - + Folders Carpetas @@ -834,175 +829,184 @@ Are there still uncommitted changes available? Extensión - + Are you sure you want to close this workspace? - + Edited Editado - + Unchanged No modificado - + Added Añadido - + Deleted Eliminado - + Renamed Renombrado - + Missing Faltante - + Unknown Desconocido - + Stashes Apartados - + Running Fossil Ejecutando Fossil - - + Could not start Fossil executable '%0' No se pudo iniciar el ejecutable de Fossil %0 - + Terminated Terminado - + Fossil UI is already running La IU de Fossil ya está funcionando - + Starting Fossil browser UI. Please wait. Iniciando el explorador de la IU de Fossil. Espere por favor. - - + + Could not start Fossil executable '%s' + + + + + A remote repository has not been specified. Use the preferences window to set the remote repostory location No se ha especificado un depósito remoto. Use la ventana de preferencias para establecer la ubicación del depósito remoto. - + Commit Changes Entregar Cambios - - + + Could not generate comment file No se pudo generar el archivo de comentarios - - + + Add files Añadir archivos - - + + The following files will be added. Los siguientes archivos serán añadidos - - - - - - - - - + + + + + + + + + Are you sure? ¿Está usted seguro? - + Remove files Quitar archivos - + The following files will be removed from the repository. Se quitarán los siguientes archivos del depósito - + Also delete the local files También elimine los archivos locales - + Revert files Revertir archivos - + The following files will be reverted. Se revertirán los siguientes archivos - - + + New name Nuevo nombre - + File '%0' already exists. Rename aborted. El archivo '%0' ya existe. Se abortó el renombrado. - + The following actions will be undone. Se desharán las siguientes acciones. - + Fossil version %0 La versión de Fossil es %0 - + + QT version %0 + + + + About Fuel... Sobre Fuel... - + a GUI frontend to the Fossil SCM by Kostas Karanikolas Released under the GNU GPL @@ -1011,148 +1015,148 @@ por Kostas Karanikolas Liberado bajo la licencia GNU GPL - + Icons by Deleket - Jojo Mendoza Available under the CC Attribution Noncommercial No Derivative 3.0 License Íconos por Deleket - Jojo Mendoza Disponbile bajo la Licencia de Reconocimiento de Creación Colectiva 3.0 CC sin derivados comerciales - + Translations with the help of: Traducciones con la ayuda de: - + The following files will be updated. Se actualizarán los siguientes archivos - - + + Cannot rename folder. No puedo renombrar la carpeta - + Folder name contains invalid characters. El nombre de la carpeta contiene caracteres inválidos - + This folder exists already. Esta carpeta ya existía - + Renaming folder '%0' to '%1' The following files will be moved in the repository. Renombrando carpeta '%0' a '%1'. Los siguientes archivos serán movidos al depósito. - + Also move the workspace files También mueva los archivos del área de trabajo - + Move aborted due to errors Movida abortada por errores - + Creating folder '%0' Creando la carpeta '%0' - + Cannot make target folder '%0' No puedo hacer la carpeta destino '%0' - + Target file '%0' exists already El archivo destino '%0' ya existe - + Copying file '%0' to '%1' Copiando archivo '%0' a '%1' - + Cannot copy file '%0' to '%1' No puedo copiar el archivo '%0' a '%1' - + Removing old file '%0' Removiendo el archivo anterior '%0' - + Source file '%0' does not exist Archivo de código '%0' no existe - + Cannot remove file '%0' No se puede remover el archivo '%0' - + Folder renamed completed. Don't forget to commit! Completado el renombrado de la carpeta. ¡No olvide entregar! - + Revert stashed files Revertir archivos apartados - + Stash Changes Apartar cambios - + Invalid stash name Nombre de apartado inválido - + This stash already exists Este apartado ya existe - + The following stashes will be applied. Serán aplicados los siguientes apartados - + Delete after applying Borrar después de aplicar - + Stash application aborted due to errors Aplicación de cambios apartados fue abortada debido a errores - - + + Stash deletion aborted due to errors Abortada la eliminación de apartados debido a errores - + Delete Stashes Borrar apartados - + The following stashes will be deleted. Serán borrados los siguientes cambios apartados diff --git a/intl/fr_FR.ts b/intl/fr_FR.ts index a5957da..42ec66a 100644 --- a/intl/fr_FR.ts +++ b/intl/fr_FR.ts @@ -1,7 +1,6 @@ - -UTF-8 + BrowserWidget @@ -333,7 +332,7 @@ - + Rename Renommer @@ -407,10 +406,6 @@ View Stashed Changes Afficher les fichiers mis en réserve - - Starts the Fossil UI in the Web Browser - - Revert @@ -448,10 +443,6 @@ Display the change history of the Fossil repository Afficher l'historique des modifications du dépôt Fossil - - Open file - - @@ -481,7 +472,7 @@ - + Undo Annuler @@ -508,7 +499,7 @@ - + Update Mettre à jour @@ -579,10 +570,6 @@ File &List &Liste de fichiers - - View as files as a list - - View the workspace as a list of files @@ -601,8 +588,8 @@ - - + + Rename Folder Renommer le dossier @@ -618,13 +605,9 @@ Stash changes Mettre des modifications en réserve - - Show the stash - - - + Apply Stash Appliquer la réserve @@ -639,10 +622,6 @@ &Stashed Changes Modifications en réserve - - View the Stash - - Show the list of stashed changes @@ -659,152 +638,148 @@ Comparer la réserve - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Error Erreur - + Could not change current directory to '%0' Impossible de changer le répertoire courant vers '%0'. - + Open Workspace Ouvrir l'espace de travail - + A workspace does not exist in this folder. Would you like to create one here? Un espace de travail n'existe pas dans ce dossier. Souhaitez-vous en créer un ici ? - - + + Select Workspace Folder Sélectionner un dossier d'espace de travail - - + + Could not change current directory Impossible de changer le répertoire courant. - - + + Could not open repository. Impossible d'ouvrir le dépôt. - + Fossil Files Fichiers Fossil - + Open Fossil Repository Ouvrir un dépôt Fossil - + Fossil Repositories Dépôts Fossil - + New Fossil Repository Nouveau dépôt Fossil - + A repository file already exists. Repository creation aborted. Un fichier de dépôt existe déjà. Échec de la création du dépôt. - + Create Workspace Créer un espace de travail - + Would you like to create a workspace in the same folder? Souhaitez-vous créer un espace de travail dans le même dossier ? - + Could not create repository. Impossible de créer le dépôt. - + Close Workspace Fermer l'espace de travail - Are you sure want to close this workspace? - - - - + Cannot close the workspace. Are there still uncommitted changes available? Impossible de fermer l'espace de travail. Existe-t-il des modifications non encore livrées ? - + Could not clone the repository Impossible de cloner le dépôt. - + No workspace detected. Aucun espace de travail détecté. - + Old repository schema detected. Consider running 'fossil rebuild' Ancien format de dépôt détecté. Vous devriez exécuter 'fossil rebuild'. - + Scanning Workspace... Analyse de l'espace de travail... - + Updating... Mise à jour... - + Folders Dossiers @@ -834,175 +809,184 @@ Existe-t-il des modifications non encore livrées ? Extension - + Are you sure you want to close this workspace? Êtes-vous sûr de vouloir fermer cet espace de travail ? - + Edited Modifié - + Unchanged Inchangé - + Added Ajouté - + Deleted Supprimé - + Renamed Renommé - + Missing Manquant - + Unknown Inconnu - + Stashes Réserves - + Running Fossil Exécution de Fossil - - + Could not start Fossil executable '%0' Impossible de démarrer l'exécutable Fossil '%0'. - + Terminated Terminé - + Fossil UI is already running L'IHM Fossil est déjà en cours d'exécution. - + Starting Fossil browser UI. Please wait. Démarrage de l'IHM web Fossil. Veuillez patienter. - - + + Could not start Fossil executable '%s' + + + + + A remote repository has not been specified. Use the preferences window to set the remote repostory location Aucun dépôt distant n'a été défini. Utilisez la fenêtre de préférences pour indiquer l'emplacement du dépôt distant. - + Commit Changes Livrer des modifications - - + + Could not generate comment file Impossible de générer le fichier de commentaires. - - + + Add files Ajouter des fichiers - - + + The following files will be added. Les fichiers suivants seront ajoutés. - - - - - - - - - + + + + + + + + + Are you sure? Êtes-vous sûr ? - + Remove files Supprimer des fichiers - + The following files will be removed from the repository. Les fichiers suivants seront supprimés du dépôt. - + Also delete the local files Supprimer aussi les fichiers locaux - + Revert files Rétablir des fichiers - + The following files will be reverted. Les fichiers suivants seront rétablis. - - + + New name Nouveau nom - - File '%0' already exists. + + File '%0' already exists. Rename aborted. Le fichier '%0' existe déjà. Échec du renommage. - + The following actions will be undone. Les actions suivantes seront annulées. - + Fossil version %0 Version de Fossil %0 - + + QT version %0 + + + + About Fuel... À propos de Fuel... - + a GUI frontend to the Fossil SCM by Kostas Karanikolas Released under the GNU GPL @@ -1011,148 +995,148 @@ par Kostas Karanikolas Publié sous licence GNU GPL - + Icons by Deleket - Jojo Mendoza Available under the CC Attribution Noncommercial No Derivative 3.0 License Icônes par Deleket - Jojo Mendoza Disponible sous licence CC 3.0 Attribution - Pas d’Utilisation Commerciale - Pas de Modification - + Translations with the help of: Traductions avec l'aide de : - + The following files will be updated. Les fichiers suivants seront mis à jour. - - + + Cannot rename folder. Impossible de renommer le dossier. - + Folder name contains invalid characters. Le nom de dossier contient des caractères invalides. - + This folder exists already. Ce dossier existe déjà. - - Renaming folder '%0' to '%1' + + Renaming folder '%0' to '%1' The following files will be moved in the repository. Renommage du dossier '%0' en '%1'. Les fichiers suivants seront déplacés dans le dépôt. - + Also move the workspace files Déplacer aussi les fichiers d'espace de travail - + Move aborted due to errors Échec du déplacement du fait d'erreurs. - + Creating folder '%0' Création du dossier '%0' - + Cannot make target folder '%0' Impossible de créer le dossier cible '%0'. - + Target file '%0' exists already Le fichier cible '%0' existe déjà. - + Copying file '%0' to '%1' Copie du fichier '%0' vers '%1' - + Cannot copy file '%0' to '%1' Impossible de copier le fichier '%0' vers '%1'. - + Removing old file '%0' Suppression de l'ancien fichier '%0' - + Source file '%0' does not exist Le fichier source '%0' n'existe pas. - + Cannot remove file '%0' Impossible de supprimer le fichier '%0'. - + Folder renamed completed. Don't forget to commit! Le dossier a été renommé. N'oubliez pas de livrer ! - + Revert stashed files Rétablir les fichiers mis en réserve - + Stash Changes Mettre des modifications en réserve - + Invalid stash name Nom de réserve invalide. - + This stash already exists Cette réserve existe déjà. - + The following stashes will be applied. Les réserves suivantes seront appliquées. - + Delete after applying Supprimer après application - + Stash application aborted due to errors Échec de l'application de réserve du fait d'erreurs. - - + + Stash deletion aborted due to errors Échec de la suppression de réserve du fait d'erreurs. - + Delete Stashes Supprimer des réserves - + The following stashes will be deleted. Les réserves suivantes seront supprimées. @@ -1365,9 +1349,5 @@ Par exemple http://username:password@server.com/fossil Are you sure you want to clear the commit message history? Êtes-vous sûr de vouloir effacer l'historique des messages de livraison ? - - Are you sure want to clear the commit message history? - - diff --git a/manifest b/manifest index 62e8a73..481c8dd 100644 --- a/manifest +++ b/manifest @@ -1,18 +1,18 @@ -C Added\ssupport\sfor\smore\sfossil\squeries\n -D 2014-06-03T16:57:40.645 -F dist/arch/PKGBUILD e6e0ada3856c94748557c3f18827b83f1ae06b17 +C Added\sRussian\slocalization\s(Thanks\smouse166) +D 2014-06-04T16:21:42.958 +F dist/arch/PKGBUILD 1d72dad77767f94a6b1a018067188e61927fa564 F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e F doc/Building.txt 7c0f1060d4a08ed330058d4a3a68905c05228381 -F doc/Changes.txt a190c5c88663a52f3206f1970700fce0906c8ed9 +F doc/Changes.txt cc626cd9352d7e630c5cd0a74f35fdc6180a8bf9 F doc/License.txt 4cc77b90af91e615a64ae04893fdffa7939db84c -F fuel.pro 3b4380436f341611245c1fa8e3cf4737db5eaf5e +F fuel.pro d15cce9435cf605947ae41e53869020e90563336 F intl/convert.bat 7e878e302a8be2324fd51b9eed1aab272dbd8bbd x F intl/convert.sh 5694496585ff5f4363c90ff8b6f48e19e0b6b4aa x -F intl/de_DE.ts ca35d7eb8b7dea47d5c8e33f4605798664cd88c3 -F intl/el_GR.ts 8c0bf34cad9696c641d208578a19bb510b24e23d -F intl/en_US.ts 54dd57590d03bc4573a6603128d55eedccfb7598 -F intl/es_ES.ts 2b778aabd6e615f60ec62219e8e18bf886019e2b -F intl/fr_FR.ts 27dcc9e4aeccb71b27977606f7bb9e30db82ea53 +F intl/de_DE.ts 4acf6f379792a7e425ea143d440e8d5c01b391aa +F intl/el_GR.ts e8f071623fe4abba239525faffb40c2668213562 +F intl/en_US.ts 6e79fac7386159e54bbb0a7aa5fd0289db225fd7 +F intl/es_ES.ts e496c635422af27b481b4eef760c2423c49e2f7c +F intl/fr_FR.ts aadb20d1108405f9d8651725857457259380e7b1 F intl/update.sh b5312e108eec47f9c8cb7d6790c57335e6b52829 x F rsrc/fuel.desktop 43145556bc61f5a91b497c38a16aec44af271d29 F rsrc/fuel.rc 8e9ac966f283102c11a77cd7f936cdc09e09bd79 @@ -171,7 +171,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 cce04d202b0f833ee1057ab2aa33782c45370161 +F rsrc/resources.qrc 227b1a42d7ee792386392872d747a176b508992c F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056 F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597 F src/CloneDialog.cpp 8652480baa3f13f0f0e7df019751338c7cbeb1b5 @@ -186,9 +186,9 @@ F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2 F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 -F src/MainWindow.cpp e243d3533ae33ea98ccccabbc93e9f39dffd58ff +F src/MainWindow.cpp f5b550c638659e48dd618d99309261b828fde0e2 F src/MainWindow.h 3e0ed4d5f6a531401e0aed92d1cd0eb29543d62b -F src/SettingsDialog.cpp 5c515baf88f43bb56a150a75dab7fbf753512aeb +F src/SettingsDialog.cpp 91bf5225e85bbe5544ac10d4d1182b09b4dc4c30 F src/SettingsDialog.h 01c1f876c64f750ba8820a0d745e377acabe4921 F src/Utils.cpp caca5268e3194abe77211040bf9511a82909d2e6 F src/Utils.h 5af911147390879176e587fc60fb662490bb9e97 @@ -200,7 +200,7 @@ F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d F ui/MainWindow.ui 7ede8bbb54513e0771fdf5d5a2566d88c81b73ad F ui/SettingsDialog.ui 55aefad7145c40d936c43759789d1b50e361b020 -P 15630ec9d832cd6c843ca0896677120d34879100 -R 8395458778c27fc7be73d91dcb58ec8a +P 883a2adb3d7f604214798b5a390af759b842f710 +R 8a1fb741db6ae4ee38a84d8c83e789bf U kostas -Z ed41a7e7c4e059475d80a87419f694b9 +Z 1ae49c5eeff52fba9a6238f6204e7ba6 diff --git a/manifest.uuid b/manifest.uuid index d55ed91..8370eea 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -883a2adb3d7f604214798b5a390af759b842f710 \ No newline at end of file +eb4cdf56ed9074850e909a18946a5f7c4c42707e \ No newline at end of file diff --git a/rsrc/resources.qrc b/rsrc/resources.qrc index a24eca0..85e8d50 100644 --- a/rsrc/resources.qrc +++ b/rsrc/resources.qrc @@ -157,5 +157,6 @@ intl/de_DE.qm intl/es_ES.qm intl/fr_FR.qm + intl/ru_RU.qm diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index ac6c9b7..b159dcf 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -1986,6 +1986,7 @@ void MainWindow::on_actionAbout_triggered() "stayawake (German de_DE)\n" "djnavas (Spanish es_ES)\n" "Fringale (French fr_FR)\n" + "mouse166 (Russian ru_RU)\n" ); } diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp index 6522712..eb3470e 100644 --- a/src/SettingsDialog.cpp +++ b/src/SettingsDialog.cpp @@ -153,6 +153,7 @@ void SettingsDialog::CreateLangMap() langMap.append(LangMap("en_US", "English (US)")); langMap.append(LangMap("es_ES", "Spanish (ES)")); langMap.append(LangMap("fr_FR", "French (FR)")); + langMap.append(LangMap("ru_RU", "Russian (RU)")); } //-----------------------------------------------------------------------------