commit filelight for openSUSE:Factory

Sat, 07 Jan 2023 08:20:07 -0800 

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package filelight for openSUSE:Factory 
checked in at 2023-01-07 17:17:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/filelight (Old)
 and      /work/SRC/openSUSE:Factory/.filelight.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "filelight"

Sat Jan  7 17:17:53 2023 rev:140 rq:1056454 version:22.12.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/filelight/filelight.changes      2022-12-09 
16:58:35.604051653 +0100
+++ /work/SRC/openSUSE:Factory/.filelight.new.1563/filelight.changes    
2023-01-07 17:19:54.766226971 +0100
@@ -1,0 +2,8 @@
+Tue Jan  3 10:19:28 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 22.12.1
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/gear/22.12.1/
+
+-------------------------------------------------------------------

Old:
----
  filelight-22.12.0.tar.xz
  filelight-22.12.0.tar.xz.sig

New:
----
  filelight-22.12.1.tar.xz
  filelight-22.12.1.tar.xz.sig

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ filelight.spec ++++++
--- /var/tmp/diff_new_pack.SY2R5D/_old  2023-01-07 17:19:55.386230670 +0100
+++ /var/tmp/diff_new_pack.SY2R5D/_new  2023-01-07 17:19:55.394230717 +0100
@@ -20,7 +20,7 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print 
$1"."$2}')}
 %bcond_without released
 Name:           filelight
-Version:        22.12.0
+Version:        22.12.1
 Release:        0
 Summary:        Graphical disk usage viewer
 License:        GPL-2.0-only OR GPL-3.0-only


++++++ filelight-22.12.0.tar.xz -> filelight-22.12.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/filelight-22.12.0/CMakeLists.txt 
new/filelight-22.12.1/CMakeLists.txt
--- old/filelight-22.12.0/CMakeLists.txt        2022-12-01 04:09:09.000000000 
+0100
+++ new/filelight-22.12.1/CMakeLists.txt        2023-01-03 00:27:19.000000000 
+0100
@@ -8,7 +8,7 @@
 # KDE Application Version, managed by release script
 set(RELEASE_SERVICE_VERSION_MAJOR "22")
 set(RELEASE_SERVICE_VERSION_MINOR "12")
-set(RELEASE_SERVICE_VERSION_MICRO "0")
+set(RELEASE_SERVICE_VERSION_MICRO "1")
 set(RELEASE_SERVICE_VERSION 
"${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 set(FILELIGHT_VERSION ${RELEASE_SERVICE_VERSION})
 # minimum requirements
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/filelight-22.12.0/autotests/core/testFileTree.cpp 
new/filelight-22.12.1/autotests/core/testFileTree.cpp
--- old/filelight-22.12.0/autotests/core/testFileTree.cpp       2022-12-01 
04:09:09.000000000 +0100
+++ new/filelight-22.12.1/autotests/core/testFileTree.cpp       2023-01-03 
00:27:19.000000000 +0100
@@ -30,4 +30,22 @@
     QVERIFY(!fpath.isEmpty());
 }
 
+void TestFileTree::testDuplicate()
+{
+    auto foo = std::make_shared<Folder>("foo/");
+    auto bar = std::make_shared<Folder>("bar/");
+    auto file = std::make_shared<Folder>("file/");
+    auto light = std::make_shared<Folder>("light/");
+    bar->append("onion", 1024);
+    light->append("torch", 128);
+    file->append(light);
+    foo->append(bar);
+    foo->append(file);
+    foo->append("shallot", 512);
+    auto other = foo->duplicate();
+    qDebug() << other->size();
+    QCOMPARE(other->size(), foo->size());
+    QCOMPARE(other->children(), foo->children());
+}
+
 QTEST_MAIN(TestFileTree)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/filelight-22.12.0/autotests/core/testFileTree.h 
new/filelight-22.12.1/autotests/core/testFileTree.h
--- old/filelight-22.12.0/autotests/core/testFileTree.h 2022-12-01 
04:09:09.000000000 +0100
+++ new/filelight-22.12.1/autotests/core/testFileTree.h 2023-01-03 
00:27:19.000000000 +0100
@@ -25,6 +25,7 @@
     void testFileName();
     void testFileSize();
     void testFilePath();
+    void testDuplicate();
 
 private:
     std::unique_ptr<File> fl;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/filelight-22.12.0/misc/org.kde.filelight.appdata.xml 
new/filelight-22.12.1/misc/org.kde.filelight.appdata.xml
--- old/filelight-22.12.0/misc/org.kde.filelight.appdata.xml    2022-12-01 
04:09:09.000000000 +0100
+++ new/filelight-22.12.1/misc/org.kde.filelight.appdata.xml    2023-01-03 
00:27:19.000000000 +0100
@@ -66,6 +66,8 @@
   <summary xml:lang="nl">Schijfgebruik tonen en ongebruikte bestanden 
verwijderen</summary>
   <summary xml:lang="pl">Pokaż wykorzystanie dysku i usuń nieużywane 
pliki</summary>
   <summary xml:lang="pt">Mostra a utilização do disco e apagar ficheiros 
não usados</summary>
+  <summary xml:lang="pt-BR">Mostra o uso do disco e exclui arquivos não 
utilizados</summary>
+  <summary xml:lang="ru">Просмотр сведений об 
использовании дискового пространства и 
удаление неиспользуемых файлов</summary>
   <summary xml:lang="sk">Zobraziť využitie disku a vymazať nepoužité 
súbory</summary>
   <summary xml:lang="sl">Prikazuje rabo diska in briše neuporabljene 
datoteke</summary>
   <summary xml:lang="sv">Visa diskanvändning och ta bort oanvända 
filer</summary>
@@ -73,6 +75,7 @@
   <summary xml:lang="tr">Disk kullanımına bakın ve kullanılmayan 
dosyaları silin</summary>
   <summary xml:lang="uk">Показ даних щодо 
використання диска і вилучення зайвих 
файлів</summary>
   <summary xml:lang="x-test">xxShow disk usage and delete unused 
filesxx</summary>
+  <summary xml:lang="zh-CN">显示磁盘使用情况并删
除未使用的文件</summary>
   <description>
     <p>
       Filelight is an application to visualize the disk usage on your computer 
by showing folders using an easy-to-understand view of concentric rings. 
Filelight makes it simple to free up space!
@@ -94,6 +97,7 @@
     <p xml:lang="nl">Filelight is een toepassing om het schijfgebruik op uw 
computer te visualiseren door mappen te tonen met een gemakkelijk te begrijpen 
beeld met concentrische ringen. Filelight maakt het gemakkelijk om ruimte vrij 
te maken!</p>
     <p xml:lang="pl">Filelight jest aplikacją do obrazowania wykorzystania 
przestrzeni dyskowej na twoim komputerze za pomocą łatwych do zrozumienia 
współśrodkowych pierścieni. Filelight ułatwia zwalnianie miejsca!</p>
     <p xml:lang="pt">O Filelight é uma aplicação para visualizar a 
utilização do disco no seu computador, mostrando as pastas com uma vista 
fácil de entender num formato em anéis concêntricos. O Filelight facilita a 
libertação de espaço!</p>
+    <p xml:lang="ru">Filelight — приложение для 
визуализации использования дискового 
пространства, использующее наглядное 
отображение размеров папок в виде 
концентрических колец. Filelight позволяет 
просто находить большие файлы и помогает 
освобождать место на дисках.</p>
     <p xml:lang="sk">Filelight je aplikácia na vizualizáciu využitia disku 
v počítači pomocou zobrazenia priečinkov ako prehľadného zobrazenia 
sústredných kruhov  Filelight umožňuje jednoducho uvoľniť miesto!</p>
     <p xml:lang="sl">FIlelight je aplikacija za vizualizacijo porabe diska na 
vašem računalniku, tako da prikazuje mape v preprosto razumljivih 
koncentričnih krogih. Filelight poenostavi sproščanje prostora na disku!</p>
     <p xml:lang="sv">Filelight är ett program för att åskådliggöra 
diskanvändning på datorn genom att visa kataloger med en lättförståelig vy 
av koncentriska ringar. Filelight gör det enkelt att frigöra utrymme!</p>
@@ -101,6 +105,7 @@
     <p xml:lang="tr">Filelight, bilgisayarınızdaki disk kullanımını, 
anlaması kolay eşmerkezli halkalar görünümü kullanarak görselleştiren 
bir uygulamadır. Filelight ile, bilgisayarınızı kolaylıkla 
temizleyebilirsiniz!</p>
     <p xml:lang="uk">Filelight — програма для 
візуалізації використання дискового 
простору вашого комп'ютера. Ця програма 
здатна показувати вміст тек у легко 
зрозумілому форматі концентричних кіл. За 
допомогою Filelight ви без проблем зможете 
звільняти місце на диску!</p>
     <p xml:lang="x-test">xxFilelight is an application to visualize the disk 
usage on your computer by showing folders using an easy-to-understand view of 
concentric rings. Filelight makes it simple to free up space!xx</p>
+    <p xml:lang="zh-CN">Filelight 是一个可视化电脑磁盘使用情
况的应用程序，å…
¶ä½¿ç”¨æ˜“读的多层饼图来显示文件夹结构。Filelight 
让释放空间变得简单！</p>
     <p>Features:</p>
     <p xml:lang="ar">الميزات:</p>
     <p xml:lang="az">Ä°mkanlar:</p>
@@ -165,6 +170,8 @@
       <li xml:lang="nl">Lokale, op afstand of verwijderbare schijven 
scannen</li>
       <li xml:lang="pl">Przeszukiwanie miejscowych, zdalnych, wymiennych 
dysków</li>
       <li xml:lang="pt">Sondar discos locais, remotos ou removíveis</li>
+      <li xml:lang="pt-BR">Verifica em discos locais, remotos ou 
removíveis</li>
+      <li xml:lang="ru">Сканирование локальных, 
сетевых и сменных дисков;</li>
       <li xml:lang="sk">Skenovať lokálne, vzdialené alebo odoberateľné 
disky</li>
       <li xml:lang="sl">Preišči krajevne, oddaljene ali odstranljive 
diske</li>
       <li xml:lang="sv">Sök igenom lokala diskar, diskar på en annan dator 
eller flyttbara diskar</li>
@@ -172,6 +179,7 @@
       <li xml:lang="tr">Yerel, uzak veya çıkarılabilir diskleri 
tarayın</li>
       <li xml:lang="uk">Сканування локальних, 
віддалених та портативних дисків</li>
       <li xml:lang="x-test">xxScan local, remote, or removable disksxx</li>
+      <li xml:lang="zh-CN">扫描本地、远程或可移动磁盘</li>
       <li>View detailed information about files and folders</li>
       <li xml:lang="ar">عرض معلومات تفصيلية حول الم
لفات والمجلدات</li>
       <li xml:lang="bg">Подробна информация за 
файлове и папки</li>
@@ -190,6 +198,7 @@
       <li xml:lang="nl">Gedetailleerde informatie over bestanden en mappen 
bekijken</li>
       <li xml:lang="pl">Oglądanie szczegółowych danych o plikach i 
katalogach</li>
       <li xml:lang="pt">Ver informações detalhadas sobre os ficheiros e 
pastas</li>
+      <li xml:lang="ru">Подробные сведения о файлах и 
папках;</li>
       <li xml:lang="sk">Zobrazenie podrobných informácií o súboroch a 
priečinkoch</li>
       <li xml:lang="sl">Pogled podrobnih informacij o datotekah in mapah</li>
       <li xml:lang="sv">Visa detaljerad information om filer och kataloger</li>
@@ -197,6 +206,7 @@
       <li xml:lang="tr">Dosyalar ve klasörler hakkında bilgi alın</li>
       <li xml:lang="uk">Перегляд докладних 
відомостей щодо файлів і тек</li>
       <li xml:lang="x-test">xxView detailed information about files and 
foldersxx</li>
+      <li xml:lang="zh-CN">查看关于文件和文件夹的详细信息</li>
       <li>Delete files or folders that are taking up too much space</li>
       <li xml:lang="ar">حذف ملفات والمجلدات التي تأخذ 
مساحة كبيرة</li>
       <li xml:lang="bg">Изтриване на файлове и папки, 
които заемат твърде много място на диска</li>
@@ -215,6 +225,7 @@
       <li xml:lang="nl">Bestanden of mappen verwijderen die te veel ruimte 
innemen</li>
       <li xml:lang="pl">Usuwanie plików i katalogów, które zajmują za 
dużo miejsca</li>
       <li xml:lang="pt">Apagar os ficheiros ou pastas que ocupam demasiado 
espaço</li>
+      <li xml:lang="ru">Удаление файлов или папок, 
занимающих слишком много места;</li>
       <li xml:lang="sk">Odstránenie súborov alebo priečinkov, ktoré 
zaberajú príliš veľa miesta</li>
       <li xml:lang="sl">Briši datoteke ali mape, ki zavzemajo preveč 
prostora</li>
       <li xml:lang="sv">Ta bort filer eller kataloger som upptar för mycket 
utrymme</li>
@@ -222,6 +233,7 @@
       <li xml:lang="tr">Çok fazla yer kaplayan dosyaları veya klasörleri 
silin</li>
       <li xml:lang="uk">Вилучення файлів і тек, які 
займають надто багато місця</li>
       <li xml:lang="x-test">xxDelete files or folders that are taking up too 
much spacexx</li>
+      <li xml:lang="zh-CN">删除占用太多空间的文件 (夹)</li>
       <li>Integration into the Dolphin, Konqueror, and Krusader file 
managers</li>
       <li xml:lang="ar">تكامل مع مديرو الملفات 
كونكيور وكروسادر</li>
       <li xml:lang="bg">Интегриране в Dolphin, Konqueror и 
Krusader</li>
@@ -240,6 +252,8 @@
       <li xml:lang="nl">Integratie in bestandsbeheerders Dolphin, Konqueror en 
Krusader</li>
       <li xml:lang="pl">Integracja z przeglądarkami plików takimi jak: 
Dolphin, Konqueror i Krusader</li>
       <li xml:lang="pt">Integração com os gestores de ficheiros Dolphin, 
Konqueror e Krusader</li>
+      <li xml:lang="pt-BR">Integração com os gerenciadores de arquivo 
Dolphin, Konqueror e Krusader</li>
+      <li xml:lang="ru">Встраивание в диспетчеры 
файлов Dolphin, Konqueror и Krusader;</li>
       <li xml:lang="sk">Integrácia do správcov súborov Dolphin, Konqueror a 
Krusader</li>
       <li xml:lang="sl">Vključitev v upravljalnike datotek Dolphin, Konqueror 
in Krusader</li>
       <li xml:lang="sv">Integrerat med filhanterarna Dolphin, Konqueror och 
Krusader</li>
@@ -247,6 +261,7 @@
       <li xml:lang="tr">Dolphin, Krusader ve Konqueror dosya yöneticileri 
tümleşimi</li>
       <li xml:lang="uk">Інтеграція з програмами для 
керування файлами — Dolphin, Konqueror і Krusader</li>
       <li xml:lang="x-test">xxIntegration into the Dolphin, Konqueror, and 
Krusader file managersxx</li>
+      <li xml:lang="zh-CN">集成到 Dolphin、Konqueror 和 Krusader 
等文件管理器中</li>
       <li>Configurable color schemes</li>
       <li xml:lang="ar">تشكيلات ألوان قابلة للضبط</li>
       <li xml:lang="az">Ayarlana bilən rəng sxemləri</li>
@@ -278,7 +293,7 @@
       <li xml:lang="pt">Esquemas de cores configuráveis</li>
       <li xml:lang="pt-BR">Esquemas de cores configuráveis</li>
       <li xml:lang="ro">Scheme de culori configurabile</li>
-      <li xml:lang="ru">Настраиваемые цветовые сх
емы;</li>
+      <li xml:lang="ru">Настраиваемое цветовое 
оформление;</li>
       <li xml:lang="sk">Konfigurovateľné farebné schémy</li>
       <li xml:lang="sl">Nastavljive barvne sheme</li>
       <li xml:lang="sr">Подесиве шеме боја.</li>
@@ -312,10 +327,10 @@
     <value 
key="KDE::windows_store">https://www.microsoft.com/store/apps/9pfxcd722m2c</value>
   </custom>
   <releases>
+    <release version="22.12.1" date="2023-01-05"/>
     <release version="22.12.0" date="2022-12-08"/>
     <release version="22.08.3" date="2022-11-03"/>
     <release version="22.08.2" date="2022-10-13"/>
-    <release version="22.08.1" date="2022-09-08"/>
   </releases>
   <content_rating type="oars-1.1"/>
 </component>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/filelight-22.12.0/misc/org.kde.filelight.desktop 
new/filelight-22.12.1/misc/org.kde.filelight.desktop
--- old/filelight-22.12.0/misc/org.kde.filelight.desktop        2022-12-01 
04:09:09.000000000 +0100
+++ new/filelight-22.12.1/misc/org.kde.filelight.desktop        2023-01-03 
00:27:19.000000000 +0100
@@ -139,12 +139,15 @@
 Comment[nn]=Visualiser diskbruk og slett ubrukte filer
 Comment[pl]=Pokaż wykorzystanie dysku i usuń nieużywane pliki
 Comment[pt]=Mostrar a utilização do disco e apagar os ficheiros não usados
+Comment[pt_BR]=Mostra o uso do disco e exclui arquivos não utilizados
+Comment[ru]=Просмотр сведений об использовании 
дискового пространства и удаление 
неиспользуемых файлов
 Comment[sk]=Zobraziť využitie disku a vymazať nepoužité súbory
 Comment[sl]=Prikazuje rabo diska in briše neuporabljene datoteke
 Comment[sv]=Visa diskanvändning och ta bort oanvända filer
 Comment[tr]=Disk kullanımına bakın ve kullanılmayan dosyaları silin
 Comment[uk]=Показ даних щодо використання диска 
і вилучення зайвих файлів
 Comment[x-test]=xxShow disk usage and delete unused filesxx
+Comment[zh_CN]=显示磁盘使用情况并删除未使用的文件
 Keywords=disk;drive;space;storage;usage;
 Keywords[ar]=قرص;مساحة;تخزين;استعمال;م
تبقي;حر;دسك;
 Keywords[az]=disk;sahə;yaddaş;istifadəsi;
@@ -170,7 +173,7 @@
 Keywords[pt]=disco;unidade;espaço;armazenamento;utilização;
 Keywords[pt_BR]=disco;unidade;espaço;armazenamento;uso;
 Keywords[ro]=disc;unitate;spațiu;stocare;utilizare;
-Keywords[ru]=disk;drive;space;storage;usage;диск;место;х
ранилище;использование
+Keywords[ru]=disk;drive;space;storage;usage;диск;накопитель;место;Ñ
…ранилище;дисковое 
пространство;использование;
 Keywords[sk]=disk;jednotka;priestor;úložisko;použitie;
 Keywords[sl]=disk;pogon;prostor;shranjevanje;uporaba;raba;
 Keywords[sv]=disk;drivenhet;utrymme;lagring;användning;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/filelight-22.12.0/po/eu/filelight.po 
new/filelight-22.12.1/po/eu/filelight.po
--- old/filelight-22.12.0/po/eu/filelight.po    2022-12-01 04:09:09.000000000 
+0100
+++ new/filelight-22.12.1/po/eu/filelight.po    2023-01-03 00:27:19.000000000 
+0100
@@ -12,7 +12,7 @@
 "Project-Id-Version: filelight\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n";
 "POT-Creation-Date: 2022-10-30 00:49+0000\n"
-"PO-Revision-Date: 2022-07-25 10:17+0200\n"
+"PO-Revision-Date: 2022-12-03 16:01+0100\n"
 "Last-Translator: Iñigo Salvador Azurmendi <[email protected]>\n"
 "Language-Team: Basque <[email protected]>\n"
 "Language: eu\n"
@@ -20,7 +20,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 22.04.3\n"
+"X-Generator: Lokalize 22.08.3\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -30,7 +30,7 @@
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
-msgstr "[email protected],[email protected]"
+msgstr "[email protected],[email protected]"
 
 #. i18n: ectx: Menu (file)
 #: misc/filelightui.rc:4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/filelight-22.12.0/po/fr/filelight.po 
new/filelight-22.12.1/po/fr/filelight.po
--- old/filelight-22.12.0/po/fr/filelight.po    2022-12-01 04:09:09.000000000 
+0100
+++ new/filelight-22.12.1/po/fr/filelight.po    2023-01-03 00:27:19.000000000 
+0100
@@ -20,7 +20,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 22.04.1\n"
+"X-Generator: Lokalize 22.12.0\n"
 "X-Environment: kde\n"
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/filelight-22.12.0/po/it/filelight.po 
new/filelight-22.12.1/po/it/filelight.po
--- old/filelight-22.12.0/po/it/filelight.po    2022-12-01 04:09:09.000000000 
+0100
+++ new/filelight-22.12.1/po/it/filelight.po    2023-01-03 00:27:19.000000000 
+0100
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 22.08.3\n"
+"X-Generator: Lokalize 22.12.0\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/filelight-22.12.0/po/pt_BR/filelight.po 
new/filelight-22.12.1/po/pt_BR/filelight.po
--- old/filelight-22.12.0/po/pt_BR/filelight.po 2022-12-01 04:09:09.000000000 
+0100
+++ new/filelight-22.12.1/po/pt_BR/filelight.po 2023-01-03 00:27:19.000000000 
+0100
@@ -11,7 +11,7 @@
 "Project-Id-Version: filelight\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n";
 "POT-Creation-Date: 2022-10-30 00:49+0000\n"
-"PO-Revision-Date: 2022-07-14 09:32-0300\n"
+"PO-Revision-Date: 2022-12-20 11:06-0300\n"
 "Last-Translator: Luiz Fernando Ranghetti <[email protected]>\n"
 "Language-Team: Portuguese <[email protected]>\n"
 "Language: pt_BR\n"
@@ -512,7 +512,7 @@
 #: src/radialMap/item.cpp:210
 #, kde-format
 msgid "Open &Terminal Here"
-msgstr "Abrir o &terminal aqui"
+msgstr "Abrir &terminal aqui"
 
 #: src/radialMap/item.cpp:215
 #, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/filelight-22.12.0/po/ru/filelight.po 
new/filelight-22.12.1/po/ru/filelight.po
--- old/filelight-22.12.0/po/ru/filelight.po    2022-12-01 04:09:09.000000000 
+0100
+++ new/filelight-22.12.1/po/ru/filelight.po    2023-01-03 00:27:19.000000000 
+0100
@@ -11,7 +11,7 @@
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n";
 "POT-Creation-Date: 2022-10-30 00:49+0000\n"
-"PO-Revision-Date: 2022-08-13 23:10+0300\n"
+"PO-Revision-Date: 2022-12-18 10:54+0300\n"
 "Last-Translator: Alexander Yavorsky <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
 "Language: ru\n"
@@ -20,7 +20,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Lokalize 22.04.3\n"
+"X-Generator: Lokalize 21.08.3\n"
 "X-Environment: kde\n"
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
@@ -28,12 +28,12 @@
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
-msgstr "Александр Поташев"
+msgstr "Александр Поташев, Павел Чернышов"
 
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
-msgstr "[email protected]"
+msgstr "[email protected], [email protected]"
 
 #. i18n: ectx: Menu (file)
 #: misc/filelightui.rc:4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/filelight-22.12.0/po/ta/filelight.po 
new/filelight-22.12.1/po/ta/filelight.po
--- old/filelight-22.12.0/po/ta/filelight.po    2022-12-01 04:09:09.000000000 
+0100
+++ new/filelight-22.12.1/po/ta/filelight.po    2023-01-03 00:27:19.000000000 
+0100
@@ -7,7 +7,7 @@
 "Project-Id-Version: filelight\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n";
 "POT-Creation-Date: 2022-10-30 00:49+0000\n"
-"PO-Revision-Date: 2022-07-21 19:52+0530\n"
+"PO-Revision-Date: 2022-12-01 21:44+0530\n"
 "Last-Translator: Kishore G <[email protected]>\n"
 "Language-Team: Tamil <[email protected]>\n"
 "Language: ta\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 22.04.3\n"
+"X-Generator: Lokalize 22.08.3\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -274,7 +274,7 @@
 #: src/main.cpp:67
 #, kde-format
 msgid "Inspiration"
-msgstr ""
+msgstr "ஊக்கமளித்தது"
 
 #: src/main.cpp:68
 #, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/filelight-22.12.0/po/tr/filelight.po 
new/filelight-22.12.1/po/tr/filelight.po
--- old/filelight-22.12.0/po/tr/filelight.po    2022-12-01 04:09:09.000000000 
+0100
+++ new/filelight-22.12.1/po/tr/filelight.po    2023-01-03 00:27:19.000000000 
+0100
@@ -12,7 +12,7 @@
 "Project-Id-Version: kdeutils-kde4\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n";
 "POT-Creation-Date: 2022-10-30 00:49+0000\n"
-"PO-Revision-Date: 2022-11-24 17:00+0300\n"
+"PO-Revision-Date: 2022-12-03 18:59+0300\n"
 "Last-Translator: Emir SARI <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
 "Language: tr\n"
@@ -273,7 +273,7 @@
 #: src/main.cpp:65
 #, kde-format
 msgid "Original author"
-msgstr "Ä°lk yazar"
+msgstr "Özgün yazar"
 
 #: src/main.cpp:66
 #, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/filelight-22.12.0/po/zh_CN/filelight.po 
new/filelight-22.12.1/po/zh_CN/filelight.po
--- old/filelight-22.12.0/po/zh_CN/filelight.po 2022-12-01 04:09:09.000000000 
+0100
+++ new/filelight-22.12.1/po/zh_CN/filelight.po 2023-01-03 00:27:19.000000000 
+0100
@@ -3,7 +3,7 @@
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n";
 "POT-Creation-Date: 2022-10-30 00:49+0000\n"
-"PO-Revision-Date: 2022-11-19 14:50\n"
+"PO-Revision-Date: 2022-12-24 11:44\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/filelight-22.12.0/src/fileTree.cpp 
new/filelight-22.12.1/src/fileTree.cpp
--- old/filelight-22.12.0/src/fileTree.cpp      2022-12-01 04:09:09.000000000 
+0100
+++ new/filelight-22.12.1/src/fileTree.cpp      2023-01-03 00:27:19.000000000 
+0100
@@ -12,6 +12,7 @@
 #include <QUrl>
 
 #include "fileCleaner.h"
+#include "filelight_debug.h"
 
 Folder::~Folder()
 {
@@ -52,3 +53,44 @@
 
     return QUrl::fromUserInput(path, QString(), QUrl::AssumeLocalFile);
 }
+
+void Folder::clone(const Folder *that, std::shared_ptr<Folder> other)
+{
+    struct Clone {
+        const Folder *source;
+        std::shared_ptr<Folder> target;
+        std::shared_ptr<Folder> parent;
+    };
+    QList<Clone> completedClones;
+    QList<Clone> clones({{that, other, nullptr}});
+    while (!clones.isEmpty()) {
+        const auto &clone = clones.takeLast();
+        for (const auto &file : clone.source->files) {
+            if (file->isFolder()) {
+                auto folder = std::dynamic_pointer_cast<Folder>(file);
+                clones.append(Clone{folder.get(), 
std::make_shared<Folder>(folder->m_name.constData()), clone.target});
+            } else {
+                clone.target->append(file->m_name.constData(), file->m_size);
+            }
+        }
+        completedClones.append(clone);
+    }
+    for (auto it = completedClones.rbegin(); it != completedClones.rend(); 
++it) {
+        // Appending forwards the size data, it must only happen after all 
duplicating is done so the sizes are known.
+        // And obviously in reverse order of existence in the tree.
+        auto clone = *it;
+        if (clone.parent) {
+            clone.parent->append(clone.target);
+        }
+    }
+}
+
+std::shared_ptr<Folder> Folder::duplicate() const
+{
+    // We completely detach the subtree upon duplication, otherwise we'd have 
parent pointers pointing back into
+    // the old tree causing major headaches when trying to keep clean object 
states. This does take longer
+    // because we need to create additional objects, but is safer overall.
+    auto other = std::make_shared<Folder>(m_name.constData());
+    clone(this, other);
+    return other;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/filelight-22.12.0/src/fileTree.h 
new/filelight-22.12.1/src/fileTree.h
--- old/filelight-22.12.0/src/fileTree.h        2022-12-01 04:09:09.000000000 
+0100
+++ new/filelight-22.12.1/src/fileTree.h        2023-01-03 00:27:19.000000000 
+0100
@@ -119,10 +119,10 @@
         return true;
     }
 
-    std::shared_ptr<Folder> duplicate() const
-    {
-        return std::make_shared<Folder>(*this);
-    }
+    // Separate **static** function so we don't risk using this when we should 
be using clone.source!
+    static void clone(const Folder *that, std::shared_ptr<Folder> other);
+
+    std::shared_ptr<Folder> duplicate() const;
 
     /// appends a Folder
     void append(const std::shared_ptr<Folder> &d, const char *name = nullptr)
@@ -145,7 +145,7 @@
     }
 
     /// removes a file
-    void remove(const std::shared_ptr<Folder> &f)
+    void remove(const std::shared_ptr<File> &f)
     {
         files.removeAll(f);
         const FileSize childSize = f->size();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/filelight-22.12.0/src/localLister.cpp 
new/filelight-22.12.1/src/localLister.cpp
--- old/filelight-22.12.0/src/localLister.cpp   2022-12-01 04:09:09.000000000 
+0100
+++ new/filelight-22.12.1/src/localLister.cpp   2023-01-03 00:27:19.000000000 
+0100
@@ -133,7 +133,12 @@
             returnedCwds[i] = scan(subDirectories[i].first, 
subDirectories[i].second);
             semaphore.release(1);
         };
-        if (!QThreadPool::globalInstance()->tryStart(scanSubdir)) {
+        // Workaround! Do not pass the function to tryStart and have it 
internally create a runnable.
+        // The runnable will have incorrect ref counting resulting in failed 
assertions inside QThreadPool.
+        // Instead create the runnable ourselves to hit the code paths with 
correct ref counting.
+        // https://bugs.kde.org/show_bug.cgi?id=449688
+        auto runnable = QRunnable::create(scanSubdir);
+        if (!QThreadPool::globalInstance()->tryStart(runnable)) {
             scanSubdir();
         }
     }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/filelight-22.12.0/src/radialMap/item.cpp 
new/filelight-22.12.1/src/radialMap/item.cpp
--- old/filelight-22.12.0/src/radialMap/item.cpp        2022-12-01 
04:09:09.000000000 +0100
+++ new/filelight-22.12.1/src/radialMap/item.cpp        2023-01-03 
00:27:19.000000000 +0100
@@ -284,7 +284,7 @@
     QApplication::restoreOverrideCursor();
     setEnabled(true);
     if (!job->error() && m_toBeDeleted) {
-        
m_toBeDeleted->file()->parent()->remove(std::dynamic_pointer_cast<Folder>(m_toBeDeleted->file()));
+        
m_toBeDeleted->file()->parent()->remove(std::dynamic_pointer_cast<File>(m_toBeDeleted->file()));
         m_toBeDeleted = nullptr;
         m_focus = nullptr;
         m_map.make(m_tree, true);

Reply via email to