From 79b35e10703f26479ebfad0ff50b3efcc61041ca Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 26 Nov 2022 01:50:13 +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/effects/snaphelper/metadata.json | 1 + src/effects/startupfeedback/metadata.json | 1 + src/effects/thumbnailaside/metadata.json | 1 + src/effects/trackmouse/metadata.json | 1 + src/effects/wobblywindows/metadata.json | 1 + src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json | 5 +++++ .../aurorae/themes/plastik/package/metadata.json | 1 + .../kpackage/aurorae/kwin-packagestructure-aurorae.json | 1 + 8 files changed, 12 insertions(+) diff --git a/src/effects/snaphelper/metadata.json b/src/effects/snaphelper/metadata.json index f7aed0a52d..b5374d5e67 100644 --- a/src/effects/snaphelper/metadata.json +++ b/src/effects/snaphelper/metadata.json @@ -60,6 +60,7 @@ "Name[id]": "Pembantu Snap", "Name[it]": "Centratore", "Name[ja]": "スナップヘルパー", + "Name[ka]": "მიმაგრების დამხმარე", "Name[ko]": "자석 효과", "Name[nl]": "Vastpinhulp", "Name[nn]": "Midthjelpar", diff --git a/src/effects/startupfeedback/metadata.json b/src/effects/startupfeedback/metadata.json index 7e7e9a75d4..a2e2d64621 100644 --- a/src/effects/startupfeedback/metadata.json +++ b/src/effects/startupfeedback/metadata.json @@ -59,6 +59,7 @@ "Name[id]": "Feedback Pemulaian", "Name[it]": "Segnale di avvio", "Name[ja]": "起動フィードバック", + "Name[ka]": "გაშვების უკუკავშირი", "Name[ko]": "실행 피드백", "Name[nl]": "Terugkoppeling van opstarten", "Name[nn]": "Oppstartsmelding", diff --git a/src/effects/thumbnailaside/metadata.json b/src/effects/thumbnailaside/metadata.json index df3280a54c..8b0ca38150 100644 --- a/src/effects/thumbnailaside/metadata.json +++ b/src/effects/thumbnailaside/metadata.json @@ -60,6 +60,7 @@ "Name[id]": "Thumbnail Aside", "Name[it]": "Miniature a fianco", "Name[ja]": "サムネイルをわきに", + "Name[ka]": "მინიატურა გვერდითვე", "Name[ko]": "옆쪽에 축소판", "Name[nl]": "Miniatuur ernaast", "Name[nn]": "Miniatyrbilete ved skjermkanten", diff --git a/src/effects/trackmouse/metadata.json b/src/effects/trackmouse/metadata.json index 54c666d207..def787e38c 100644 --- a/src/effects/trackmouse/metadata.json +++ b/src/effects/trackmouse/metadata.json @@ -60,6 +60,7 @@ "Name[id]": "Lacak mouse", "Name[it]": "Trova il mouse", "Name[ja]": "マウスを追跡", + "Name[ka]": "თაგუნას დევნება", "Name[ko]": "마우스 추적", "Name[nl]": "Muis volgen", "Name[nn]": "Følg musepeikaren", diff --git a/src/effects/wobblywindows/metadata.json b/src/effects/wobblywindows/metadata.json index cf9da8b397..e50034f880 100644 --- a/src/effects/wobblywindows/metadata.json +++ b/src/effects/wobblywindows/metadata.json @@ -60,6 +60,7 @@ "Name[id]": "Wobbly Windows", "Name[it]": "Finestre tremolanti", "Name[ja]": "ぐらぐらウィンドウ", + "Name[ka]": "მოკანკალე ფანჯრები", "Name[ko]": "흔들리는 창", "Name[nl]": "Wiebelende vensters", "Name[nn]": "Vaklande vindauge", diff --git a/src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json b/src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json index aeaa9c0106..37e2517963 100644 --- a/src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json +++ b/src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json @@ -39,8 +39,13 @@ "Name[ar]": "إيماءات شاشة اللمس", "Name[ca@valencia]": "Gestos de pantalla tàctil", "Name[ca]": "Gestos de pantalla tàctil", + "Name[es]": "Gestos de la pantalla táctil", "Name[eu]": "Ukimen-pantailako keinuak", + "Name[ka]": "სენსორული ეკრანის ჟესტები", + "Name[nl]": "Veeggebaren voor aanraakscherm", + "Name[sl]": "Geste po zaslonu z dotikom", "Name[tr]": "Dokunmatik Ekran Hareketleri", + "Name[uk]": "Жести на сенсорній панелі", "Name[x-test]": "xxTouchscreen Gesturesxx" }, "X-DocPath": "kcontrol/kwintouchscreen/index.html", diff --git a/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.json b/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.json index c426c7e516..7e62289c63 100644 --- a/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.json +++ b/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.json @@ -54,6 +54,7 @@ "Name[eu]": "Plastik", "Name[fr]": "Plastik", "Name[it]": "Plastik", + "Name[ka]": "Plastik", "Name[nl]": "Plastik", "Name[pt]": "Plastik", "Name[sl]": "Plastik", diff --git a/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json b/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json index 78e23756ae..a45d4c64f3 100644 --- a/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json +++ b/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json @@ -64,6 +64,7 @@ "Name[id]": "Aurorae KWin", "Name[it]": "KWin Aurorae", "Name[ja]": "KWin Aurorae", + "Name[ka]": "KWin Aurorae", "Name[ko]": "KWin Aurorae", "Name[lt]": "KWin Aurorae", "Name[nl]": "KWin Aurorae",