diff --git a/intl/el_GR.po b/intl/el_GR.po index 6d93975..0c3e106 100644 --- a/intl/el_GR.po +++ b/intl/el_GR.po @@ -48,7 +48,7 @@ msgid "" "The password used to access the remote repository. Leave blank if not " "required" msgstr "" -"Το συνθυματικό για την πρόσβαση του απομακρυσμένου αποθετηρίου. Αφήστε το " +"Το συνθηματικό για την πρόσβαση του απομακρυσμένου αποθετηρίου. Αφήστε το " "κενό αν δεν χρειάζεται" #: ../ui/CloneDialog.ui:73 @@ -95,7 +95,7 @@ msgstr "Επιλέξετε Αποθετήριο Fossil" #: ../src/CloneDialog.cpp:87 msgctxt "CloneDialog|" msgid "This repository file already exists." -msgstr "Αυτό τό αρχείο αποθετηρίου υπάρχει ήδη." +msgstr "Αυτό το αρχείο αποθετηρίου υπάρχει ήδη." #: ../ui/CommitDialog.ui:17 msgctxt "CommitDialog|" @@ -316,12 +316,12 @@ msgstr "Ctrl+Q" #: ../ui/MainWindow.ui:497 msgctxt "MainWindow|" msgid "History" -msgstr "Ίστορικό" +msgstr "Ιστορικό" #: ../ui/MainWindow.ui:500 ../ui/MainWindow.ui:503 msgctxt "MainWindow|" -msgid "Display the version history of a file via the fossil UI" -msgstr "Έμφάνιση του ιστόρικου ενός αρχείο μέσω του fossil" +msgid "Display the version history of a file via the Fossil UI" +msgstr "Εμφάνιση του ιστορικού ενός αρχείο μέσω του Fossil" #: ../ui/MainWindow.ui:506 msgctxt "MainWindow|" @@ -370,8 +370,8 @@ msgstr "Χρονικό" #: ../ui/MainWindow.ui:566 ../ui/MainWindow.ui:569 msgctxt "MainWindow|" -msgid "Display the change history of the fossil repository" -msgstr "Εμφάνιση του χρονικού του αποθετηρίου fossil" +msgid "Display the change history of the Fossil repository" +msgstr "Εμφάνιση του χρονικού του αποθετηρίου Fossil" #: ../ui/MainWindow.ui:578 msgctxt "MainWindow|" @@ -410,8 +410,8 @@ msgstr "Αναίρεση" #: ../ui/MainWindow.ui:617 ../ui/MainWindow.ui:620 msgctxt "MainWindow|" -msgid "Undo the last fossil action" -msgstr "Αναίρεση της τελευταίας ενέργειας του fossil" +msgid "Undo the last Fossil action" +msgstr "Αναίρεση της τελευταίας ενέργειας του Fossil" #: ../ui/MainWindow.ui:623 msgctxt "MainWindow|" @@ -481,17 +481,17 @@ msgstr "Ά&γνωστα" #: ../ui/MainWindow.ui:710 msgctxt "MainWindow|" msgid "Show unknown files" -msgstr "Έμφάνιση άγνωστων αρχείων" +msgstr "Εμφάνιση άγνωστων αρχείων" #: ../ui/MainWindow.ui:718 msgctxt "MainWindow|" msgid "&Ignored" -msgstr "Αγνοημένα" +msgstr "Παραβλεπόμενα" #: ../ui/MainWindow.ui:721 msgctxt "MainWindow|" msgid "Show ignored files" -msgstr "Έμφάνιση αγνοημένων αρχείων" +msgstr "Εμφάνιση παραβλεπόμενων αρχείων" #: ../ui/MainWindow.ui:729 msgctxt "MainWindow|" @@ -602,7 +602,7 @@ msgid "" "A workspace does not exist in this folder.\n" "Would you like to create one here?" msgstr "" -"Δεν υπαρχεί χώρος εργασίας σε αυτό το φάκελο.\n" +"Δεν υπάρχει χώρος εργασίας σε αυτό το φάκελο.\n" "Θα θέλατε να δημιουργήσετε έναν εδώ;" #: ../src/MainWindow.cpp:291 @@ -677,7 +677,7 @@ msgstr "Κλείσιμο Χώρου Εργασίας" #: ../src/MainWindow.cpp:443 msgctxt "MainWindow|" msgid "Are you sure want to close this workspace?" -msgstr "Είσατε σίγουροι ότι θέλετε να κλέισετε αυτό τον χώρο εργασίας;" +msgstr "Είστε σίγουροι ότι θέλετε να κλείσετε αυτό τον χώρο εργασίας;" #: ../src/MainWindow.cpp:449 msgctxt "MainWindow|" @@ -768,18 +768,53 @@ msgctxt "MainWindow|" msgid "Starting Fossil browser UI. Please wait." msgstr "Εκκίνηση του Fossil UI. Παρακαλώ περιμένετε." +#: ../src/MainWindow.cpp:1780 +msgctxt "MainWindow|" +msgid "The following files will be added." +msgstr "Τα παρακάτω αρχεία θα προστεθούν." + +#: ../src/MainWindow.cpp:1780 ../src/MainWindow.cpp:1805 +#: ../src/MainWindow.cpp:1837 ../src/MainWindow.cpp:1913 +#: ../src/MainWindow.cpp:1956 ../src/MainWindow.cpp:2207 +#: ../src/MainWindow.cpp:2358 ../src/MainWindow.cpp:2399 +msgctxt "MainWindow|" +msgid "Are you sure?" +msgstr "Είσαστε σίγουροι;" + +#: ../src/MainWindow.cpp:1805 +msgctxt "MainWindow|" +msgid "The following files will be removed from the repository." +msgstr "Τα παρακάτω αρχεία θα αφαιρεθούν από το αποθετήριο." + +#: ../src/MainWindow.cpp:1837 +msgctxt "MainWindow|" +msgid "The following files will be reverted." +msgstr "Τα παρακάτω αρχεία θα επαναφερθούν." + #: ../src/MainWindow.cpp:1858 ../src/MainWindow.cpp:2161 msgctxt "MainWindow|" msgid "New name" msgstr "Νέο όνομα" +#: ../src/MainWindow.cpp:1913 +msgctxt "MainWindow|" +msgid "The following actions will be undone." +msgstr "Οι παρακάτω ενέργειες θα αναιρεθούν." + #: ../src/MainWindow.cpp:1937 msgctxt "MainWindow|" msgid "" "a GUI frontend to the Fossil SCM\n" "by Kostas Karanikolas\n" "Released under the GNU GPL" -msgstr "" +msgstr "ένα γραφικό περιβάλλον για το FOSSIL\n" +"από τον Κώστα Καρανικόλα\n" +"Διάθεση σύμφωνα με τους όρους του GPL" + +#: ../src/MainWindow.cpp:1956 +msgctxt "MainWindow|" +msgid "The following files will be updated." +msgstr "Τα παρακάτω αρχεία θα ενημερωθούν." #: ../src/MainWindow.cpp:2173 ../src/MainWindow.cpp:2182 msgctxt "MainWindow|" @@ -789,13 +824,22 @@ msgstr "Η μετονομασία του φακέλου δεν ήταν δυνα #: ../src/MainWindow.cpp:2173 msgctxt "MainWindow|" msgid "Folder name contains invalid characters." -msgstr "" -"Το όνομα του φακέλου περιέχει μη αποδεκτούς χαρακτήρες." +msgstr "Το όνομα του φακέλου περιέχει μη αποδεκτούς χαρακτήρες." #: ../src/MainWindow.cpp:2182 msgctxt "MainWindow|" msgid "This folder exists already." +msgstr "Αυτός ο φάκελος υπάρχει ήδη." + +#: ../src/MainWindow.cpp:2206 +#, qt-format +msgctxt "MainWindow|" +msgid "" +"Renaming folder '%0' to '%1'\n" +"The following files will be moved in the repository." msgstr "" +"Μετονομασία του φακέλου '%0' σε '%1'\n" +"Τα παρακάτω αρχεία θα μετακινηθούν στο αποθετήριο." #: ../src/MainWindow.cpp:2222 msgctxt "MainWindow|" @@ -832,6 +876,11 @@ msgid "Folder renamed completed. Don't forget to commit!" msgstr "" "Η μετονομασία του φακέλου ολοκληρώθηκε. Μην ξεχάσετε να κάνετε καταχώρηση!" +#: ../src/MainWindow.cpp:2358 +msgctxt "MainWindow|" +msgid "The following stashes will be applied." +msgstr "Οι παρακάτω στοίβες θα εφαρμοστούν." + #: ../src/MainWindow.cpp:2369 msgctxt "MainWindow|" msgid "Stash application aborted due to errors" @@ -842,6 +891,11 @@ msgctxt "MainWindow|" msgid "Stash deletion aborted due to errors" msgstr "Η διαγραφή της στοίβας ακυρώθηκε λόγω σφαλμάτων" +#: ../src/MainWindow.cpp:2399 +msgctxt "MainWindow|" +msgid "The following stashes will be deleted." +msgstr "Οι παρακάτω στοίβες θα διαγραφούν" + #: ../src/MainWindow.cpp:1096 ../src/MainWindow.cpp:1557 msgctxt "MainWindow|" msgid "Could not start Fossil executable '%s'" @@ -854,7 +908,7 @@ msgid "" "Use the preferences window to set the remote repostory location" msgstr "" "Το απομακρυσμένο αποθετήριο δεν έχει οριστεί.\n" -"Χρησημοποιήστε το παράθυρο ρυθμίσεων για να ορίσετε την τοποθεσία του" +"Χρησιμοποιήστε το παράθυρο ρυθμίσεων για να ορίσετε την τοποθεσία του" #: ../src/MainWindow.cpp:1711 msgctxt "MainWindow|" @@ -871,25 +925,11 @@ msgctxt "MainWindow|" msgid "Add files" msgstr "Προσθήκη αρχείων" -#: ../src/MainWindow.cpp:1780 -msgctxt "MainWindow|" -msgid "The following files will be added. Are you sure?" -msgstr "Τα παρακάτω αρχεία θα προστεθούν. Είσαστε σίγουροι;" - #: ../src/MainWindow.cpp:1805 msgctxt "MainWindow|" msgid "Remove files" msgstr "Αφαίρεση αρχείων" -#: ../src/MainWindow.cpp:1805 -msgctxt "MainWindow|" -msgid "" -"The following files will be removed from the repository.\n" -"Are you sure?" -msgstr "" -"Τα παρακάτω αρχεία θα αφαιρεθούν από το αποθετήριο.\n" -"Είσαστε σίγουροι;" - #: ../src/MainWindow.cpp:1805 msgctxt "MainWindow|" msgid "Also delete the local files" @@ -898,14 +938,7 @@ msgstr "Διαγραφή των τοπικών αρχείων επίσης" #: ../src/MainWindow.cpp:1837 msgctxt "MainWindow|" msgid "Revert files" -msgstr "Επαναφορά αρχέιων" - -#: ../src/MainWindow.cpp:1837 -msgctxt "MainWindow|" -msgid "The following files will be reverted. Are you sure?" -msgstr "" -"Τα παρακάτω αρχεία θα επαναφερθούν.\n" -"Είσαστε σίγουροι;" +msgstr "Επαναφορά αρχείων" #: ../src/MainWindow.cpp:1866 #, qt-format @@ -917,11 +950,6 @@ msgstr "" "Το αρχείο '%0' υπάρχει ήδη.\n" "Η μετονομασία ακυρώθηκε." -#: ../src/MainWindow.cpp:1913 -msgctxt "MainWindow|" -msgid "The following actions will be undone. Are you sure?" -msgstr "Οι παρακάτω ενέργειες θα αναιρεθούν. Είσαστε σίγουροι;" - #: ../src/MainWindow.cpp:1932 #, qt-format msgctxt "MainWindow|" @@ -936,183 +964,162 @@ msgstr "Σχετικά με το Fuel..." #: ../src/MainWindow.cpp:1941 msgctxt "MainWindow|" msgid "" -"Icon-set by Deleket - Jojo Mendoza\n" -"Available under the CC Attribution Noncommercial No Derivate 3.0 License" -msgstr "" - -#: ../src/MainWindow.cpp:1956 -msgctxt "MainWindow|" -msgid "The following files will be updated. Are you sure?" -msgstr "Τα παρακάτω αρχεία θα ενημερωθούν. Είσατε σίγουροι;" - -#: ../src/MainWindow.cpp:2206 -#, qt-format -msgctxt "MainWindow|" -msgid "" -"Renaming folder '%0' to '%1'\n" -"The following files will be moved in the repository. Are you sure?" -msgstr "Μετονομασία τοθ φακέλου '%0' σε '%1'\n" -"Τα παρακάτω αρχεία θα μετακινηθούν στο αποθετήριο. Είσαστε σίγουροι;" +"Icons by Deleket - Jojo Mendoza\n" +"Available under the CC Attribution Noncommercial No Derivative 3.0 License" +msgstr "Εικονίδια από τον Deleket - Jojo Mendoza\n" +"Διάθεση σύμφωνα με τους όρους του CC Attribution Noncommercial No Derivative 3.0 License" #: ../src/MainWindow.cpp:2209 msgctxt "MainWindow|" msgid "Also move the workspace files" -msgstr "" +msgstr "Μετακίνηση των αρχείων του χώρου εργασίας επίσης" #: ../src/MainWindow.cpp:2258 #, qt-format msgctxt "MainWindow|" msgid "Target file '%0' exists already" -msgstr "" +msgstr "Το αρχείο '%0' υπάρχει ήδη" #: ../src/MainWindow.cpp:2266 #, qt-format msgctxt "MainWindow|" msgid "Cannot copy file '%0' to '%1'" -msgstr "" +msgstr "Η αντιγραφή του αρχείου από '%0' στο '%1' δεν ήταν δυνατή" #: ../src/MainWindow.cpp:2280 #, qt-format msgctxt "MainWindow|" msgid "Source file '%0' does not exist" -msgstr "" +msgstr "Το αρχείο πηγής '%0' δεν υπάρχει" #: ../src/MainWindow.cpp:2286 #, qt-format msgctxt "MainWindow|" msgid "Cannot remove file '%0'" -msgstr "" +msgstr "Η διαγραφή του αρχείου '%0' δεν ήταν δυνατή" #: ../src/MainWindow.cpp:2320 msgctxt "MainWindow|" msgid "Revert stashed files" -msgstr "" +msgstr "Επαναφορά αρχείων στοίβας" #: ../src/MainWindow.cpp:2321 msgctxt "MainWindow|" msgid "Stash Changes" -msgstr "" +msgstr "Στοίβαξη Αλλαγών" #: ../src/MainWindow.cpp:2328 msgctxt "MainWindow|" msgid "Invalid stash name" -msgstr "" +msgstr "Μη επιτρεπτό όνομα στοίβας" #: ../src/MainWindow.cpp:2337 msgctxt "MainWindow|" msgid "This stash already exists" -msgstr "" - -#: ../src/MainWindow.cpp:2358 -msgctxt "MainWindow|" -msgid "The following stashes will be applied. Are you sure?" -msgstr "" +msgstr "Αυτή η στοίβα υπάρχει ήδη" #: ../src/MainWindow.cpp:2358 msgctxt "MainWindow|" msgid "Delete after applying" -msgstr "" +msgstr "Διαγραφή μετά από την εφαρμογή" #: ../src/MainWindow.cpp:2399 msgctxt "MainWindow|" msgid "Delete Stashes" -msgstr "" - -#: ../src/MainWindow.cpp:2399 -msgctxt "MainWindow|" -msgid "The following stashes will be deleted. Are you sure?" -msgstr "" +msgstr "Διαγραφή Στοίβων" #: ../ui/SettingsDialog.ui:17 msgctxt "SettingsDialog|" msgid "Settings" -msgstr "" +msgstr "Ρυθμίσεις" #: ../ui/SettingsDialog.ui:34 msgctxt "SettingsDialog|" msgid "Application" -msgstr "" +msgstr "Εφαρμογή" #: ../ui/SettingsDialog.ui:52 msgctxt "SettingsDialog|" msgid "Fossil Path" -msgstr "" +msgstr "Διαδρομή Fossil" #: ../ui/SettingsDialog.ui:61 msgctxt "SettingsDialog|" -msgid "Path to the fossil executable. Leave blank to use the default fossil" +msgid "Path to the Fossil executable. Leave blank to use the default Fossil" msgstr "" +"Διαδρομή στο εκτελέσιμο αρχείο του Fossil. Αφήστε το κενό για το " +"προκαθορισμένο Fossil" #: ../ui/SettingsDialog.ui:80 ../ui/SettingsDialog.ui:123 #: ../ui/SettingsDialog.ui:166 msgctxt "SettingsDialog|" msgid "..." -msgstr "" +msgstr "..." #: ../ui/SettingsDialog.ui:95 msgctxt "SettingsDialog|" msgid "Graphical Diff " -msgstr "" +msgstr "Γραφική Σύγκριση" #: ../ui/SettingsDialog.ui:104 msgctxt "SettingsDialog|" msgid "Path to graphical diff tool" -msgstr "" +msgstr "Διαδρομή στο εργαλείο γραφικής σύγκρισης" #: ../ui/SettingsDialog.ui:138 msgctxt "SettingsDialog|" msgid "Graphical Merge" -msgstr "" +msgstr "Γραφική Ένωση" #: ../ui/SettingsDialog.ui:147 msgctxt "SettingsDialog|" msgid "Path to the graphical merge tool" -msgstr "" +msgstr "Διαδρομή στο εργαλείο γραφικής ένωσης" #: ../ui/SettingsDialog.ui:181 msgctxt "SettingsDialog|" msgid "Commit Messages" -msgstr "" +msgstr "Σχόλια Καταχώρησης" #: ../ui/SettingsDialog.ui:194 msgctxt "SettingsDialog|" msgid "Clear the commit message history" -msgstr "" +msgstr "Διαγραφή ιστορικού σχολίων καταχώρησης" #: ../ui/SettingsDialog.ui:197 msgctxt "SettingsDialog|" msgid "Clear" -msgstr "" +msgstr "Καθαρισμός" #: ../ui/SettingsDialog.ui:210 msgctxt "SettingsDialog|" msgid "Double-click Action" -msgstr "" +msgstr "Ενέργεια Διπλού-κλικ" #: ../ui/SettingsDialog.ui:223 msgctxt "SettingsDialog|" msgid "Action to perfom when double-clicking a file" -msgstr "" +msgstr "Ενέργεια που θα εκτελεστεί όταν γίνεται διπλό κλικ σε ένα αρχείο" #: ../ui/SettingsDialog.ui:233 msgctxt "SettingsDialog|" msgid "Language" -msgstr "" +msgstr "Γλώσσα" #: ../ui/SettingsDialog.ui:246 msgctxt "SettingsDialog|" -msgid "Language to use for the user interface" -msgstr "" +msgid "Language for the user interface" +msgstr "Η γλώσσα του περιβάλλοντος" #: ../ui/SettingsDialog.ui:258 msgctxt "SettingsDialog|" msgid "Repository" -msgstr "" +msgstr "Αποθετήριο" #: ../ui/SettingsDialog.ui:276 msgctxt "SettingsDialog|" msgid "Remote Url" -msgstr "" +msgstr "Απομακρυσμένη Διεύθυνση" #: ../ui/SettingsDialog.ui:289 msgctxt "SettingsDialog|" @@ -1121,91 +1128,92 @@ msgid "" "URL style user names and passwords are also supported.\n" "For example http://username:password@server.com/fossil" msgstr "" +"Η απομακρυσμένη διεύθυνση που για προώθηση/λήψη αλλαγών.\n" +"Η διέυθυνση μπορεί να περιλαμβάνει όνομα χρήστη και συνθηματικό.\n" +"π.χ. http://username:password@server.com/fossil" + #: ../ui/SettingsDialog.ui:304 msgctxt "SettingsDialog|" msgid "Ignore List" -msgstr "" +msgstr "Λίστα Παράβλεψης" #: ../ui/SettingsDialog.ui:317 msgctxt "SettingsDialog|" msgid "" -"A comma separated list of glob-style file/path patterns ignored in fossil " +"A comma separated list of glob-style file/path patterns ignored in Fossil " "file operations" -msgstr "" +msgstr "Μία λίστα με μοτίβα τύπου glob, διαχωρισμένη με κόμματα, από αρχεία " +"ή διαδρομές που θα παραβλέπονται από το Fossil" #: ../ui/SettingsDialog.ui:330 msgctxt "SettingsDialog|" msgid "Ignore CR/NL" -msgstr "" +msgstr "Παράβλεψη CR/NL" #: ../ui/SettingsDialog.ui:343 msgctxt "SettingsDialog|" msgid "" -"A comma separated list of glob-style file patterns to exclude from fossil's " +"A comma separated list of glob-style file patterns to exclude from Fossil's " "CR/NL consistency checking" -msgstr "" +msgstr "Μία λίστα με μοτίβα τύπου glob, διαχωρισμένη με κόμματα, από αρχεία " +"ή διαδρομές που θα παραβλέπονται από τον έλεγχο τέλους γραμμών Fossil" #: ../src/SettingsDialog.cpp:16 msgctxt "SettingsDialog|" msgid "Applications" -msgstr "" - -#: ../src/SettingsDialog.cpp:24 -#, qt-format -msgctxt "SettingsDialog|" -msgid "Select %1" -msgstr "" +msgstr "Εφαρμογές" #: ../src/SettingsDialog.cpp:45 msgctxt "SettingsDialog|" msgid "Diff File" -msgstr "" +msgstr "Συγκριση Αρχείου" #: ../src/SettingsDialog.cpp:46 msgctxt "SettingsDialog|" msgid "Open File" -msgstr "" +msgstr "Άνοιγμα Αρχείου" #: ../src/SettingsDialog.cpp:47 msgctxt "SettingsDialog|" msgid "Open Containing Folder" -msgstr "" +msgstr "Άνοιγμα Φακέλου" #: ../src/SettingsDialog.cpp:97 msgctxt "SettingsDialog|" msgid "Restart required" -msgstr "" +msgstr "Ανάγκη Επανεκκίνησης" #: ../src/SettingsDialog.cpp:97 msgctxt "SettingsDialog|" msgid "The language change will take effect after restarting the application" -msgstr "" +msgstr "Η αλλαγή γλώσσας θα εφαρμοστεί μετά την επανεκκίνηση της εφαρμογής" #: ../src/SettingsDialog.cpp:111 msgctxt "SettingsDialog|" -msgid "Fossil executable" -msgstr "" +msgid "Select Fossil executable" +msgstr "Επιλέξετε την εφαρμογή Fossil" #: ../src/SettingsDialog.cpp:119 msgctxt "SettingsDialog|" -msgid "Graphical Diff application" -msgstr "" +msgid "Select Graphical Diff application" +msgstr "Επιλέξετε εφαρμογή γραφικής σύγκρισης" #: ../src/SettingsDialog.cpp:127 msgctxt "SettingsDialog|" -msgid "Graphical Merge application" -msgstr "" +msgid "Select Graphical Merge application" +msgstr "Επιλέξετε εφαρμογή γραφικής σύνθεσης" #: ../src/SettingsDialog.cpp:135 msgctxt "SettingsDialog|" msgid "Clear Commit Message History" -msgstr "" +msgstr "Διαγραφή ιστορικού σχολίων καταχώρησης" #: ../src/SettingsDialog.cpp:135 msgctxt "SettingsDialog|" msgid "Are you sure want to clear the commit message history?" msgstr "" +"Είσαστε σίγουροι ότι θέλετε να διαγράψετε το ιστορικό σχολίων καταχώρησης;" #: ../src/SettingsDialog.cpp:142 msgctxt "SettingsDialog|" diff --git a/intl/en_US.pot b/intl/en_US.pot index 25b4a8a..cdd2d2d 100644 --- a/intl/en_US.pot +++ b/intl/en_US.pot @@ -314,7 +314,7 @@ msgstr "" #: ../ui/MainWindow.ui:500 ../ui/MainWindow.ui:503 msgctxt "MainWindow|" -msgid "Display the version history of a file via the fossil UI" +msgid "Display the version history of a file via the Fossil UI" msgstr "" #: ../ui/MainWindow.ui:506 @@ -364,7 +364,7 @@ msgstr "" #: ../ui/MainWindow.ui:566 ../ui/MainWindow.ui:569 msgctxt "MainWindow|" -msgid "Display the change history of the fossil repository" +msgid "Display the change history of the Fossil repository" msgstr "" #: ../ui/MainWindow.ui:578 @@ -404,7 +404,7 @@ msgstr "" #: ../ui/MainWindow.ui:617 ../ui/MainWindow.ui:620 msgctxt "MainWindow|" -msgid "Undo the last fossil action" +msgid "Undo the last Fossil action" msgstr "" #: ../ui/MainWindow.ui:623 @@ -755,11 +755,39 @@ msgctxt "MainWindow|" msgid "Starting Fossil browser UI. Please wait." msgstr "" +#: ../src/MainWindow.cpp:1780 +msgctxt "MainWindow|" +msgid "The following files will be added." +msgstr "" + +#: ../src/MainWindow.cpp:1780 ../src/MainWindow.cpp:1805 +#: ../src/MainWindow.cpp:1837 ../src/MainWindow.cpp:1913 +#: ../src/MainWindow.cpp:1956 ../src/MainWindow.cpp:2207 +#: ../src/MainWindow.cpp:2358 ../src/MainWindow.cpp:2399 +msgctxt "MainWindow|" +msgid "Are you sure?" +msgstr "" + +#: ../src/MainWindow.cpp:1805 +msgctxt "MainWindow|" +msgid "The following files will be removed from the repository." +msgstr "" + +#: ../src/MainWindow.cpp:1837 +msgctxt "MainWindow|" +msgid "The following files will be reverted." +msgstr "" + #: ../src/MainWindow.cpp:1858 ../src/MainWindow.cpp:2161 msgctxt "MainWindow|" msgid "New name" msgstr "" +#: ../src/MainWindow.cpp:1913 +msgctxt "MainWindow|" +msgid "The following actions will be undone." +msgstr "" + #: ../src/MainWindow.cpp:1937 msgctxt "MainWindow|" msgid "" @@ -768,6 +796,11 @@ msgid "" "Released under the GNU GPL" msgstr "" +#: ../src/MainWindow.cpp:1956 +msgctxt "MainWindow|" +msgid "The following files will be updated." +msgstr "" + #: ../src/MainWindow.cpp:2173 ../src/MainWindow.cpp:2182 msgctxt "MainWindow|" msgid "Cannot rename folder." @@ -783,6 +816,14 @@ msgctxt "MainWindow|" msgid "This folder exists already." msgstr "" +#: ../src/MainWindow.cpp:2206 +#, qt-format +msgctxt "MainWindow|" +msgid "" +"Renaming folder '%0' to '%1'\n" +"The following files will be moved in the repository." +msgstr "" + #: ../src/MainWindow.cpp:2222 msgctxt "MainWindow|" msgid "Move aborted due to errors" @@ -817,6 +858,11 @@ msgctxt "MainWindow|" msgid "Folder renamed completed. Don't forget to commit!" msgstr "" +#: ../src/MainWindow.cpp:2358 +msgctxt "MainWindow|" +msgid "The following stashes will be applied." +msgstr "" + #: ../src/MainWindow.cpp:2369 msgctxt "MainWindow|" msgid "Stash application aborted due to errors" @@ -827,6 +873,11 @@ msgctxt "MainWindow|" msgid "Stash deletion aborted due to errors" msgstr "" +#: ../src/MainWindow.cpp:2399 +msgctxt "MainWindow|" +msgid "The following stashes will be deleted." +msgstr "" + #: ../src/MainWindow.cpp:1096 ../src/MainWindow.cpp:1557 msgctxt "MainWindow|" msgid "Could not start Fossil executable '%s'" @@ -854,23 +905,11 @@ msgctxt "MainWindow|" msgid "Add files" msgstr "" -#: ../src/MainWindow.cpp:1780 -msgctxt "MainWindow|" -msgid "The following files will be added. Are you sure?" -msgstr "" - #: ../src/MainWindow.cpp:1805 msgctxt "MainWindow|" msgid "Remove files" msgstr "" -#: ../src/MainWindow.cpp:1805 -msgctxt "MainWindow|" -msgid "" -"The following files will be removed from the repository.\n" -"Are you sure?" -msgstr "" - #: ../src/MainWindow.cpp:1805 msgctxt "MainWindow|" msgid "Also delete the local files" @@ -881,11 +920,6 @@ msgctxt "MainWindow|" msgid "Revert files" msgstr "" -#: ../src/MainWindow.cpp:1837 -msgctxt "MainWindow|" -msgid "The following files will be reverted. Are you sure?" -msgstr "" - #: ../src/MainWindow.cpp:1866 #, qt-format msgctxt "MainWindow|" @@ -894,11 +928,6 @@ msgid "" "Rename aborted." msgstr "" -#: ../src/MainWindow.cpp:1913 -msgctxt "MainWindow|" -msgid "The following actions will be undone. Are you sure?" -msgstr "" - #: ../src/MainWindow.cpp:1932 #, qt-format msgctxt "MainWindow|" @@ -913,21 +942,8 @@ msgstr "" #: ../src/MainWindow.cpp:1941 msgctxt "MainWindow|" msgid "" -"Icon-set by Deleket - Jojo Mendoza\n" -"Available under the CC Attribution Noncommercial No Derivate 3.0 License" -msgstr "" - -#: ../src/MainWindow.cpp:1956 -msgctxt "MainWindow|" -msgid "The following files will be updated. Are you sure?" -msgstr "" - -#: ../src/MainWindow.cpp:2206 -#, qt-format -msgctxt "MainWindow|" -msgid "" -"Renaming folder '%0' to '%1'\n" -"The following files will be moved in the repository. Are you sure?" +"Icons by Deleket - Jojo Mendoza\n" +"Available under the CC Attribution Noncommercial No Derivative 3.0 License" msgstr "" #: ../src/MainWindow.cpp:2209 @@ -979,11 +995,6 @@ msgctxt "MainWindow|" msgid "This stash already exists" msgstr "" -#: ../src/MainWindow.cpp:2358 -msgctxt "MainWindow|" -msgid "The following stashes will be applied. Are you sure?" -msgstr "" - #: ../src/MainWindow.cpp:2358 msgctxt "MainWindow|" msgid "Delete after applying" @@ -994,11 +1005,6 @@ msgctxt "MainWindow|" msgid "Delete Stashes" msgstr "" -#: ../src/MainWindow.cpp:2399 -msgctxt "MainWindow|" -msgid "The following stashes will be deleted. Are you sure?" -msgstr "" - #: ../ui/SettingsDialog.ui:17 msgctxt "SettingsDialog|" msgid "Settings" @@ -1016,7 +1022,7 @@ msgstr "" #: ../ui/SettingsDialog.ui:61 msgctxt "SettingsDialog|" -msgid "Path to the fossil executable. Leave blank to use the default fossil" +msgid "Path to the Fossil executable. Leave blank to use the default Fossil" msgstr "" #: ../ui/SettingsDialog.ui:80 ../ui/SettingsDialog.ui:123 @@ -1077,7 +1083,7 @@ msgstr "" #: ../ui/SettingsDialog.ui:246 msgctxt "SettingsDialog|" -msgid "Language to use for the user interface" +msgid "Language for the user interface" msgstr "" #: ../ui/SettingsDialog.ui:258 @@ -1106,7 +1112,7 @@ msgstr "" #: ../ui/SettingsDialog.ui:317 msgctxt "SettingsDialog|" msgid "" -"A comma separated list of glob-style file/path patterns ignored in fossil " +"A comma separated list of glob-style file/path patterns ignored in Fossil " "file operations" msgstr "" @@ -1118,7 +1124,7 @@ msgstr "" #: ../ui/SettingsDialog.ui:343 msgctxt "SettingsDialog|" msgid "" -"A comma separated list of glob-style file patterns to exclude from fossil's " +"A comma separated list of glob-style file patterns to exclude from Fossil's " "CR/NL consistency checking" msgstr "" @@ -1127,12 +1133,6 @@ msgctxt "SettingsDialog|" msgid "Applications" msgstr "" -#: ../src/SettingsDialog.cpp:24 -#, qt-format -msgctxt "SettingsDialog|" -msgid "Select %1" -msgstr "" - #: ../src/SettingsDialog.cpp:45 msgctxt "SettingsDialog|" msgid "Diff File" @@ -1160,17 +1160,17 @@ msgstr "" #: ../src/SettingsDialog.cpp:111 msgctxt "SettingsDialog|" -msgid "Fossil executable" +msgid "Select Fossil executable" msgstr "" #: ../src/SettingsDialog.cpp:119 msgctxt "SettingsDialog|" -msgid "Graphical Diff application" +msgid "Select Graphical Diff application" msgstr "" #: ../src/SettingsDialog.cpp:127 msgctxt "SettingsDialog|" -msgid "Graphical Merge application" +msgid "Select Graphical Merge application" msgstr "" #: ../src/SettingsDialog.cpp:135 diff --git a/manifest b/manifest index 1051f22..7caa4dd 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C -\sReorganized\ssettings\smanagement\n-\sAdded\slocalisation\sUI\n-\sAdded\sGreek\slocalisation\n-\sMessage\stext\srefactoring\n -D 2012-10-08T11:28:08.233 +C Improved\slocalization\n +D 2012-11-23T02:57:25.535 F dist/arch/PKGBUILD dd21073c035af4e6a4ecb3842c1fd7ae45c5e93d F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e F doc/Building.txt 7c0f1060d4a08ed330058d4a3a68905c05228381 @@ -7,8 +7,8 @@ F doc/Changes.txt e21c9355aaeb7643c8d6784effd2f9ebadf3a8e0 F doc/License.txt 4cc77b90af91e615a64ae04893fdffa7939db84c F fuel.pro f9053752c0ea40a7f9c90ac738a6c1689b92dfe5 F intl/convert.sh 6dfabd9c78df20b2c5c767b301cc4cd8813f442d x -F intl/el_GR.po 3e5e6ce253260b706d2867eb5a173910a4592945 -F intl/en_US.pot bcc376ed49e645b8722f3dd18e45a229de4709bc +F intl/el_GR.po 3bde7f1e9517853c725920636f0ddc16a6a38ef5 +F intl/en_US.pot c9c6830fecdf0f285121b19c47d5b98d30c8b8b7 F intl/update.sh 321b3012ea5129e9ea32e52df4f1de509e974882 x F rsrc/fuel.desktop 43145556bc61f5a91b497c38a16aec44af271d29 F rsrc/fuel.rc 8e9ac966f283102c11a77cd7f936cdc09e09bd79 @@ -178,10 +178,10 @@ F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2 F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261 -F src/MainWindow.cpp f25ef475c51053c08aa786766fac68b50d652958 +F src/MainWindow.cpp bcbfc3f7d789c5d535f6d6ab13f7ad537d6e7450 F src/MainWindow.h 3f3825cab25058666b6706b36f51269ad5f65f3e -F src/SettingsDialog.cpp 38ad760300955de5cce15d83702e1237ea3148a1 -F src/SettingsDialog.h 528e77b6e262a020e02df78017387e498abb453e +F src/SettingsDialog.cpp d11f9b2fecee3fdea737763f5e20d529e0514106 +F src/SettingsDialog.h 25ec5bc9f4fa2ce8fe7d798c382eb3a9b1fc9745 F src/Utils.cpp caca5268e3194abe77211040bf9511a82909d2e6 F src/Utils.h 5af911147390879176e587fc60fb662490bb9e97 F src/main.cpp fcd78f44b893fb9c93bbb71a2e861bd36af95f88 @@ -189,9 +189,9 @@ F tools/pack.sh d7f38a498c4e9327fecd6a6e5ac27be270d43008 x F ui/CloneDialog.ui 0fc820804df91f16506ee466a44519fdd44e468f F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d -F ui/MainWindow.ui 6ad583b6d864ccbeac8e3fd1d05cd964bc17c5f9 -F ui/SettingsDialog.ui 7cc01b1a63c59258ee4865022108852b5126db52 -P 8d881de4e52069221dd6ae38a436449fbccdac25 -R 7f1d11773b50d22aa625c653cc91f018 +F ui/MainWindow.ui 998f26c6fe75bd655cf3d4f0073e67dc0bf3b3d7 +F ui/SettingsDialog.ui 7f578450cf01d6786ff2d91a2142505192446e3f +P 05f2cac387c4a3863197f794c68421f7e04fb28e +R 36900e81ce7c07bb76cbb8b3550a53a3 U kostas -Z 67ce7969d95085d2e0a274986395168f +Z 375c8b8c0086772973bd2bb98abadbc4 diff --git a/manifest.uuid b/manifest.uuid index e9042b6..7640fcc 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -05f2cac387c4a3863197f794c68421f7e04fb28e \ No newline at end of file +ecfc352947256f0264047517f06a7e0e85b9acbd \ No newline at end of file diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 61e44eb..be2e96d 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -1777,7 +1777,7 @@ void MainWindow::on_actionAdd_triggered() if(selection.empty()) return; - if(!FileActionDialog::run(this, tr("Add files"), tr("The following files will be added. Are you sure?"), selection)) + if(!FileActionDialog::run(this, tr("Add files"), tr("The following files will be added.")+"\n"+tr("Are you sure?"), selection)) return; // Do Add @@ -1802,7 +1802,7 @@ void MainWindow::on_actionDelete_triggered() bool remove_local = false; - if(!FileActionDialog::run(this, tr("Remove files"), tr("The following files will be removed from the repository.\nAre you sure?"), all_files, tr("Also delete the local files"), &remove_local )) + if(!FileActionDialog::run(this, tr("Remove files"), tr("The following files will be removed from the repository.")+"\n"+tr("Are you sure?"), all_files, tr("Also delete the local files"), &remove_local )) return; if(!repo_files.empty()) @@ -1834,7 +1834,7 @@ void MainWindow::on_actionRevert_triggered() if(modified_files.empty()) return; - if(!FileActionDialog::run(this, tr("Revert files"), tr("The following files will be reverted. Are you sure?"), modified_files)) + if(!FileActionDialog::run(this, tr("Revert files"), tr("The following files will be reverted.")+"\n"+tr("Are you sure?"), modified_files)) return; // Do Revert @@ -1910,7 +1910,7 @@ void MainWindow::on_actionUndo_triggered() if(res.length()>0 && res[0]=="No undo or redo is available") return; - if(!FileActionDialog::run(this, tr("Undo"), tr("The following actions will be undone. Are you sure?"), res)) + if(!FileActionDialog::run(this, tr("Undo"), tr("The following actions will be undone.")+"\n"+tr("Are you sure?"), res)) return; // Do Undo @@ -1938,8 +1938,8 @@ void MainWindow::on_actionAbout_triggered() "by Kostas Karanikolas\n" "Released under the GNU GPL")+"\n\n" + fossil_ver + - tr("Icon-set by Deleket - Jojo Mendoza\n" - "Available under the CC Attribution Noncommercial No Derivate 3.0 License")); + tr("Icons by Deleket - Jojo Mendoza\n" + "Available under the CC Attribution Noncommercial No Derivative 3.0 License")); } //------------------------------------------------------------------------------ @@ -1953,7 +1953,7 @@ void MainWindow::on_actionUpdate_triggered() if(res.length()==0) return; - if(!FileActionDialog::run(this, tr("Update"), tr("The following files will be updated. Are you sure?"), res)) + if(!FileActionDialog::run(this, tr("Update"), tr("The following files will be updated.")+"\n"+tr("Are you sure?"), res)) return; // Do Update @@ -2204,7 +2204,7 @@ void MainWindow::on_actionRenameFolder_triggered() bool move_local = false; if(!FileActionDialog::run(this, tr("Rename Folder"), tr("Renaming folder '%0' to '%1'\n" - "The following files will be moved in the repository. Are you sure?").arg(old_path, new_path), + "The following files will be moved in the repository.").arg(old_path, new_path)+"\n"+tr("Are you sure?"), operations, tr("Also move the workspace files"), &move_local)) { return; @@ -2355,7 +2355,7 @@ void MainWindow::on_actionApplyStash_triggered() getStashViewSelection(stashes); bool delete_stashes = false; - if(!FileActionDialog::run(this, tr("Apply Stash"), tr("The following stashes will be applied. Are you sure?"), stashes, tr("Delete after applying"), &delete_stashes)) + if(!FileActionDialog::run(this, tr("Apply Stash"), tr("The following stashes will be applied.")+"\n"+tr("Are you sure?"), stashes, tr("Delete after applying"), &delete_stashes)) return; // Apply stashes @@ -2396,7 +2396,7 @@ void MainWindow::on_actionDeleteStash_triggered() if(stashes.empty()) return; - if(!FileActionDialog::run(this, tr("Delete Stashes"), tr("The following stashes will be deleted. Are you sure?"), stashes)) + if(!FileActionDialog::run(this, tr("Delete Stashes"), tr("The following stashes will be deleted.")+"\n"+tr("Are you sure?"), stashes)) return; // Delete stashes diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp index 26998c3..999e31a 100644 --- a/src/SettingsDialog.cpp +++ b/src/SettingsDialog.cpp @@ -21,7 +21,7 @@ QString SettingsDialog::SelectExe(QWidget *parent, const QString &description) #endif QString path = QFileDialog::getOpenFileName( parent, - tr("Select %1").arg(description), + description, QString(), filter, &filter); @@ -54,10 +54,11 @@ SettingsDialog::SettingsDialog(QWidget *parent, Settings &_settings) : foreach(const LangMap &m, langMap) ui->cmbActiveLanguage->addItem(m.name); + QString lang = settings->GetValue(FUEL_SETTING_LANGUAGE).toString(); // Select current language ui->cmbActiveLanguage->setCurrentIndex( ui->cmbActiveLanguage->findText( - LangIdToName(settings->GetValue(FUEL_SETTING_LANGUAGE).toString()))); + LangIdToName(lang))); // Repo Settings ui->lineGDiffCommand->setText(QDir::toNativeSeparators(settings->GetFossilValue(FOSSIL_SETTING_GDIFF_CMD).toString())); @@ -108,7 +109,7 @@ void SettingsDialog::on_buttonBox_accepted() //----------------------------------------------------------------------------- void SettingsDialog::on_btnSelectFossil_clicked() { - QString path = SelectExe(this, tr("Fossil executable")); + QString path = SelectExe(this, tr("Select Fossil executable")); if(!path.isEmpty()) ui->lineFossilPath->setText(QDir::toNativeSeparators(path)); } @@ -116,7 +117,7 @@ void SettingsDialog::on_btnSelectFossil_clicked() //----------------------------------------------------------------------------- void SettingsDialog::on_btnSelectFossilGDiff_clicked() { - QString path = SelectExe(this, tr("Graphical Diff application")); + QString path = SelectExe(this, tr("Select Graphical Diff application")); if(!path.isEmpty()) ui->lineGDiffCommand->setText(QDir::toNativeSeparators(path)); } @@ -124,7 +125,7 @@ void SettingsDialog::on_btnSelectFossilGDiff_clicked() //----------------------------------------------------------------------------- void SettingsDialog::on_btnSelectGMerge_clicked() { - QString path = SelectExe(this, tr("Graphical Merge application")); + QString path = SelectExe(this, tr("Select Graphical Merge application")); if(!path.isEmpty()) ui->lineGMergeCommand->setText(QDir::toNativeSeparators(path)); } @@ -191,7 +192,7 @@ Settings::Settings(bool portableMode) : store(0) if(!HasValue(FUEL_SETTING_FILE_DBLCLICK)) SetValue(FUEL_SETTING_FILE_DBLCLICK, 0); - if(!HasValue(FUEL_SETTING_LANGUAGE)) + if(!HasValue(FUEL_SETTING_LANGUAGE) && SupportsLang(QLocale::system().name())) SetValue(FUEL_SETTING_LANGUAGE, QLocale::system().name()); ApplyEnvironment(); @@ -251,3 +252,11 @@ void Settings::SetFossilValue(const QString &name, const QVariant &value) Q_ASSERT(it!=Mappings.end()); it->Value = value; } + +//----------------------------------------------------------------------------- +bool Settings::SupportsLang(const QString &langId) const +{ + QString locale_path = QString(":intl/intl/%0.qm").arg(langId); + QResource res(locale_path); + return res.isValid(); +} diff --git a/src/SettingsDialog.h b/src/SettingsDialog.h index ae63343..a84a60a 100644 --- a/src/SettingsDialog.h +++ b/src/SettingsDialog.h @@ -50,20 +50,22 @@ struct Settings typedef QMap mappings_t; - Settings(bool portableMode = false); - ~Settings(); - void ApplyEnvironment(); + Settings(bool portableMode = false); + ~Settings(); + void ApplyEnvironment(); // App configuration access - class QSettings * GetStore() { return store; } - bool HasValue(const QString &name) const; // store->contains(FUEL_SETTING_FOSSIL_PATH) - const QVariant GetValue(const QString &name); // settings.store->value - void SetValue(const QString &name, const QVariant &value); // settings.store->value + class QSettings * GetStore() { return store; } + bool HasValue(const QString &name) const; // store->contains(FUEL_SETTING_FOSSIL_PATH) + const QVariant GetValue(const QString &name); // settings.store->value + void SetValue(const QString &name, const QVariant &value); // settings.store->value // Fossil configuration access - QVariant & GetFossilValue(const QString &name); - void SetFossilValue(const QString &name, const QVariant &value); - mappings_t & GetMappings() { return Mappings; } + QVariant & GetFossilValue(const QString &name); + void SetFossilValue(const QString &name, const QVariant &value); + mappings_t & GetMappings() { return Mappings; } + + bool SupportsLang(const QString &langId) const; private: mappings_t Mappings; diff --git a/ui/MainWindow.ui b/ui/MainWindow.ui index 197af86..e5b54a6 100644 --- a/ui/MainWindow.ui +++ b/ui/MainWindow.ui @@ -4,10 +4,10 @@ - 0 - 0 - 865 - 640 + 0 + 0 + 865 + 640 @@ -15,203 +15,203 @@ - :/icons/icons/Battery-01.png:/icons/icons/Battery-01.png + :/icons/icons/Battery-01.png:/icons/icons/Battery-01.png true - - 4 - - - - - Qt::Vertical - - - - - 0 - 80 - - - - Qt::Horizontal - - - - - 20 - 0 - - - - Qt::ActionsContextMenu - - - QAbstractItemView::NoEditTriggers - - - QAbstractItemView::ExtendedSelection - - - QAbstractItemView::SelectItems - - - true - - - true - - - false - - - - - - 80 - 0 - - - - Qt::CustomContextMenu - - - QAbstractItemView::NoEditTriggers - - - true - - - QAbstractItemView::SelectRows - - - false - - - true - - - false - - - false - - - 20 - - - true - - - true - - - false - - - 30 - - - - - - 20 - 0 - - - - Qt::ActionsContextMenu - - - QAbstractItemView::NoEditTriggers - - - true - - - QAbstractItemView::SelectRows - - - false - - - true - - - false - - - false - - - true - - - false - - - - - - - 0 - 20 - - - - Qt::CustomContextMenu - - - - + + 4 + + + + + Qt::Vertical + + + + + 0 + 80 + + + + Qt::Horizontal + + + + + 20 + 0 + + + + Qt::ActionsContextMenu + + + QAbstractItemView::NoEditTriggers + + + QAbstractItemView::ExtendedSelection + + + QAbstractItemView::SelectItems + + + true + + + true + + + false + + + + + + 80 + 0 + + + + Qt::CustomContextMenu + + + QAbstractItemView::NoEditTriggers + + + true + + + QAbstractItemView::SelectRows + + + false + + + true + + + false + + + false + + + 20 + + + true + + + true + + + false + + + 30 + + + + + + 20 + 0 + + + + Qt::ActionsContextMenu + + + QAbstractItemView::NoEditTriggers + + + true + + + QAbstractItemView::SelectRows + + + false + + + true + + + false + + + false + + + true + + + false + + + + + + + 0 + 20 + + + + Qt::CustomContextMenu + + + + - - 0 - 0 - 865 - 23 - + + 0 + 0 + 865 + 23 + - - &File - - - - - - - - - - - + + &File + + + + + + + + + + + - - &Help - - + + &Help + + - - &View - - - - - - - - - + + &View + + + + + + + + + @@ -219,28 +219,28 @@ - Main Toolbar + Main Toolbar - false + false - - 32 - 32 - + + 32 + 32 + - Qt::ToolButtonIconOnly + Qt::ToolButtonIconOnly - false + false - TopToolBarArea + TopToolBarArea - false + false @@ -269,562 +269,562 @@ - - :/icons/icons/Button Refresh-01.png:/icons/icons/Button Refresh-01.png + + :/icons/icons/Button Refresh-01.png:/icons/icons/Button Refresh-01.png - Refresh + Refresh - Refresh the views + Refresh the views - Refresh the views + Refresh the views - F5 + F5 - - :/icons/icons/Save-01.png:/icons/icons/Save-01.png + + :/icons/icons/Save-01.png:/icons/icons/Save-01.png - Commit + Commit - Commit modifications + Commit modifications - Commit modifications + Commit modifications - Ctrl+M + Ctrl+M - - :/icons/icons/Document Copy-01.png:/icons/icons/Document Copy-01.png + + :/icons/icons/Document Copy-01.png:/icons/icons/Document Copy-01.png - Diff + Diff - Display the differences between the current and last committed version + Display the differences between the current and last committed version - Display the differences between the current and last committed version + Display the differences between the current and last committed version - Ctrl+D + Ctrl+D - - :/icons/icons/File New-01.png:/icons/icons/File New-01.png + + :/icons/icons/File New-01.png:/icons/icons/File New-01.png - Add + Add - Add files to the repository + Add files to the repository - Add files to the repository + Add files to the repository - Ctrl++ + Ctrl++ - - :/icons/icons/File Delete-01.png:/icons/icons/File Delete-01.png + + :/icons/icons/File Delete-01.png:/icons/icons/File Delete-01.png - Delete + Delete - Delete files from the repository + Delete files from the repository - Delete files from the repository + Delete files from the repository - Ctrl+- + Ctrl+- - - :/icons/icons/Document Blank-01.png:/icons/icons/Document Blank-01.png + + :/icons/icons/Document Blank-01.png:/icons/icons/Document Blank-01.png - &New... + &New... - Make a new Fossil repository + Make a new Fossil repository - Make a new Fossil repository + Make a new Fossil repository - Ctrl+N + Ctrl+N - - :/icons/icons/My Documents-01.png:/icons/icons/My Documents-01.png + + :/icons/icons/My Documents-01.png:/icons/icons/My Documents-01.png - &Open... + &Open... - Open a Fossil repository or workspace folder + Open a Fossil repository or workspace folder - Open a Fossil repository or workspace folder + Open a Fossil repository or workspace folder - Ctrl+O + Ctrl+O - true + true - &Close + &Close - Close the current workspace + Close the current workspace - Close the current workspace + Close the current workspace - - :/icons/icons/My Websites-01.png:/icons/icons/My Websites-01.png + + :/icons/icons/My Websites-01.png:/icons/icons/My Websites-01.png - Clone... + Clone... - - :/icons/icons/Button Upload-01.png:/icons/icons/Button Upload-01.png + + :/icons/icons/Button Upload-01.png:/icons/icons/Button Upload-01.png - Push + Push - Push changes to the remote repository + Push changes to the remote repository - Push changes to the remote repository + Push changes to the remote repository - Ctrl+P + Ctrl+P - - :/icons/icons/Button Download-01.png:/icons/icons/Button Download-01.png + + :/icons/icons/Button Download-01.png:/icons/icons/Button Download-01.png - Pull + Pull - Pull changes from the remote repository + Pull changes from the remote repository - Pull changes from the remote repository + Pull changes from the remote repository - Ctrl+L + Ctrl+L - - :/icons/icons/File Open-01.png:/icons/icons/File Open-01.png + + :/icons/icons/File Open-01.png:/icons/icons/File Open-01.png - Rename + Rename - Rename the selected file + Rename the selected file - Rename the selected file + Rename the selected file - Ctrl+R + Ctrl+R - - :/icons/icons/Button Turn Off-01.png:/icons/icons/Button Turn Off-01.png + + :/icons/icons/Button Turn Off-01.png:/icons/icons/Button Turn Off-01.png - &Quit + &Quit - Quit + Quit - Ctrl+Q + Ctrl+Q - true + true - - :/icons/icons/File History-01.png:/icons/icons/File History-01.png + + :/icons/icons/File History-01.png:/icons/icons/File History-01.png - History + History - Display the version history of a file via the fossil UI + Display the version history of a file via the Fossil UI - Display the version history of a file via the fossil UI + Display the version history of a file via the Fossil UI - Ctrl+H + Ctrl+H - true + true - - :/icons/icons/Network MAC-01.png:/icons/icons/Network MAC-01.png + + :/icons/icons/Network MAC-01.png:/icons/icons/Network MAC-01.png - Fossil UI + Fossil UI - Starts the Fosill UI in the Web Browser + Starts the Fosill UI in the Web Browser - Starts the Fosill UI in the Web Browser + Starts the Fosill UI in the Web Browser - - :/icons/icons/Document-Revert-icon.png:/icons/icons/Document-Revert-icon.png + + :/icons/icons/Document-Revert-icon.png:/icons/icons/Document-Revert-icon.png - Revert + Revert - Revert files to the last commited version + Revert files to the last commited version - Revert files to the last commited version + Revert files to the last commited version - - :/icons/icons/Text Edit.png:/icons/icons/Text Edit.png + + :/icons/icons/Text Edit.png:/icons/icons/Text Edit.png - Clear Log + Clear Log - Clears the log + Clears the log - Ctrl+K + Ctrl+K - - :/icons/icons/Clock-01.png:/icons/icons/Clock-01.png + + :/icons/icons/Clock-01.png:/icons/icons/Clock-01.png - Timeline + Timeline - Display the change history of the fossil repository + Display the change history of the Fossil repository - Display the change history of the fossil repository + Display the change history of the Fossil repository - - :/icons/icons/Document-01.png:/icons/icons/Document-01.png + + :/icons/icons/Document-01.png:/icons/icons/Document-01.png - Open file + Open file - Open the selected file + Open the selected file - Open the selected file + Open the selected file - Ctrl+Return + Ctrl+Return - - :/icons/icons/Folder-01.png:/icons/icons/Folder-01.png + + :/icons/icons/Folder-01.png:/icons/icons/Folder-01.png - Open Containing + Open Containing - Open the folder containing the selected file + Open the folder containing the selected file - Open the folder containing the selected file + Open the folder containing the selected file - Alt+Return + Alt+Return - - :/icons/icons/Button Reload-01.png:/icons/icons/Button Reload-01.png + + :/icons/icons/Button Reload-01.png:/icons/icons/Button Reload-01.png - Undo + Undo - Undo the last fossil action + Undo the last Fossil action - Undo the last fossil action + Undo the last Fossil action - Ctrl+Z + Ctrl+Z - - :/icons/icons/Battery-01.png:/icons/icons/Battery-01.png + + :/icons/icons/Battery-01.png:/icons/icons/Battery-01.png - &About... + &About... - About Fuel + About Fuel - - :/icons/icons/Button Play-01.png:/icons/icons/Button Play-01.png + + :/icons/icons/Button Play-01.png:/icons/icons/Button Play-01.png - Update + Update - Update the workspace to the latest version + Update the workspace to the latest version - Update the workspace to the latest version + Update the workspace to the latest version - Ctrl+U + Ctrl+U - - :/icons/icons/Gear-01.png:/icons/icons/Gear-01.png + + :/icons/icons/Gear-01.png:/icons/icons/Gear-01.png - &Preferences... + &Preferences... - Fuel Preferences + Fuel Preferences - Fuel Preferences + Fuel Preferences - true + true - true + true - &Modified + &Modified - Show modifed files + Show modifed files - true + true - true + true - &Unchanged + &Unchanged - Show unchanged files + Show unchanged files - true + true - true + true - Un&known + Un&known - Show unknown files + Show unknown files - true + true - &Ignored + &Ignored - Show ignored files + Show ignored files - true + true - File &List + File &List - View as files as a list + View as files as a list - View as files as a list + View as files as a list - View the workspace as a list of files + View the workspace as a list of files - - :/icons/icons/Folder-01.png:/icons/icons/Folder-01.png + + :/icons/icons/Folder-01.png:/icons/icons/Folder-01.png - Open Folder + Open Folder - Open the selected folder + Open the selected folder - Open the selected folder + Open the selected folder - - :/icons/icons/Folder Open-01.png:/icons/icons/Folder Open-01.png + + :/icons/icons/Folder Open-01.png:/icons/icons/Folder Open-01.png - Rename Folder + Rename Folder - Rename the selected folder + Rename the selected folder - Rename the selected folder + Rename the selected folder - - :/icons/icons/Folder Add-01.png:/icons/icons/Folder Add-01.png + + :/icons/icons/Folder Add-01.png:/icons/icons/Folder Add-01.png - Stash changes + Stash changes - Show the stash + Show the stash - - :/icons/icons/Folder Open-01.png:/icons/icons/Folder Open-01.png + + :/icons/icons/Folder Open-01.png:/icons/icons/Folder Open-01.png - Apply Stash + Apply Stash - Apply stashed changes + Apply stashed changes - Apply stashed changes + Apply stashed changes - true + true - &Stashed Changes + &Stashed Changes - View the Stash + View the Stash - Show the list of stashed changes + Show the list of stashed changes - - :/icons/icons/Folder Delete-01.png:/icons/icons/Folder Delete-01.png + + :/icons/icons/Folder Delete-01.png:/icons/icons/Folder Delete-01.png - Delete Stash + Delete Stash - - :/icons/icons/Folder Explorer-01.png:/icons/icons/Folder Explorer-01.png + + :/icons/icons/Folder Explorer-01.png:/icons/icons/Folder Explorer-01.png - Diff Stash + Diff Stash diff --git a/ui/SettingsDialog.ui b/ui/SettingsDialog.ui index 7ddb54e..7da9a34 100644 --- a/ui/SettingsDialog.ui +++ b/ui/SettingsDialog.ui @@ -7,10 +7,10 @@ - 0 - 0 - 560 - 300 + 0 + 0 + 560 + 300 @@ -21,342 +21,342 @@ - - - 0 - - - - - :/icons/icons/Battery-01.png:/icons/icons/Battery-01.png - - - Application - - - - QFormLayout::ExpandingFieldsGrow - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - 100 - 0 - - - - Fossil Path - - - - - - - - - Path to the fossil executable. Leave blank to use the default fossil - - - - - - - - 0 - 0 - - - - - 24 - 24 - - - - ... - - - - - - - - - - 100 - 0 - - - - Graphical Diff - - - - - - - - - Path to graphical diff tool - - - - - - - - 0 - 0 - - - - - 24 - 24 - - - - ... - - - - - - - - - - 100 - 0 - - - - Graphical Merge - - - - - - - - - Path to the graphical merge tool - - - - - - - - 0 - 0 - - - - - 24 - 24 - - - - ... - - - - - - - - - - 100 - 0 - - - - Commit Messages - - - - - - - - 0 - 0 - - - - Clear the commit message history - - - Clear - - - - - - - - 100 - 0 - - - - Double-click Action - - - - - - - - 0 - 0 - - - - Action to perfom when double-clicking a file - - - -1 - - - - - - - Language - - - - - - - - 0 - 0 - - - - Language to use for the user interface - - - - - - - - - :/icons/icons/Book-01.png:/icons/icons/Book-01.png - - - Repository - - - - QFormLayout::ExpandingFieldsGrow - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - 100 - 0 - - - - Remote Url - - - - - - - - 0 - 0 - - - - The remote url used to push/pull changes. + + + 0 + + + + + :/icons/icons/Battery-01.png:/icons/icons/Battery-01.png + + + Application + + + + QFormLayout::ExpandingFieldsGrow + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + 100 + 0 + + + + Fossil Path + + + + + + + + + Path to the Fossil executable. Leave blank to use the default Fossil + + + + + + + + 0 + 0 + + + + + 24 + 24 + + + + ... + + + + + + + + + + 100 + 0 + + + + Graphical Diff + + + + + + + + + Path to graphical diff tool + + + + + + + + 0 + 0 + + + + + 24 + 24 + + + + ... + + + + + + + + + + 100 + 0 + + + + Graphical Merge + + + + + + + + + Path to the graphical merge tool + + + + + + + + 0 + 0 + + + + + 24 + 24 + + + + ... + + + + + + + + + + 100 + 0 + + + + Commit Messages + + + + + + + + 0 + 0 + + + + Clear the commit message history + + + Clear + + + + + + + + 100 + 0 + + + + Double-click Action + + + + + + + + 0 + 0 + + + + Action to perfom when double-clicking a file + + + -1 + + + + + + + Language + + + + + + + + 0 + 0 + + + + Language for the user interface + + + + + + + + + :/icons/icons/Book-01.png:/icons/icons/Book-01.png + + + Repository + + + + QFormLayout::ExpandingFieldsGrow + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + 100 + 0 + + + + Remote Url + + + + + + + + 0 + 0 + + + + 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 - - - - - - - - 100 - 0 - - - - Ignore List - - - - - - - - 0 - 0 - - - - A comma separated list of glob-style file/path patterns ignored in fossil file operations - - - - - - - - 100 - 0 - - - - Ignore CR/NL - - - - - - - - 0 - 0 - - - - A comma separated list of glob-style file patterns to exclude from fossil's CR/NL consistency checking - - - - - - + + + + + + + + 100 + 0 + + + + Ignore List + + + + + + + + 0 + 0 + + + + A comma separated list of glob-style file/path patterns ignored in Fossil file operations + + + + + + + + 100 + 0 + + + + Ignore CR/NL + + + + + + + + 0 + 0 + + + + A comma separated list of glob-style file patterns to exclude from Fossil's CR/NL consistency checking + + + + + + - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + @@ -370,14 +370,14 @@ For example http://username:password@server.com/fossil SettingsDialog accept() - - 248 - 254 - - - 157 - 274 - + + 248 + 254 + + + 157 + 274 + @@ -386,14 +386,14 @@ For example http://username:password@server.com/fossil SettingsDialog reject() - - 316 - 260 - - - 286 - 274 - + + 316 + 260 + + + 286 + 274 +