From 8e140db62eb47ede71ff8cb306abde18c327eead Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 2 Jan 2023 02:31:51 +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/dialogparent/package/metadata.json | 2 +- src/kcms/rules/org.kde.kwin_rules_dialog.desktop | 2 +- src/kcms/scripts/kwinscripts.knsrc | 1 + src/kcms/tabbox/kwinswitcher.knsrc | 1 + src/kwin.notifyrc | 8 ++++++-- .../krunner-integration/kwin-runner-windows.desktop | 2 ++ src/scripting/kwinscript.desktop | 1 + src/tabbox/kwindesktopswitcher.desktop | 1 + src/tabbox/kwinwindowswitcher.desktop | 1 + 9 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/effects/dialogparent/package/metadata.json b/src/effects/dialogparent/package/metadata.json index cbdbc7c57f..b0ec023764 100644 --- a/src/effects/dialogparent/package/metadata.json +++ b/src/effects/dialogparent/package/metadata.json @@ -33,7 +33,7 @@ "Description[ar]": "تعتم النافذة المولدة للحوار النشط حالياً", "Description[be]": "Зацямненне бацькоўскага акна актыўнага дыялогавага акна", "Description[bg]": "Затъмняване на главния от активните прозорци", - "Description[ca@valencia]": "Enfosquix la finestra principal del diàleg actual actiu", + "Description[ca@valencia]": "Enfosquix la finestra principal del diàleg actualment actiu", "Description[ca]": "Enfosqueix la finestra principal del diàleg actualment actiu", "Description[en_GB]": "Darkens the parent window of the currently active dialog", "Description[es]": "Oscurece la ventana padre del diálogo activo", diff --git a/src/kcms/rules/org.kde.kwin_rules_dialog.desktop b/src/kcms/rules/org.kde.kwin_rules_dialog.desktop index 5f1134ed44..b3223c2c90 100644 --- a/src/kcms/rules/org.kde.kwin_rules_dialog.desktop +++ b/src/kcms/rules/org.kde.kwin_rules_dialog.desktop @@ -27,7 +27,7 @@ Name[hr]=Pravila prozora Name[hu]=Ablakszabályok Name[ia]=Regulas de fenestra Name[id]=Peraturan Jendela -Name[is]=Gluggahegðunarreglur +Name[is]=Gluggareglur Name[it]=Regole delle finestre Name[ja]=ウィンドウルール Name[ka]=ფანჯრების წესები diff --git a/src/kcms/scripts/kwinscripts.knsrc b/src/kcms/scripts/kwinscripts.knsrc index 1eacae6d2d..e41e7cad5d 100644 --- a/src/kcms/scripts/kwinscripts.knsrc +++ b/src/kcms/scripts/kwinscripts.knsrc @@ -20,6 +20,7 @@ Name[gl]=Scripts do xestor de xanelas Name[hu]=Ablakkezelő szkriptek Name[ia]=Gerente de scripts de fenestra Name[id]=Skrip Pengelola Jendela +Name[is]=Gluggastjóraskriftur Name[it]=Script del gestore delle finestre Name[ka]=ფანჯრების მმართველის სკრიპტები Name[ko]=창 관리자 스크립트 diff --git a/src/kcms/tabbox/kwinswitcher.knsrc b/src/kcms/tabbox/kwinswitcher.knsrc index 556590291b..69851bc6a5 100644 --- a/src/kcms/tabbox/kwinswitcher.knsrc +++ b/src/kcms/tabbox/kwinswitcher.knsrc @@ -21,6 +21,7 @@ Name[he]=מחליף פריסות של מנהל החלונות Name[hu]=Ablakkezelő-váltó elrendezések Name[ia]=Disposition de commutator de gerente de fenestra Name[id]=Tataletak Pengalihan Pengelola Jendela +Name[is]=Framsetning á skiptiaðgerð gluggastjóra Name[it]=Disposizioni selettore del gestore delle finestre Name[ka]=ფანჯრების გადართვის განლაგებები Name[ko]=창 관리자 전환기 레이아웃 diff --git a/src/kwin.notifyrc b/src/kwin.notifyrc index fb422779a0..5b71d1556d 100644 --- a/src/kwin.notifyrc +++ b/src/kwin.notifyrc @@ -96,7 +96,7 @@ Name[hr]=Miješanje je pauzirano Name[hu]=A kompozit mód felfüggesztve Name[ia]=Composition ha essite suspendite Name[id]=Pengomposisian telah disuspensi -Name[is]=Gerð skjásamsetningar hefur verið hætt í bili +Name[is]=Myndsmíði hefur verið hætt Name[it]=La composizione è stata sospesa Name[ja]=コンポジティングが一時停止されました Name[ka]=კომპოზიტურობა შეჩერდა @@ -163,7 +163,7 @@ Comment[hr]=Neka aplikacija je dala zahtjev za paziranjem miješanja. Comment[hu]=Egy másik alkalmazás a kompozit mód felfüggesztését kérte. Comment[ia]=Altere application ha requirite de suspender le composition. Comment[id]=Aplikasi lain telah meminta untuk mensuspensi komposit. -Comment[is]=Annað forrit hefur beðið um að skjásamsetningu verði hætt. +Comment[is]=Annað forrit hefur beðið um að myndsmíði verði hætt. Comment[it]=Un'altra applicazione ha richiesto di sospendere la composizione. Comment[ja]=他のアプリケーションがコンポジティングの一時停止を要求しました。 Comment[ka]=კომპოზიტურობის შეჩერება სხვა აპლიკაციამ მოითხოვა. @@ -229,6 +229,7 @@ Name[he]=איפוס גרפיקה Name[hu]=Grafikai visszaállítás Name[ia]=Reinitia Graphic Name[id]=Set-ulang Grafik +Name[is]=Myndendurstilling Name[it]=Azzeramento grafica Name[ka]=გრაფიკის საწყის მნიშვნელობაზე დაყენება Name[kk]=Графиканы ысыру @@ -281,6 +282,7 @@ Comment[he]=הגרפיקה אופסה Comment[hu]=Egy grafikai visszaállítás esemény történt Comment[ia]=Il necessita un evento de reinitiar le graphic Comment[id]=Sebuah peristiwa set ulang grafik yang terjadi +Comment[is]=Myndendurstillingaratvik kom upp Comment[it]=Si è verificato un evento di azzeramento della grafica Comment[ka]=გრაფიკის საწყის მნიშვნელობაზე დაყენება Comment[kk]=Графиканы ысыру оқиғасы болды @@ -329,6 +331,7 @@ Name[fr]=Plantage « Xwayland » Name[hu]=Xwayland összeomlás Name[ia]=Xwayland Crash Name[id]=Xwayland Crash +Name[is]=Xwayland hrun Name[it]=Chiusura inattesa di Xwayland Name[ka]=Xwayland -ის ავარია Name[ko]=Xwayland 충돌 @@ -368,6 +371,7 @@ Comment[fr]=Plantage de « Xwayland » Comment[hu]=Az Xwayland összeomlott Comment[ia]=Xwayland ha fracassate Comment[id]=Xwayland mengalami kres +Comment[is]=Xwayland hrundi Comment[it]=Xwayland è stato terminato in modo inatteso Comment[ka]=Xwayland ავარიულად დასრულდა Comment[ko]=Xwayland가 충돌함 diff --git a/src/plugins/krunner-integration/kwin-runner-windows.desktop b/src/plugins/krunner-integration/kwin-runner-windows.desktop index ac13e17059..5f9025b00a 100644 --- a/src/plugins/krunner-integration/kwin-runner-windows.desktop +++ b/src/plugins/krunner-integration/kwin-runner-windows.desktop @@ -18,6 +18,7 @@ Name[fr]=Fenêtres Name[hu]=Ablakok Name[ia]=Fenestras Name[id]=Windows +Name[is]=Gluggar Name[it]=Finestre Name[ka]=ფანჯრები Name[ko]=창 @@ -57,6 +58,7 @@ Comment[fr]=Lister les fenêtres et les bureaux pour pouvoir passer de l'un à l Comment[hu]=Ablakok és asztalok listázása, és váltás azokra Comment[ia]=Lista fenestras e scriptorios e commuta los Comment[id]=Daftar jendela dan desktop dan beralih diantarnya +Comment[is]=Sýna lista yfir glugga og skjáborð og skipta á milli þeirra Comment[it]=Elenca e seleziona le finestre e i desktop Comment[ka]=ფანჯრებისა და სამუშაო მაგიდების სია და მათ შორის გადართვა Comment[ko]=창 및 바탕 화면 목록을 보여 주고 전환합니다 diff --git a/src/scripting/kwinscript.desktop b/src/scripting/kwinscript.desktop index 3b07a62e07..fcf3e86bfa 100644 --- a/src/scripting/kwinscript.desktop +++ b/src/scripting/kwinscript.desktop @@ -26,6 +26,7 @@ Comment[he]=תוספים של KWin Comment[hu]=KWin parancsfájl Comment[ia]=Script de kwin Comment[id]=Skrip KWin +Comment[is]=KWin skrifta Comment[it]=Script kwin Comment[ja]=KWin Script Comment[ka]=KWin სკრიპტი diff --git a/src/tabbox/kwindesktopswitcher.desktop b/src/tabbox/kwindesktopswitcher.desktop index 7e6faeb6ed..29016fceda 100644 --- a/src/tabbox/kwindesktopswitcher.desktop +++ b/src/tabbox/kwindesktopswitcher.desktop @@ -25,6 +25,7 @@ Comment[he]=פריסת מחליף שולחנות עבודה של KWin Comment[hu]=KWin asztalváltó elrendezés Comment[ia]=Disposition de commutator de scriptorio de KWin Comment[id]=Tataletak Pengalih Desktop KWin +Comment[is]=Framsetning KWin skjáborðsskiptiaðgerðar Comment[it]=Disposizione selettore desktop KWin Comment[ja]=KWin デスクトップスイッチャーレイアウト Comment[ka]=KWin -ის სამუშაო მაგიდის გადართვის განლაგება diff --git a/src/tabbox/kwinwindowswitcher.desktop b/src/tabbox/kwinwindowswitcher.desktop index 9650b0437d..f997805227 100644 --- a/src/tabbox/kwinwindowswitcher.desktop +++ b/src/tabbox/kwinwindowswitcher.desktop @@ -25,6 +25,7 @@ Comment[he]=פריסת מחליף חלונות של KWin Comment[hu]=KWin ablakváltó elrendezés Comment[ia]=Disposition de commutator de fenestra de KWin Comment[id]=Tataletak Pengalih Jendela KWin +Comment[is]=Framsetning KWin gluggaskiptiaðgerðar Comment[it]=Disposizione selettore delle finestre KWin Comment[ja]=KWin ウィンドウスイッチャーレイアウト Comment[ka]=KWin ფანჯრების გადართვის განლაგება