From d765b5978ed60dc8d0ee7f9608225bc3f03d02d2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 21 Aug 2022 01:50:12 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- applets/systemmonitor/coreusage/metadata.json | 1 + applets/systemmonitor/cpu/metadata.json | 1 + dataengines/dict/plasma-dataengine-dict.json | 1 + kcms/region_language/kcm_regionandlang.json | 1 + kcms/users/src/kcm_users.json | 1 + kioslave/desktop/desktopnotifier.json | 1 + libcolorcorrect/kded/colorcorrectlocationupdater.json | 1 + lookandfeel/org.kde.breeze/metadata.json | 1 + lookandfeel/org.kde.breezedark/metadata.json | 1 + runners/windowedwidgets/plasma-runner-windowedwidgets.json | 2 +- 10 files changed, 10 insertions(+), 1 deletion(-) diff --git a/applets/systemmonitor/coreusage/metadata.json b/applets/systemmonitor/coreusage/metadata.json index 111f3a316..7881153d4 100644 --- a/applets/systemmonitor/coreusage/metadata.json +++ b/applets/systemmonitor/coreusage/metadata.json @@ -62,6 +62,7 @@ "Description[id]": "Widget pemantau sistem yang menampilkan penggunaan core CPU individual", "Description[it]": "Oggetto di monitoraggio del sistema che mostra l'utilizzo dei singoli core del processore", "Description[ja]": "CPU の各コアの使用率を表示するシステムモニタウィジェット", + "Description[ka]": "სისტემური მონიტორის ვიჯეტი, რომელიც CPU-ის ბირთვებს სათითაოდ აჩვენებს", "Description[ko]": "개별 CPU 코어 사용량을 표시하는 시스템 모니터 위젯", "Description[lt]": "Sistemos prižiūryklės valdiklis, kuris rodo atskirų procesoriaus branduolių naudojimą", "Description[nl]": "Systeemmonitorwidget die gebruik toont van individuele CPU-kernen", diff --git a/applets/systemmonitor/cpu/metadata.json b/applets/systemmonitor/cpu/metadata.json index 365bc0a34..9e4af2bc1 100644 --- a/applets/systemmonitor/cpu/metadata.json +++ b/applets/systemmonitor/cpu/metadata.json @@ -62,6 +62,7 @@ "Description[id]": "Widget pemantau sistem yang menampilkan penggunaan total CPU", "Description[it]": "Oggetto di monitoraggio del sistema che mostra l'utilizzo totale del processore", "Description[ja]": "CPU 全体の使用率を表示するシステムモニタウィジェット", + "Description[ka]": "სისტემური მონიტორის ვიჯეტი, რომელიც CPU-ის ჯამურ დატვირთვას აჩვენებს", "Description[ko]": "총 CPU 사용량을 표시하는 시스템 모니터 위젯", "Description[lt]": "Sistemos prižiūryklės valdiklis, kuris rodo bendrą procesoriaus naudojimą", "Description[nl]": "Systeemmonitorwidget die het totale gebruik toont de CPU toont", diff --git a/dataengines/dict/plasma-dataengine-dict.json b/dataengines/dict/plasma-dataengine-dict.json index 879e24bf2..5765e24eb 100644 --- a/dataengines/dict/plasma-dataengine-dict.json +++ b/dataengines/dict/plasma-dataengine-dict.json @@ -26,6 +26,7 @@ "Description[id]": "Cari arti kata", "Description[it]": "Cerca i significati delle parole", "Description[ja]": "単語の意味を調べます", + "Description[ka]": "სიყვის მნიშვნელობის მოძებნა", "Description[ko]": "단어의 뜻 찾기", "Description[lt]": "Žodžių reikšmių paieška", "Description[nl]": "Zoek de betekenis van woorden op", diff --git a/kcms/region_language/kcm_regionandlang.json b/kcms/region_language/kcm_regionandlang.json index abe70ee3b..9ae478e52 100644 --- a/kcms/region_language/kcm_regionandlang.json +++ b/kcms/region_language/kcm_regionandlang.json @@ -52,6 +52,7 @@ "Name[ia]": "Region & Linguage", "Name[it]": "Regione e lingua", "Name[ja]": "地域と言語", + "Name[ka]": "რეგიონი და ენა", "Name[ko]": "지역과 언어", "Name[nl]": "Regio & taal", "Name[nn]": "Språk og region", diff --git a/kcms/users/src/kcm_users.json b/kcms/users/src/kcm_users.json index b67b1a067..f9f757b35 100644 --- a/kcms/users/src/kcm_users.json +++ b/kcms/users/src/kcm_users.json @@ -19,6 +19,7 @@ "Description[id]": "Kelola akun pengguna", "Description[it]": "Gestisci gli account degli utenti", "Description[ja]": "ユーザアカウントを管理", + "Description[ka]": "მომხმარებლის ანაგარიშების მართვა", "Description[ko]": "사용자 계정 관리", "Description[lt]": "Tvarkyti naudotojų paskyras", "Description[nl]": "Gebruikersaccounts beheren", diff --git a/kioslave/desktop/desktopnotifier.json b/kioslave/desktop/desktopnotifier.json index 4c859366f..76b049d3c 100644 --- a/kioslave/desktop/desktopnotifier.json +++ b/kioslave/desktop/desktopnotifier.json @@ -19,6 +19,7 @@ "Description[id]": "Memantau direktori terhadap perubahan", "Description[it]": "Sorveglia i cambiamenti nelle cartelle", "Description[ja]": "ディレクトリの変更を監視します", + "Description[ka]": "საქაღალდეების მონიტორინგი ცვლილებებზე", "Description[ko]": "디렉터리 변경 사항을 감시합니다", "Description[lt]": "Stebi pakeitimus kataloguose", "Description[nl]": "Mappen monitoren op wijzigingen", diff --git a/libcolorcorrect/kded/colorcorrectlocationupdater.json b/libcolorcorrect/kded/colorcorrectlocationupdater.json index 5fff447dd..5c54b6c8b 100644 --- a/libcolorcorrect/kded/colorcorrectlocationupdater.json +++ b/libcolorcorrect/kded/colorcorrectlocationupdater.json @@ -36,6 +36,7 @@ "Name[fi]": "Automaattinen sijainti yövärille", "Name[fr]": "Emplacement automatique pour la couleur de nuit", "Name[ja]": "Night Color 位置情報自動検知", + "Name[ka]": "ავტომატური მდებარეობა ღამის ფერისთვის", "Name[nl]": "Automatische locatie voor nachtkleur", "Name[pl]": "Samoczynne położenie barw nocnych", "Name[pt]": "Localização Automática para a Cor Nocturna", diff --git a/lookandfeel/org.kde.breeze/metadata.json b/lookandfeel/org.kde.breeze/metadata.json index d671949ca..bfdffed51 100644 --- a/lookandfeel/org.kde.breeze/metadata.json +++ b/lookandfeel/org.kde.breeze/metadata.json @@ -63,6 +63,7 @@ "Description[id]": "Breeze oleh KDE VDG", "Description[it]": "Brezza del KDE VDG", "Description[ja]": "Breeze by the KDE VDG", + "Description[ka]": "Breeze KDE VDG-სგან", "Description[ko]": "KDE 시각 디자인 그룹에서 제작한 Breeze", "Description[lt]": "Breeze pagal KDE VDG", "Description[nl]": "Breeze door de KDE VDG", diff --git a/lookandfeel/org.kde.breezedark/metadata.json b/lookandfeel/org.kde.breezedark/metadata.json index 482d0309e..dffc5b5e1 100644 --- a/lookandfeel/org.kde.breezedark/metadata.json +++ b/lookandfeel/org.kde.breezedark/metadata.json @@ -63,6 +63,7 @@ "Description[id]": "Breeze oleh KDE VDG", "Description[it]": "Brezza scuro del KDE VDG", "Description[ja]": "Breeze Dark by the KDE VDG", + "Description[ka]": "Breeze Dark \"KDE VDG\"-სგან", "Description[ko]": "KDE 시각 디자인 그룹에서 제작한 어두운 Breeze", "Description[lt]": "Breeze tamsus pagal KDE VDG", "Description[nl]": "Breeze Dark door de KDE VDG", diff --git a/runners/windowedwidgets/plasma-runner-windowedwidgets.json b/runners/windowedwidgets/plasma-runner-windowedwidgets.json index acf1d97b0..be9d34999 100644 --- a/runners/windowedwidgets/plasma-runner-windowedwidgets.json +++ b/runners/windowedwidgets/plasma-runner-windowedwidgets.json @@ -90,7 +90,7 @@ "Name[ar]": "الودجات ذات النوافذ", "Name[ast]": "Widgets en ventana", "Name[az]": "Mobil Vidjetlər", - "Name[bg]": "Приспособления в самостоятелен прозорец", + "Name[bg]": "Уиджети в самостоятелен прозорец", "Name[bs]": "Grafičke kontrole s prozorom", "Name[ca@valencia]": "Ginys en finestres", "Name[ca]": "Ginys en finestres",