Skip to content

Commit 6e2b383

Browse files
modSpikemodSpike
authored
Merge branch 'master' into work/improveEfficiency
2 parents 441252f + a4c4a00 commit 6e2b383

22 files changed

+992
-992
lines changed

‎translations/client_ar.ts

+45-45
Original file line numberDiff line numberDiff line change
@@ -634,9 +634,9 @@ File synchronization desktop utility.</translation>
634634
<translation type="unfinished"/>
635635
</message>
636636
<message>
637-
<location filename="../src/gui/accountsettings.cpp" line="297"/>
638-
<location filename="../src/gui/accountsettings.cpp" line="336"/>
639-
<location filename="../src/gui/accountsettings.cpp" line="672"/>
637+
<location filename="../src/gui/accountsettings.cpp" line="307"/>
638+
<location filename="../src/gui/accountsettings.cpp" line="346"/>
639+
<location filename="../src/gui/accountsettings.cpp" line="682"/>
640640
<source>Cancel</source>
641641
<translation>إلغاء</translation>
642642
</message>
@@ -646,23 +646,23 @@ File synchronization desktop utility.</translation>
646646
<translation>إزالة</translation>
647647
</message>
648648
<message>
649-
<location filename="../src/gui/accountsettings.cpp" line="221"/>
650-
<location filename="../src/gui/accountsettings.cpp" line="240"/>
649+
<location filename="../src/gui/accountsettings.cpp" line="231"/>
650+
<location filename="../src/gui/accountsettings.cpp" line="250"/>
651651
<source>Choose what to sync</source>
652652
<translation>اختر المحتوى المطلوب مزامنته</translation>
653653
</message>
654654
<message>
655-
<location filename="../src/gui/accountsettings.cpp" line="179"/>
655+
<location filename="../src/gui/accountsettings.cpp" line="189"/>
656656
<source>Force sync now</source>
657657
<translation>إجراء المزامنة إجباريًا الآن</translation>
658658
</message>
659659
<message>
660-
<location filename="../src/gui/accountsettings.cpp" line="181"/>
660+
<location filename="../src/gui/accountsettings.cpp" line="191"/>
661661
<source>Restart sync</source>
662662
<translation>أعد تشغيل المزامنة</translation>
663663
</message>
664664
<message>
665-
<location filename="../src/gui/accountsettings.cpp" line="130"/>
665+
<location filename="../src/gui/accountsettings.cpp" line="140"/>
666666
<source>Remove folder sync connection</source>
667667
<translation>أزل اتصال مزامنة المجلد</translation>
668668
</message>
@@ -677,32 +677,32 @@ File synchronization desktop utility.</translation>
677677
<translation>Reconnect</translation>
678678
</message>
679679
<message>
680-
<location filename="../src/gui/accountsettings.cpp" line="135"/>
680+
<location filename="../src/gui/accountsettings.cpp" line="145"/>
681681
<source>Sync options menu</source>
682682
<translation type="unfinished"/>
683683
</message>
684684
<message>
685-
<location filename="../src/gui/accountsettings.cpp" line="141"/>
685+
<location filename="../src/gui/accountsettings.cpp" line="151"/>
686686
<source>Folder is not ready yet</source>
687687
<translation type="unfinished"/>
688688
</message>
689689
<message>
690-
<location filename="../src/gui/accountsettings.cpp" line="290"/>
690+
<location filename="../src/gui/accountsettings.cpp" line="300"/>
691691
<source>Confirm Folder Sync Connection Removal</source>
692692
<translation>أكِّد إزالة اتصال مزامنة المجلد</translation>
693693
</message>
694694
<message>
695-
<location filename="../src/gui/accountsettings.cpp" line="296"/>
695+
<location filename="../src/gui/accountsettings.cpp" line="306"/>
696696
<source>Remove Folder Sync Connection</source>
697697
<translation>أزل اتصال مزامنة المجلد</translation>
698698
</message>
699699
<message>
700-
<location filename="../src/gui/accountsettings.cpp" line="327"/>
700+
<location filename="../src/gui/accountsettings.cpp" line="337"/>
701701
<source>Disable virtual file support?</source>
702702
<translation>هل ترغب في تعطيل دعم الملف الظاهري؟</translation>
703703
</message>
704704
<message>
705-
<location filename="../src/gui/accountsettings.cpp" line="328"/>
705+
<location filename="../src/gui/accountsettings.cpp" line="338"/>
706706
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
707707

708708
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -715,47 +715,47 @@ This action will abort any currently running synchronization.</source>
715715
سيؤدي هذا الإجراء إلى إلغاء أي مزامنة قيد التشغيل في الوقت الحالي.</translation>
716716
</message>
717717
<message>
718-
<location filename="../src/gui/accountsettings.cpp" line="335"/>
718+
<location filename="../src/gui/accountsettings.cpp" line="345"/>
719719
<source>Disable support</source>
720720
<translation>تعطيل الدعم</translation>
721721
</message>
722722
<message>
723-
<location filename="../src/gui/accountsettings.cpp" line="400"/>
723+
<location filename="../src/gui/accountsettings.cpp" line="410"/>
724724
<source>Sync Running</source>
725725
<translation>المزامنة قيد التشغيل</translation>
726726
</message>
727727
<message>
728-
<location filename="../src/gui/accountsettings.cpp" line="400"/>
728+
<location filename="../src/gui/accountsettings.cpp" line="410"/>
729729
<source>The sync operation is running.&lt;br/&gt;Do you want to stop it?</source>
730730
<translation>The sync operation is running.&lt;br/&gt;Do you want to stop it?</translation>
731731
</message>
732732
<message>
733-
<location filename="../src/gui/accountsettings.cpp" line="214"/>
733+
<location filename="../src/gui/accountsettings.cpp" line="224"/>
734734
<source>Disable virtual file support</source>
735735
<translation>Disable virtual file support</translation>
736736
</message>
737737
<message>
738-
<location filename="../src/gui/accountsettings.cpp" line="200"/>
738+
<location filename="../src/gui/accountsettings.cpp" line="210"/>
739739
<source>Enable virtual file support</source>
740740
<translation>Enable virtual file support</translation>
741741
</message>
742742
<message>
743-
<location filename="../src/gui/accountsettings.cpp" line="417"/>
743+
<location filename="../src/gui/accountsettings.cpp" line="427"/>
744744
<source>Sync paused by user</source>
745745
<translation>Sync paused by user</translation>
746746
</message>
747747
<message>
748-
<location filename="../src/gui/accountsettings.cpp" line="432"/>
748+
<location filename="../src/gui/accountsettings.cpp" line="442"/>
749749
<source>Internet connection is metered</source>
750750
<translation>Internet connection is metered</translation>
751751
</message>
752752
<message>
753-
<location filename="../src/gui/accountsettings.cpp" line="433"/>
753+
<location filename="../src/gui/accountsettings.cpp" line="443"/>
754754
<source>Synchronization is paused because the Internet connection is a metered connection&lt;p&gt;Do you really want to force a Synchronization now?</source>
755755
<translation>Synchronization is paused because the Internet connection is a metered connection&lt;p&gt;Do you really want to force a Synchronization now?</translation>
756756
</message>
757757
<message>
758-
<location filename="../src/gui/accountsettings.cpp" line="457"/>
758+
<location filename="../src/gui/accountsettings.cpp" line="467"/>
759759
<source>User triggered force sync</source>
760760
<translation>User triggered force sync</translation>
761761
</message>
@@ -765,67 +765,67 @@ This action will abort any currently running synchronization.</source>
765765
<translation>تسجيل الدخول</translation>
766766
</message>
767767
<message>
768-
<location filename="../src/gui/accountsettings.cpp" line="491"/>
768+
<location filename="../src/gui/accountsettings.cpp" line="501"/>
769769
<source>Connected</source>
770770
<translation>متصل</translation>
771771
</message>
772772
<message>
773-
<location filename="../src/gui/accountsettings.cpp" line="500"/>
773+
<location filename="../src/gui/accountsettings.cpp" line="510"/>
774774
<source>Server is temporarily unavailable</source>
775775
<translation type="unfinished"/>
776776
</message>
777777
<message>
778-
<location filename="../src/gui/accountsettings.cpp" line="503"/>
778+
<location filename="../src/gui/accountsettings.cpp" line="513"/>
779779
<source>Server is currently in maintenance mode</source>
780780
<translation type="unfinished"/>
781781
</message>
782782
<message>
783-
<location filename="../src/gui/accountsettings.cpp" line="506"/>
783+
<location filename="../src/gui/accountsettings.cpp" line="516"/>
784784
<source>Signed out</source>
785785
<translation>تم تسجيل الخروج</translation>
786786
</message>
787787
<message>
788-
<location filename="../src/gui/accountsettings.cpp" line="509"/>
788+
<location filename="../src/gui/accountsettings.cpp" line="519"/>
789789
<source>Updating credentials...</source>
790790
<translation type="unfinished"/>
791791
</message>
792792
<message>
793-
<location filename="../src/gui/accountsettings.cpp" line="514"/>
793+
<location filename="../src/gui/accountsettings.cpp" line="524"/>
794794
<source>Captive portal prevents connections to the server.</source>
795795
<translation type="unfinished"/>
796796
</message>
797797
<message>
798-
<location filename="../src/gui/accountsettings.cpp" line="516"/>
798+
<location filename="../src/gui/accountsettings.cpp" line="526"/>
799799
<source>Sync is paused due to metered internet connection</source>
800800
<translation type="unfinished"/>
801801
</message>
802802
<message>
803-
<location filename="../src/gui/accountsettings.cpp" line="518"/>
803+
<location filename="../src/gui/accountsettings.cpp" line="528"/>
804804
<source>Connecting...</source>
805805
<translation>جارٍ الاتصال...</translation>
806806
</message>
807807
<message>
808-
<location filename="../src/gui/accountsettings.cpp" line="522"/>
808+
<location filename="../src/gui/accountsettings.cpp" line="532"/>
809809
<source>Server configuration error</source>
810810
<translation type="unfinished"/>
811811
</message>
812812
<message>
813-
<location filename="../src/gui/accountsettings.cpp" line="528"/>
813+
<location filename="../src/gui/accountsettings.cpp" line="538"/>
814814
<source>Disconnected</source>
815815
<translation>غير متصل</translation>
816816
</message>
817817
<message>
818-
<location filename="../src/gui/accountsettings.cpp" line="666"/>
818+
<location filename="../src/gui/accountsettings.cpp" line="676"/>
819819
<source>Confirm Account Removal</source>
820820
<translation>أكِّد إزالة الحساب</translation>
821821
</message>
822822
<message>
823-
<location filename="../src/gui/accountsettings.cpp" line="667"/>
823+
<location filename="../src/gui/accountsettings.cpp" line="677"/>
824824
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
825825
<translation>&lt;p&gt;هل ترغب حقًا في إزالة الاتصال بالحساب &lt;i&gt;%1&lt;/i&gt;؟&lt;/p&gt;&lt;p&gt;&lt;b&gt;ملاحظة:&lt;/b&gt; &lt;b&gt;لن&lt;/b&gt; يؤدي ذلك إلى حذف أي ملفات.&lt;/p&gt;</translation>
826826
</message>
827827
<message>
828-
<location filename="../src/gui/accountsettings.cpp" line="671"/>
828+
<location filename="../src/gui/accountsettings.cpp" line="681"/>
829829
<source>Remove connection</source>
830830
<translation>أزِل الاتصال</translation>
831831
</message>
@@ -835,22 +835,22 @@ This action will abort any currently running synchronization.</source>
835835
<translation>تسجيل الخروج</translation>
836836
</message>
837837
<message>
838-
<location filename="../src/gui/accountsettings.cpp" line="187"/>
838+
<location filename="../src/gui/accountsettings.cpp" line="197"/>
839839
<source>Resume sync</source>
840840
<translation>استأنف المزامنة</translation>
841841
</message>
842842
<message>
843-
<location filename="../src/gui/accountsettings.cpp" line="187"/>
843+
<location filename="../src/gui/accountsettings.cpp" line="197"/>
844844
<source>Pause sync</source>
845845
<translation>أوقف المزامنة مؤقتًا</translation>
846846
</message>
847847
<message>
848-
<location filename="../src/gui/accountsettings.cpp" line="291"/>
848+
<location filename="../src/gui/accountsettings.cpp" line="301"/>
849849
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
850850
<translation>&lt;p&gt;هل ترغب حقًا في إيقاف مزامنة المجلد &lt;i&gt;%1&lt;/i&gt;؟&lt;/p&gt;&lt;p&gt;&lt;b&gt;ملاحظة:&lt;/b&gt; &lt;b&gt;لن&lt;/b&gt; يؤدي ذلك إلى حذف أي ملفات.&lt;/p&gt;</translation>
851851
</message>
852852
<message>
853-
<location filename="../src/gui/accountsettings.cpp" line="488"/>
853+
<location filename="../src/gui/accountsettings.cpp" line="498"/>
854854
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
855855
<translation>إصدار الخادم %1 غير مدعوم! المتابعة على مسؤوليتك الخاصة.</translation>
856856
</message>
@@ -1245,11 +1245,6 @@ This means that the synchronization client might not upload local changes immedi
12451245
<source>Unsupported filesystem</source>
12461246
<translation type="unfinished"/>
12471247
</message>
1248-
<message>
1249-
<location filename="../src/gui/folderman.cpp" line="314"/>
1250-
<source>On MacOS only Apple File System is supported.</source>
1251-
<translation type="unfinished"/>
1252-
</message>
12531248
<message>
12541249
<location filename="../src/gui/folderman.cpp" line="408"/>
12551250
<source>Account disconnected or paused</source>
@@ -1320,6 +1315,11 @@ This means that the synchronization client might not upload local changes immedi
13201315
<source>The selected path does not exist!</source>
13211316
<translation>المسار المحدد غير موجود!</translation>
13221317
</message>
1318+
<message>
1319+
<location filename="../src/gui/folderman.cpp" line="314"/>
1320+
<source>On macOS, only the Apple File System is supported.</source>
1321+
<translation type="unfinished"/>
1322+
</message>
13231323
<message>
13241324
<location filename="../src/gui/folderman.cpp" line="804"/>
13251325
<source>The selected path is not a folder!</source>

0 commit comments

Comments
 (0)