Skip to content

Commit

Permalink
Merge remote-tracking branch 'parlance/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	lib/translations/bg.ts
#	lib/translations/he_IL.ts
  • Loading branch information
vicr123 committed Jan 8, 2024
2 parents e4f4004 + d7d28b4 commit cf13067
Show file tree
Hide file tree
Showing 23 changed files with 298 additions and 22 deletions.
12 changes: 12 additions & 0 deletions lib/translations/ar_SA.ts
Original file line number Diff line number Diff line change
Expand Up @@ -343,11 +343,13 @@
<name>tAboutDialog</name>
<message>
<location filename="../taboutdialog.ui" line="251"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_taboutdialog.h" line="227"/>
<source>SOFTWARE</source>
<translation>البرامج</translation>
</message>
<message>
<location filename="../taboutdialog.ui" line="297"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_taboutdialog.h" line="228"/>
<source>COPYRIGHT</source>
<translation>حقوق النشر</translation>
</message>
Expand Down Expand Up @@ -558,11 +560,13 @@
<name>tInputDialog</name>
<message>
<location filename="../tinputdialog.ui" line="48"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tinputdialog.h" line="87"/>
<source>Cancel</source>
<translation>إلغاء</translation>
</message>
<message>
<location filename="../tinputdialog.ui" line="55"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tinputdialog.h" line="88"/>
<source>OK</source>
<translation>نعم</translation>
</message>
Expand Down Expand Up @@ -759,41 +763,49 @@
<name>tPrintPopover</name>
<message>
<location filename="../tprintpopover.ui" line="172"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="201"/>
<source>Copies</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="117"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="195"/>
<source>PRINT OPTIONS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="137"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="197"/>
<source>Print</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="130"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="196"/>
<source>Printer</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="148"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="198"/>
<source>Page Size</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="155"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="199"/>
<source>Print in Grayscale</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="165"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="200"/>
<source>Double Sided</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="189"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="202"/>
<source>PDF</source>
<translation type="unfinished"></translation>
</message>
Expand Down
14 changes: 13 additions & 1 deletion lib/translations/bg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -336,11 +336,13 @@
<name>tAboutDialog</name>
<message>
<location filename="../taboutdialog.ui" line="251"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_taboutdialog.h" line="227"/>
<source>SOFTWARE</source>
<translation></translation>
</message>
<message>
<location filename="../taboutdialog.ui" line="297"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_taboutdialog.h" line="228"/>
<source>COPYRIGHT</source>
<translation></translation>
</message>
Expand All @@ -352,7 +354,7 @@
<message>
<location filename="../taboutdialog.cpp" line="85"/>
<source>Website</source>
<translation></translation>
<translation>Уебсайт</translation>
</message>
<message>
<location filename="../taboutdialog.cpp" line="94"/>
Expand Down Expand Up @@ -547,11 +549,13 @@
<name>tInputDialog</name>
<message>
<location filename="../tinputdialog.ui" line="48"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tinputdialog.h" line="87"/>
<source>Cancel</source>
<translation></translation>
</message>
<message>
<location filename="../tinputdialog.ui" line="55"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tinputdialog.h" line="88"/>
<source>OK</source>
<translation></translation>
</message>
Expand Down Expand Up @@ -748,41 +752,49 @@
<name>tPrintPopover</name>
<message>
<location filename="../tprintpopover.ui" line="117"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="195"/>
<source>PRINT OPTIONS</source>
<translation></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="130"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="196"/>
<source>Printer</source>
<translation></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="137"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="197"/>
<source>Print</source>
<translation></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="148"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="198"/>
<source>Page Size</source>
<translation></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="155"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="199"/>
<source>Print in Grayscale</source>
<translation></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="165"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="200"/>
<source>Double Sided</source>
<translation></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="172"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="201"/>
<source>Copies</source>
<translation></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="189"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="202"/>
<source>PDF</source>
<translation></translation>
</message>
Expand Down
12 changes: 12 additions & 0 deletions lib/translations/cs_CZ.ts
Original file line number Diff line number Diff line change
Expand Up @@ -340,11 +340,13 @@
<name>tAboutDialog</name>
<message>
<location filename="../taboutdialog.ui" line="251"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_taboutdialog.h" line="227"/>
<source>SOFTWARE</source>
<translation>SOFTWARE</translation>
</message>
<message>
<location filename="../taboutdialog.ui" line="297"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_taboutdialog.h" line="228"/>
<source>COPYRIGHT</source>
<translation>COPYRIGHT</translation>
</message>
Expand Down Expand Up @@ -563,11 +565,13 @@
<name>tInputDialog</name>
<message>
<location filename="../tinputdialog.ui" line="48"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tinputdialog.h" line="87"/>
<source>Cancel</source>
<translation>Zrušit</translation>
</message>
<message>
<location filename="../tinputdialog.ui" line="55"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tinputdialog.h" line="88"/>
<source>OK</source>
<translation>OK</translation>
</message>
Expand Down Expand Up @@ -784,41 +788,49 @@
<name>tPrintPopover</name>
<message>
<location filename="../tprintpopover.ui" line="172"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="201"/>
<source>Copies</source>
<translation>Kopie</translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="117"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="195"/>
<source>PRINT OPTIONS</source>
<translation>MOŽNOSTI TISKU</translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="137"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="197"/>
<source>Print</source>
<translation>Tisk</translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="130"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="196"/>
<source>Printer</source>
<translation>Tiskárna</translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="148"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="198"/>
<source>Page Size</source>
<translation>Velikost strany</translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="155"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="199"/>
<source>Print in Grayscale</source>
<translation>Vytisknout černobíle</translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="165"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="200"/>
<source>Double Sided</source>
<translation>Oboustranně</translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="189"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="202"/>
<source>PDF</source>
<translation>PDF</translation>
</message>
Expand Down
12 changes: 12 additions & 0 deletions lib/translations/cy_GB.ts
Original file line number Diff line number Diff line change
Expand Up @@ -336,11 +336,13 @@
<name>tAboutDialog</name>
<message>
<location filename="../taboutdialog.ui" line="251"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_taboutdialog.h" line="227"/>
<source>SOFTWARE</source>
<translation>MEDDALWEDD</translation>
</message>
<message>
<location filename="../taboutdialog.ui" line="297"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_taboutdialog.h" line="228"/>
<source>COPYRIGHT</source>
<translation>HAWLFRAINT</translation>
</message>
Expand Down Expand Up @@ -551,11 +553,13 @@
<name>tInputDialog</name>
<message>
<location filename="../tinputdialog.ui" line="48"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tinputdialog.h" line="87"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tinputdialog.ui" line="55"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tinputdialog.h" line="88"/>
<source>OK</source>
<translation type="unfinished">IAWN</translation>
</message>
Expand Down Expand Up @@ -752,41 +756,49 @@
<name>tPrintPopover</name>
<message>
<location filename="../tprintpopover.ui" line="172"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="201"/>
<source>Copies</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="117"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="195"/>
<source>PRINT OPTIONS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="137"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="197"/>
<source>Print</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="130"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="196"/>
<source>Printer</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="148"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="198"/>
<source>Page Size</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="155"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="199"/>
<source>Print in Grayscale</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="165"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="200"/>
<source>Double Sided</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="189"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="202"/>
<source>PDF</source>
<translation type="unfinished"></translation>
</message>
Expand Down
12 changes: 12 additions & 0 deletions lib/translations/da_DK.ts
Original file line number Diff line number Diff line change
Expand Up @@ -343,11 +343,13 @@
<name>tAboutDialog</name>
<message>
<location filename="../taboutdialog.ui" line="251"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_taboutdialog.h" line="227"/>
<source>SOFTWARE</source>
<translation>SOFTWARE</translation>
</message>
<message>
<location filename="../taboutdialog.ui" line="297"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_taboutdialog.h" line="228"/>
<source>COPYRIGHT</source>
<translation>OPHAVSRET</translation>
</message>
Expand Down Expand Up @@ -558,11 +560,13 @@
<name>tInputDialog</name>
<message>
<location filename="../tinputdialog.ui" line="48"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tinputdialog.h" line="87"/>
<source>Cancel</source>
<translation>Annuller</translation>
</message>
<message>
<location filename="../tinputdialog.ui" line="55"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tinputdialog.h" line="88"/>
<source>OK</source>
<translation>OKAY</translation>
</message>
Expand Down Expand Up @@ -759,41 +763,49 @@
<name>tPrintPopover</name>
<message>
<location filename="../tprintpopover.ui" line="172"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="201"/>
<source>Copies</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="117"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="195"/>
<source>PRINT OPTIONS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="137"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="197"/>
<source>Print</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="130"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="196"/>
<source>Printer</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="148"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="198"/>
<source>Page Size</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="155"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="199"/>
<source>Print in Grayscale</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="165"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="200"/>
<source>Double Sided</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../tprintpopover.ui" line="189"/>
<location filename="../../../build-libcontemporary-Chroot_6-Debug/lib/libcontemporary_autogen/include/ui_tprintpopover.h" line="202"/>
<source>PDF</source>
<translation type="unfinished"></translation>
</message>
Expand Down
Loading

0 comments on commit cf13067

Please sign in to comment.