From d4b6c8f911e8a9a763d78ae5ef2698fb1a21f2ee Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 24 Nov 2022 01:51:45 +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" --- .../kwinscreenedges/kcm_kwintouchscreen.json | 36 +------------------ .../kwin-runner-windows.desktop | 1 + 2 files changed, 2 insertions(+), 35 deletions(-) diff --git a/src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json b/src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json index 936ca21c5f..b6ed37a224 100644 --- a/src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json +++ b/src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json @@ -35,41 +35,7 @@ "Description[zh_CN]": "配置触摸屏滑动手势", "Description[zh_TW]": "設定觸控螢幕滑動手勢", "Icon": "preferences-desktop-gestures-touch", - "Name": "Touchscreen Gestures", - "Name[ar]": "شاشة اللمس", - "Name[az]": "Toxunma ekranı", - "Name[bg]": "Сензорен екран", - "Name[ca@valencia]": "Pantalla tàctil", - "Name[ca]": "Pantalla tàctil", - "Name[cs]": "Dotyková obrazovka", - "Name[de]": "Touchscreen", - "Name[en_GB]": "Touch Screen", - "Name[es]": "Pantalla táctil", - "Name[et]": "Puuteekraan", - "Name[eu]": "Ukimen-pantaila", - "Name[fi]": "Kosketusnäyttö", - "Name[fr]": "Écran tactile", - "Name[id]": "Layar Sentuh", - "Name[it]": "Schermo a sfioramento", - "Name[ja]": "タッチスクリーン", - "Name[ka]": "სენსორული ეკრანი", - "Name[ko]": "터치 스크린", - "Name[nl]": "Aanraakscherm", - "Name[nn]": "Trykkskjerm", - "Name[pl]": "Ekran dotykowy", - "Name[pt]": "Ecrã Táctil", - "Name[pt_BR]": "Tela sensível ao toque", - "Name[ru]": "Сенсорный экран", - "Name[sk]": "Dotyková obrazovka", - "Name[sl]": "Zaslon na dotik", - "Name[sv]": "Pekskärm", - "Name[ta]": "தொடுதிரை", - "Name[tr]": "Dokunmatik Ekran", - "Name[uk]": "Сенсорний екран", - "Name[vi]": "Màn hình cảm ứng", - "Name[x-test]": "xxTouch Screenxx", - "Name[zh_CN]": "触摸屏", - "Name[zh_TW]": "觸控螢幕" + "Name": "Touchscreen Gestures" }, "X-DocPath": "kcontrol/kwintouchscreen/index.html", "X-KDE-Keywords": "kwin,window,manager,effect,edge,border,action,switch,desktop,desktop edges,screen edges,side of screen,screen behavior,touch screen", diff --git a/src/plugins/krunner-integration/kwin-runner-windows.desktop b/src/plugins/krunner-integration/kwin-runner-windows.desktop index 659090b1d0..ff0552d1c4 100644 --- a/src/plugins/krunner-integration/kwin-runner-windows.desktop +++ b/src/plugins/krunner-integration/kwin-runner-windows.desktop @@ -100,6 +100,7 @@ X-Plasma-Runner-Syntax-Descriptions[eu]=Haien izena edo leihoko aplikazioa :q:(e X-Plasma-Runner-Syntax-Descriptions[fr]=Trouve les fenêtres dont le nom ou l’application correspondent à :q:. Il est possible d’interagir avec les fenêtres en utilisant l’un des mots-clés suivants : activate, close, min(imize), max(imize), fullscreen, shade, keep above et keep below. Trouve les fenêtres étant sur le bureau nommé :q:. Bascule vers le bureau nommé :q:. Liste toutes les fenêtres et permet de les activer. Liste tous les autres bureaux et permet de naviguer entre eux. X-Plasma-Runner-Syntax-Descriptions[it]=Trova le finestre il cui nome o applicazione della finestra corrisponde a :q:. È possibile interagire con le finestre utilizzando una delle seguenti parole chiave: attiva\\, chiudi\\, min(imizza)\\, mas(simizza)\\, schermo interno\\, arrotola\\, mantieni sopra e mantieni sotto.,Trova le finestre che si trovano sul desktop con nome :q:,Passa al desktop con nome :q:,Elenca tutte le finestre e consente di attivarle.,Elenca tutti gli altri desktop e consente di passarvi. X-Plasma-Runner-Syntax-Descriptions[nl]=Zoekt vensters waarvan de naam of venstertoepassing overeenkomt met :q:. Het is mogelijk om te werken met de vensters door een van de volgende trefwoorden te gebruiken: activeer\\, sluiten\\, min(imaliseren)\\, max(imaliseren)\\, volledig scherm\\, oprollen\\, boven houden en onder houden.,Zoek vensters die op het bureaublad zijn genaamd :q:,Schakel om naar bureaublad genaamd :q:,Maak een lijst met alle vensters en sta toe ze te activeren.,Maak een lijst met alle andere bureaubladen en sta toe naar ze over te schakelen. +X-Plasma-Runner-Syntax-Descriptions[pl]=Znajduje okna, których nazwa lub okno aplikacji odpowiada :q:. Można oddziaływać na okno poprzez użyci jednego z następujących słów kluczowych: activate\\, close\\, min(imize)\\, max(imize)\\, fullscreen\\, shade\\, keep above oraz keep below., Znajduje okna, które na pulpicie nazywają się :q:,Przełącza na pulpit o nazwie :q:,Wymienia wszystkie okna i umożliwia ich uaktywnienie.,Wymienia wszystkie inne pulpity i umożliwia przełączenie do nich. X-Plasma-Runner-Syntax-Descriptions[pt]=Descobre as janelas cujo nome ou aplicação da janela corresponde a :q:. É possível interagir com as janelas, usando uma das seguintes palavras-chave: activar\\, fechar\\, min(imizar)\\, max(imizar)\\, ecrã completo\\, enrolar\\, manter acima e manter abaixo.,Descobre as janelas que estão no ecrã chamado :q:,Muda para o ecrã chamado :q:,Apresenta todas as janelas e permite activá-las.,Apresenta todos os outros ecrãs e permite mudar para eles. X-Plasma-Runner-Syntax-Descriptions[sl]=Poišče okna, pri katerih ime ali okenska aplikacija ujema z :q: . Možna je interakcija z okni z uporabo ene od naslednjih ključnih besed: activate\\, close\\, min(imize)\\, max(imize)\\, fullscreen\\, shade\\, keep above and keep below. Poišče okna, ki so na namizju z imenom :q:,Preklopite na namizje z imenom :q:, naredi seznam vseh oken in omogoča, da jih aktivirate.,Naredi seznam vseh drugih namizij in omogoča prehod nanje. X-Plasma-Runner-Syntax-Descriptions[tr]=Adı veya uygulaması :q: ile eşleşen pencereleri bulur. Aşağıdaki anahtar sözcüklerden birini kullanarak pencerelerle etkileşmek olanaklıdır: activate\\, close\\, min(imize)\\, max(imize)\\, fullscreen\\, shade\\, keep above ve keep below.,:q: adlı masaüstünde bulunan pencereleri bulur, :q: adlı masaüstüne geçer,tüm pencereleri listeler ve etkinleştirmeye izin verir.,tüm diğer masaüstlerini listeler ve onlara geçmeye için verir.