From a839dadf9b29ffec357d7e1d0e3d1568071d5874 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 8 Sep 2018 08:44:29 +0200 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" --- kcmkwin/kwinoptions/kwinadvanced.desktop | 2 +- kcmkwin/kwinscreenedges/kwintouchscreen.desktop | 2 +- kcmkwin/kwinscripts/kwinscripts.desktop | 2 +- kwin.notifyrc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index f4d627d14e..d2e868ed94 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -116,7 +116,7 @@ Comment[gl]=Funcionalidades avanzadas da xestión de xanelas Comment[he]=תכונות ניהול חלונות מתקדמים Comment[hu]=Speciális ablakkezelési szolgáltatások Comment[ia]=Characteristicas avantiate de gestion de fenestra -Comment[id]=Fitur Pengelolaan Jendela Lanjutan +Comment[id]=Fitur Pengelolaan Jendela Tingkatlanjut Comment[it]=Funzionalità avanzate della gestione delle finestre Comment[ja]=高度なウインドウ管理機能 Comment[ko]=고급 창 관리자 기능 설정 diff --git a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop index a710d57ee8..25f0cc6904 100644 --- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop +++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop @@ -61,7 +61,7 @@ Comment[fr]=Mouvements sur l'écran tactile Comment[gl]=Xestos de pantalla táctil Comment[he]=מחוות החלקה של מסכי מגע Comment[hu]=Érintőképernyő-gesztusok -Comment[id]=Isyarat usap layar sentuh +Comment[id]=Isyarat usapan layar sentuh Comment[it]=Gesti dello schermo a sfioramento Comment[ko]=터치 스크린 밀기 제스처 Comment[nl]=Veeggebaren voor aanraakscherm diff --git a/kcmkwin/kwinscripts/kwinscripts.desktop b/kcmkwin/kwinscripts/kwinscripts.desktop index 8bcbea9eeb..7d975c1e58 100644 --- a/kcmkwin/kwinscripts/kwinscripts.desktop +++ b/kcmkwin/kwinscripts/kwinscripts.desktop @@ -129,7 +129,7 @@ Comment[gl]=Xestiona os scripts de KWin Comment[he]=נהל תוספים של KWin Comment[hu]=KWin szkriptek kezelése Comment[ia]=Gere scriptos de KWin -Comment[id]=Atur skrip KWin +Comment[id]=Kelola skrip KWin Comment[it]=Gestione script kwin Comment[kk]=KWin скрипттерін басқару Comment[km]=គ្រប់គ្រង​ស្គ្រីប KWin diff --git a/kwin.notifyrc b/kwin.notifyrc index e9595c61a1..05cfbff8e9 100644 --- a/kwin.notifyrc +++ b/kwin.notifyrc @@ -152,7 +152,7 @@ Comment[he]=יישום אחר ביקש להשהות את השזירה. 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 suspensi komposit. +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[it]=Un'altra applicazione ha richiesto di sospendere la composizione. Comment[ja]=他のアプリケーションがコンポジティングの一時停止を要求しました。