From 0af007b462dd9f824b4764cdb3a2bf569c7211d2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 23 Jul 2024 01:20:56 +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" --- src/plugins/logout/package/metadata.json | 2 +- src/plugins/shakecursor/cursors/Breeze_Light/index.theme | 2 ++ src/plugins/shakecursor/cursors/breeze_cursors/index.theme | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/logout/package/metadata.json b/src/plugins/logout/package/metadata.json index 781094727c..992b88afe9 100644 --- a/src/plugins/logout/package/metadata.json +++ b/src/plugins/logout/package/metadata.json @@ -33,7 +33,7 @@ "Description[hu]": "Finom elhalványulás a kijelentkező képernyőre", "Description[ia]": "Dulcemente pallidi al schermo de abandono (logout)", "Description[is]": "Láta skjáborð hverfa og útskráningarskjá birtast mjúklega", - "Description[it]": "Dissolvenza graduale alla schermata di uscita", + "Description[it]": "Dissolvenza graduale alla schermata di chiusura della sessione", "Description[ja]": "ログアウト画面を滑らかに表示します", "Description[ka]": "გასვლის ფანჯარაზე რბილად გადასვლა", "Description[ko]": "로그아웃 화면으로 부드럽게 전환합니다", diff --git a/src/plugins/shakecursor/cursors/Breeze_Light/index.theme b/src/plugins/shakecursor/cursors/Breeze_Light/index.theme index cf0b040df6..61cf0298f1 100644 --- a/src/plugins/shakecursor/cursors/Breeze_Light/index.theme +++ b/src/plugins/shakecursor/cursors/Breeze_Light/index.theme @@ -14,6 +14,7 @@ Name[he]=בריזה בהירה Name[hu]=Breeze Light Name[ia]=Breeze Light (Brisa Ligier) Name[is]=Breeze Light +Name[it]=Brezza chiaro Name[ka]=Breeze ღია Name[lt]=Breeze šviesus Name[nl]=Breeze Light @@ -42,6 +43,7 @@ Comment[he]=בריזה בהירה מאת צוות העיצוב החזותי של Comment[hu]=Breeze Light a KDE VDG-től Comment[ia]=Breeze (Brisa) Ligier per KDE VDG Comment[is]=Breeze Light frá KDE VDG +Comment[it]=Brezza chiaro a cura del VDG di KDE Comment[ka]=Breeze-ის ღია ვარიანტი, KDE VDG-სგან Comment[lt]=Breeze šviesus pagal KDE VDG Comment[nl]=Breeze Light door de KDE VDG diff --git a/src/plugins/shakecursor/cursors/breeze_cursors/index.theme b/src/plugins/shakecursor/cursors/breeze_cursors/index.theme index adf3c6cf85..8c235950c5 100644 --- a/src/plugins/shakecursor/cursors/breeze_cursors/index.theme +++ b/src/plugins/shakecursor/cursors/breeze_cursors/index.theme @@ -14,6 +14,7 @@ Name[he]=בריזה Name[hu]=Breeze Name[ia]=Breeze(Brisa) Name[is]=Breeze +Name[it]=Brezza Name[ka]=Breeze Name[lt]=Breeze Name[nl]=Breeze @@ -42,6 +43,7 @@ Comment[he]=בריזה מאת צוות העיצוב החזותי של KDE Comment[hu]=Breeze a KDE VDG-től Comment[ia]=Breeze (Brisa) per le KDE VDG Comment[is]=Breeze frá KDE VDG +Comment[it]=Brezza a cura del KDE VDG Comment[ka]=Breeze KDE VDG-სგან Comment[lt]=Breeze pagal KDE VDG Comment[nl]=Breeze door de KDE VDG