Skip to content

Commit 04c7c89

Browse files
FiloSpaTeamFiloSpaTeam
committed
Now before folder deletion, check if there are unexpected files and warn the user. fix #300 
1 parent 36d9fa6 commit 04c7c89

25 files changed

+770
-530
lines changed

‎localization/localization_ar_MA.ts

+31-26
Original file line numberDiff line numberDiff line change
@@ -516,14 +516,14 @@ Expire-Date: 0
516516
<message>
517517
<location filename="../src/mainwindow.ui" line="72"/>
518518
<location filename="../src/mainwindow.ui" line="75"/>
519-
<location filename="../src/mainwindow.cpp" line="1264"/>
519+
<location filename="../src/mainwindow.cpp" line="1280"/>
520520
<source>Edit</source>
521521
<translation type="unfinished"></translation>
522522
</message>
523523
<message>
524524
<location filename="../src/mainwindow.ui" line="90"/>
525525
<location filename="../src/mainwindow.ui" line="93"/>
526-
<location filename="../src/mainwindow.cpp" line="1276"/>
526+
<location filename="../src/mainwindow.cpp" line="1292"/>
527527
<source>Delete</source>
528528
<translation type="unfinished"></translation>
529529
</message>
@@ -554,7 +554,7 @@ Expire-Date: 0
554554
</message>
555555
<message>
556556
<location filename="../src/mainwindow.ui" line="179"/>
557-
<location filename="../src/mainwindow.cpp" line="1258"/>
557+
<location filename="../src/mainwindow.cpp" line="1274"/>
558558
<source>Users</source>
559559
<translation type="unfinished"></translation>
560560
</message>
@@ -630,7 +630,17 @@ p, li { white-space: pre-wrap; }
630630
<translation type="unfinished"></translation>
631631
</message>
632632
<message>
633-
<location filename="../src/mainwindow.cpp" line="1304"/>
633+
<location filename="../src/mainwindow.cpp" line="943"/>
634+
<source> and the whole content?</source>
635+
<translation type="unfinished"></translation>
636+
</message>
637+
<message>
638+
<location filename="../src/mainwindow.cpp" line="961"/>
639+
<source>Are you sure you want to delete %1%2</source>
640+
<translation type="unfinished"></translation>
641+
</message>
642+
<message>
643+
<location filename="../src/mainwindow.cpp" line="1320"/>
634644
<source>New Folder:
635645
(Will be placed in %1 )</source>
636646
<translation type="unfinished"></translation>
@@ -702,17 +712,22 @@ p, li { white-space: pre-wrap; }
702712
</message>
703713
<message>
704714
<location filename="../src/mainwindow.cpp" line="914"/>
705-
<location filename="../src/mainwindow.cpp" line="1303"/>
715+
<location filename="../src/mainwindow.cpp" line="1319"/>
706716
<source>New file</source>
707717
<translation type="unfinished"></translation>
708718
</message>
709719
<message>
710-
<location filename="../src/mainwindow.cpp" line="944"/>
720+
<location filename="../src/mainwindow.cpp" line="953"/>
721+
<source> and the whole content? &lt;br&gt;&lt;strong&gt;Attention: there are unexpected files in the given folder, check them before continue.&lt;/strong&gt;</source>
722+
<translation type="unfinished"></translation>
723+
</message>
724+
<message>
725+
<location filename="../src/mainwindow.cpp" line="960"/>
711726
<source>Delete password?</source>
712727
<translation type="unfinished"></translation>
713728
</message>
714729
<message>
715-
<location filename="../src/mainwindow.cpp" line="944"/>
730+
<location filename="../src/mainwindow.cpp" line="960"/>
716731
<source>Delete folder?</source>
717732
<translation type="unfinished"></translation>
718733
</message>
@@ -723,7 +738,7 @@ p, li { white-space: pre-wrap; }
723738
</message>
724739
<message>
725740
<location filename="../src/mainwindow.cpp" line="600"/>
726-
<location filename="../src/mainwindow.cpp" line="1404"/>
741+
<location filename="../src/mainwindow.cpp" line="1420"/>
727742
<source>Password</source>
728743
<translation type="unfinished"></translation>
729744
</message>
@@ -734,52 +749,42 @@ p, li { white-space: pre-wrap; }
734749
<translation type="unfinished"></translation>
735750
</message>
736751
<message>
737-
<location filename="../src/mainwindow.cpp" line="945"/>
738-
<source>Are you sure you want to delete %1%2?</source>
739-
<translation type="unfinished"></translation>
740-
</message>
741-
<message>
742-
<location filename="../src/mainwindow.cpp" line="947"/>
743-
<source> and whole content</source>
744-
<translation type="unfinished"></translation>
745-
</message>
746-
<message>
747-
<location filename="../src/mainwindow.cpp" line="980"/>
752+
<location filename="../src/mainwindow.cpp" line="996"/>
748753
<source>Can not get key list</source>
749754
<translation type="unfinished"></translation>
750755
</message>
751756
<message>
752-
<location filename="../src/mainwindow.cpp" line="981"/>
757+
<location filename="../src/mainwindow.cpp" line="997"/>
753758
<source>Unable to get list of available gpg keys</source>
754759
<translation type="unfinished"></translation>
755760
</message>
756761
<message>
757-
<location filename="../src/mainwindow.cpp" line="1014"/>
762+
<location filename="../src/mainwindow.cpp" line="1030"/>
758763
<source>Key not found in keyring</source>
759764
<translation type="unfinished"></translation>
760765
</message>
761766
<message>
762-
<location filename="../src/mainwindow.cpp" line="1088"/>
767+
<location filename="../src/mainwindow.cpp" line="1104"/>
763768
<source>Generating GPG key pair</source>
764769
<translation type="unfinished"></translation>
765770
</message>
766771
<message>
767-
<location filename="../src/mainwindow.cpp" line="1130"/>
772+
<location filename="../src/mainwindow.cpp" line="1146"/>
768773
<source>Profile changed to %1</source>
769774
<translation type="unfinished"></translation>
770775
</message>
771776
<message>
772-
<location filename="../src/mainwindow.cpp" line="1256"/>
777+
<location filename="../src/mainwindow.cpp" line="1272"/>
773778
<source>Add folder</source>
774779
<translation type="unfinished"></translation>
775780
</message>
776781
<message>
777-
<location filename="../src/mainwindow.cpp" line="1257"/>
782+
<location filename="../src/mainwindow.cpp" line="1273"/>
778783
<source>Add password</source>
779784
<translation type="unfinished"></translation>
780785
</message>
781786
<message>
782-
<location filename="../src/mainwindow.cpp" line="1353"/>
787+
<location filename="../src/mainwindow.cpp" line="1369"/>
783788
<source>Copied to clipboard</source>
784789
<translation type="unfinished"></translation>
785790
</message>

‎localization/localization_ca.ts

+33-20
Original file line numberDiff line numberDiff line change
@@ -537,14 +537,14 @@ Expire-Date: 0
537537
<message>
538538
<location filename="../src/mainwindow.ui" line="72"/>
539539
<location filename="../src/mainwindow.ui" line="75"/>
540-
<location filename="../src/mainwindow.cpp" line="1264"/>
540+
<location filename="../src/mainwindow.cpp" line="1280"/>
541541
<source>Edit</source>
542542
<translation>Edita</translation>
543543
</message>
544544
<message>
545545
<location filename="../src/mainwindow.ui" line="90"/>
546546
<location filename="../src/mainwindow.ui" line="93"/>
547-
<location filename="../src/mainwindow.cpp" line="1276"/>
547+
<location filename="../src/mainwindow.cpp" line="1292"/>
548548
<source>Delete</source>
549549
<translation>Suprimeix</translation>
550550
</message>
@@ -575,7 +575,7 @@ Expire-Date: 0
575575
</message>
576576
<message>
577577
<location filename="../src/mainwindow.ui" line="179"/>
578-
<location filename="../src/mainwindow.cpp" line="1258"/>
578+
<location filename="../src/mainwindow.cpp" line="1274"/>
579579
<source>Users</source>
580580
<translation>Usuaris</translation>
581581
</message>
@@ -694,7 +694,7 @@ p, li { white-space: pre-wrap; }
694694
</message>
695695
<message>
696696
<location filename="../src/mainwindow.cpp" line="600"/>
697-
<location filename="../src/mainwindow.cpp" line="1404"/>
697+
<location filename="../src/mainwindow.cpp" line="1420"/>
698698
<source>Password</source>
699699
<translation>Contrasenya</translation>
700700
</message>
@@ -750,7 +750,7 @@ p, li { white-space: pre-wrap; }
750750
</message>
751751
<message>
752752
<location filename="../src/mainwindow.cpp" line="914"/>
753-
<location filename="../src/mainwindow.cpp" line="1303"/>
753+
<location filename="../src/mainwindow.cpp" line="1319"/>
754754
<source>New file</source>
755755
<translation>Fitxer nou</translation>
756756
</message>
@@ -762,7 +762,22 @@ p, li { white-space: pre-wrap; }
762762
(s&apos;ubicarà a %1 )</translation>
763763
</message>
764764
<message>
765-
<location filename="../src/mainwindow.cpp" line="944"/>
765+
<location filename="../src/mainwindow.cpp" line="943"/>
766+
<source> and the whole content?</source>
767+
<translation type="unfinished"></translation>
768+
</message>
769+
<message>
770+
<location filename="../src/mainwindow.cpp" line="953"/>
771+
<source> and the whole content? &lt;br&gt;&lt;strong&gt;Attention: there are unexpected files in the given folder, check them before continue.&lt;/strong&gt;</source>
772+
<translation type="unfinished"></translation>
773+
</message>
774+
<message>
775+
<location filename="../src/mainwindow.cpp" line="961"/>
776+
<source>Are you sure you want to delete %1%2</source>
777+
<translation type="unfinished">Esteu segur que voleu suprimir %1%2? {1%2?}</translation>
778+
</message>
779+
<message>
780+
<location filename="../src/mainwindow.cpp" line="960"/>
766781
<source>Delete password?</source>
767782
<translation>Suprimir la contrasenya?</translation>
768783
</message>
@@ -771,64 +786,62 @@ p, li { white-space: pre-wrap; }
771786
<translation type="vanished">Esteu segur que voleu suprimir %1?</translation>
772787
</message>
773788
<message>
774-
<location filename="../src/mainwindow.cpp" line="944"/>
789+
<location filename="../src/mainwindow.cpp" line="960"/>
775790
<source>Delete folder?</source>
776791
<translation>Suprimir la carpeta?</translation>
777792
</message>
778793
<message>
779-
<location filename="../src/mainwindow.cpp" line="945"/>
780794
<source>Are you sure you want to delete %1%2?</source>
781-
<translation>Esteu segur que voleu suprimir %1%2?</translation>
795+
<translation type="vanished">Esteu segur que voleu suprimir %1%2?</translation>
782796
</message>
783797
<message>
784-
<location filename="../src/mainwindow.cpp" line="947"/>
785798
<source> and whole content</source>
786-
<translation> i tot el contingut</translation>
799+
<translation type="vanished"> i tot el contingut</translation>
787800
</message>
788801
<message>
789-
<location filename="../src/mainwindow.cpp" line="980"/>
802+
<location filename="../src/mainwindow.cpp" line="996"/>
790803
<source>Can not get key list</source>
791804
<translation>No es pot obtenir la llista de claus</translation>
792805
</message>
793806
<message>
794-
<location filename="../src/mainwindow.cpp" line="981"/>
807+
<location filename="../src/mainwindow.cpp" line="997"/>
795808
<source>Unable to get list of available gpg keys</source>
796809
<translation>No es pot obtenir la llista de claus gpg disponibles</translation>
797810
</message>
798811
<message>
799-
<location filename="../src/mainwindow.cpp" line="1014"/>
812+
<location filename="../src/mainwindow.cpp" line="1030"/>
800813
<source>Key not found in keyring</source>
801814
<translation>No s&apos;ha trobat la clau a l&apos;anell de claus</translation>
802815
</message>
803816
<message>
804-
<location filename="../src/mainwindow.cpp" line="1088"/>
817+
<location filename="../src/mainwindow.cpp" line="1104"/>
805818
<source>Generating GPG key pair</source>
806819
<translation>Generació del parell de claus GPG</translation>
807820
</message>
808821
<message>
809-
<location filename="../src/mainwindow.cpp" line="1130"/>
822+
<location filename="../src/mainwindow.cpp" line="1146"/>
810823
<source>Profile changed to %1</source>
811824
<translation>S&apos;ha canviat el perfil a %1</translation>
812825
</message>
813826
<message>
814-
<location filename="../src/mainwindow.cpp" line="1256"/>
827+
<location filename="../src/mainwindow.cpp" line="1272"/>
815828
<source>Add folder</source>
816829
<translation>Afegeix una carpeta</translation>
817830
</message>
818831
<message>
819-
<location filename="../src/mainwindow.cpp" line="1257"/>
832+
<location filename="../src/mainwindow.cpp" line="1273"/>
820833
<source>Add password</source>
821834
<translation>Afegeix una contrasenya</translation>
822835
</message>
823836
<message>
824-
<location filename="../src/mainwindow.cpp" line="1304"/>
837+
<location filename="../src/mainwindow.cpp" line="1320"/>
825838
<source>New Folder:
826839
(Will be placed in %1 )</source>
827840
<translation>Carpeta nova:
828841
(s&apos;ubicarà a %1 )</translation>
829842
</message>
830843
<message>
831-
<location filename="../src/mainwindow.cpp" line="1353"/>
844+
<location filename="../src/mainwindow.cpp" line="1369"/>
832845
<source>Copied to clipboard</source>
833846
<translation>S&apos;ha copiat al porta-retalls</translation>
834847
</message>

0 commit comments

Comments
 (0)