mirror of
https://github.com/arsenetar/dupeguru.git
synced 2025-03-10 13:44:37 +00:00
Conflicts: cocoa/inter/app.py core/app.py hscommon/reg.py locale/cs/LC_MESSAGES/ui.po locale/de/LC_MESSAGES/ui.po locale/fr/LC_MESSAGES/ui.po locale/hy/LC_MESSAGES/ui.po locale/it/LC_MESSAGES/ui.po locale/pt_BR/LC_MESSAGES/ui.po locale/ru/LC_MESSAGES/ui.po locale/ui.pot locale/uk/LC_MESSAGES/ui.po locale/vi/LC_MESSAGES/ui.po locale/zh_CN/LC_MESSAGES/ui.po qt/base/app.py