Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 79e58944b3c08e429d7dbb6592d0b758fbc9c3c4
Author: YuSanka <yusanka@gmail.com>
Date:   Fri Dec 17 14:38:49 2021 +0100

    Localization: Fixed some phrases for RU dictionary (see last comments to #7501)
    + Fixed no needed formatting in CA dictionary

commit 44536ecebc41551a8129650cf882d2aefccbe1a5
Merge: 47df945 96485a0
Author: YuSanka <yusanka@gmail.com>
Date:   Fri Dec 17 14:26:01 2021 +0100

    Merge branch 'master' of https://github.com/AndylgTom/Slic3r into AndylgTom-master

commit 96485a0
Author: Andy <andylg@yandex.ru>
Date:   Thu Dec 16 23:41:46 2021 +0700

    Update PrusaSlicer_ru.po

    Пофиксил указанные замечания

commit 52f7b9e
Author: AndylgTom <andylg@yandex.ru>
Date:   Wed Dec 15 15:56:31 2021 +0700

    Russian localization update for PrusaSlicer-2.4.0-rc

    Russian localization update for PrusaSlicer-2.4.0-rc+win64-202112141553
    Please check those lines where there are three questions "???". There are 12 such lines.

    Обновление русской локализации для PrusaSlicer-2.4.0-rc+win64-202112141553
    Прошу проверить те строки, где встречаются три вопроса "???". Таких строк 12.

commit 387ca46
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:53:08 2021 +0700

    Update PrusaSlicer_ru.po

commit ddef2cd
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:49:59 2021 +0700

    Update PrusaSlicer_ru.po

commit 94e3946
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:20:53 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 0e97fd9
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:20:27 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit fc452d2
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:18:05 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 702b0f5
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:14:32 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 3b56531
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:13:19 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 0d5fcd9
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:13:01 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 0e0047d
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:11:06 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 0d3ec85
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:10:42 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 596df1a
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:10:10 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 2086358
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 00:36:19 2021 +0700

    Update PrusaSlicer_ru.po

    USB-разъём

commit e2adfc7
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 00:20:01 2021 +0700

    Update PrusaSlicer_ru.po

    нить -> пруток

commit 3db9c2f
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 23:10:22 2021 +0700

    Update PrusaSlicer_ru.po

commit 6f8a9de
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 23:01:41 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 57c0ad1
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 23:00:03 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 8db333a
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 22:41:27 2021 +0700

    Update PrusaSlicer_ru.po

commit e7cdc32
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 22:38:56 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 943c514
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 22:17:26 2021 +0700

    Update PrusaSlicer_ru.po

    Выбор\...

commit d83a85f
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 22:08:26 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 7928497
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:44:58 2021 +0700

    Update PrusaSlicer_ru.po

commit ef19ef3
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:41:25 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit a21dee7
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:33:15 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 07f3da9
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:32:21 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit e1f948b
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:20:31 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit d74900b
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:19:35 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit d64d561
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:18:39 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 49f071e
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:17:51 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 2af9eaa
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:17:11 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit b0042f9
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:16:22 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit dddfd61
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:14:52 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 7466bbc
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:14:21 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 759130b
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:13:34 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit c66d330
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:12:33 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit cb75e4b
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:10:06 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 65d0167
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:09:05 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 4c43e1c
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:07:35 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit a75b38a
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:06:25 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit ed56a52
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:05:15 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit c1f2f58
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:04:43 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit e4e6519
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:03:53 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit fb7de82
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:03:11 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit ce21821
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:02:10 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit e46e058
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:01:43 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit fa1dfe5
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:00:49 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 17a6da7
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:00:18 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 00d675e
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:59:22 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 0d60f4d
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:58:50 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 29218c1
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:58:24 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit a051c50
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:57:44 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit ea7d25c
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:56:43 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 40382f8
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:56:06 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 481f968
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:53:29 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 3720520
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:52:47 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 11eb973
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:51:51 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit c363477
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:50:33 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 732fbf1
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:49:51 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 36e88e7
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:49:25 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit dbc1f2e
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:48:32 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 1ca4e35
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:47:50 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 209779f
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:46:59 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 29bc1b3
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:46:03 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit cea039e
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:45:18 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit be48ee8
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:44:48 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit f61990e
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:44:15 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 0aadf3d
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:43:44 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 2ae2e94
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:43:13 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 4cdea4b
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:42:44 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 2289cc6
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:42:27 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit f8e844f
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:42:02 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 45d1188
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:41:35 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit e1a5b07
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:40:43 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 679fe59
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:39:50 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit abdb6d1
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:38:44 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 1c55ed7
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:38:13 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit d1cdff3
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:38:03 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 49e22e3
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:37:06 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 74620d5
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 16:36:41 2021 +0700

    Update PrusaSlicer_ru.po

commit c220687
Author: AndylgTom <andylg@yandex.ru>
Date:   Sun Jan 10 03:00:24 2021 +0700

    Updating the Russian translation PrusaSlicer-2.3.0-rc3

    Updating the Russian translation PrusaSlicer-2.3.0-rc3 by Andylg
  • Loading branch information
@YuSanka
YuSanka committed Dec 17, 2021
1 parent 47df945 commit 5dfbea2
Show file tree
Hide file tree
Showing 5 changed files with 2,055 additions and 19,998 deletions.
Binary file modified resources/localization/ca/PrusaSlicer.mo
View file
Binary file not shown.
3 changes: 0 additions & 3 deletions resources/localization/ca/PrusaSlicer_ca.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,6 @@ msgid "First layer height"
msgstr "Alçada de la primera capa"

#: src/slic3r/GUI/ConfigManipulation.cpp:82
#, fuzzy, c-format, boost-format
msgid ""
"The Spiral Vase mode requires:\n"
"- one perimeter\n"
Expand Down Expand Up @@ -11456,7 +11455,6 @@ msgid "Extra perimeters if needed"
msgstr "Perímetres addicionals si és necessari"

#: src/libslic3r/PrintConfig.cpp:761
#, fuzzy, c-format, boost-format
msgid ""
"Add more perimeters when needed for avoiding gaps in sloping walls. Slic3r "
"keeps adding perimeters, until more than 70% of the loop immediately above "
Expand Down Expand Up @@ -12653,7 +12651,6 @@ msgid "This setting represents the maximum speed of your fan."
msgstr "Esta configuració representa la velocitat màxima del ventilador."

#: src/libslic3r/PrintConfig.cpp:1753
#, fuzzy, c-format, boost-format
msgid ""
"This is the highest printable layer height for this extruder, used to cap "
"the variable layer height and support layer height. Maximum recommended "
Expand Down
Binary file modified resources/localization/ru/PrusaSlicer.mo
View file
Binary file not shown.
Loading

0 comments on commit 5dfbea2

Please sign in to comment.