From 94093822199c8827ed2b553f06c2109c77cd4da4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 11 Mar 2018 07:13:46 +0100 Subject: [PATCH 1/4] 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" --- applets/activitybar/metadata.desktop | 2 +- applets/analog-clock/metadata.desktop | 2 +- applets/appmenu/package/metadata.desktop | 2 ++ applets/batterymonitor/package/metadata.desktop | 3 ++- applets/calendar/package/metadata.desktop | 1 + applets/clipboard/metadata.desktop | 1 + applets/devicenotifier/package/metadata.desktop | 2 +- .../devicenotifier/test-predicate-openinwindow.desktop | 2 +- applets/lock_logout/metadata.desktop | 6 +++--- applets/notifications/package/metadata.desktop | 4 ++-- applets/panelspacer/metadata.desktop | 4 ++-- applets/systemmonitor/cpu/metadata.desktop | 2 ++ applets/systemmonitor/diskactivity/metadata.desktop | 4 ++-- applets/systemmonitor/diskusage/metadata.desktop | 4 ++-- applets/systemmonitor/memory/metadata.desktop | 4 ++-- applets/systemmonitor/net/metadata.desktop | 2 +- components/shellprivate/widgetexplorer/plasmoids.knsrc | 1 + .../plasma-containmentactions-contextmenu.desktop | 2 +- .../paste/plasma-containmentactions-paste.desktop | 2 +- .../plasma-containmentactions-switchactivity.desktop | 4 ++-- .../plasma-containmentactions-switchdesktop.desktop | 4 ++-- .../plasma-containmentactions-switchwindow.desktop | 4 ++-- .../plasma-dataengine-devicenotifications.desktop | 2 +- .../filebrowser/plasma-dataengine-filebrowser.desktop | 4 ++-- .../plasma-dataengine-notifications.desktop | 2 +- dataengines/places/plasma-dataengine-places.desktop | 2 +- freespacenotifier/freespacenotifier.notifyrc | 2 +- klipper/klipperrc.desktop | 10 +++++----- menu/desktop/kf5-utilities-file.directory | 4 ++-- phonon/platform_kde/phonon.notifyrc | 2 +- .../activities/plasma-runner-activityrunner.desktop | 2 +- runners/locations/plasma-runner-locations.desktop | 2 +- runners/sessions/plasma-runner-sessions.desktop | 2 +- runners/windows/plasma-runner-windows.desktop | 2 +- statusnotifierwatcher/statusnotifierwatcher.desktop | 2 +- themes/qtmacintosh.themerc | 2 +- 36 files changed, 55 insertions(+), 47 deletions(-) diff --git a/applets/activitybar/metadata.desktop b/applets/activitybar/metadata.desktop index 2d5c1933a..7595f8ca0 100644 --- a/applets/activitybar/metadata.desktop +++ b/applets/activitybar/metadata.desktop @@ -98,7 +98,7 @@ Comment[hi]=क्रिया स्विच करने के लिए ट Comment[hr]=Traka za mijenjanje aktivnosti Comment[hu]=Aktivitások közötti váltásra szolgáló lapozóelem Comment[ia]=Barra de scheda pro commutar activitates -Comment[id]=Bilah tab untuk berpindah aktivitas +Comment[id]=Bilah tab untuk beralih aktivitas Comment[is]=Flipaslá til að skipta um verkefni Comment[it]=Barra a schede per cambiare attività Comment[ja]=アクティビティを切り替えるタブバー diff --git a/applets/analog-clock/metadata.desktop b/applets/analog-clock/metadata.desktop index 364438713..f0545c530 100644 --- a/applets/analog-clock/metadata.desktop +++ b/applets/analog-clock/metadata.desktop @@ -108,7 +108,7 @@ Comment[hi]=सुई वाली घडी Comment[hr]=Sat s kazaljkama Comment[hu]=Óra mutatókkal Comment[ia]=Un horologio con manos -Comment[id]=Sebuah jam dengan tangan +Comment[id]=Sebuah jam tangan Comment[is]=Klukka með vísum Comment[it]=Un orologio con lancette Comment[ja]=針のある時計 diff --git a/applets/appmenu/package/metadata.desktop b/applets/appmenu/package/metadata.desktop index ad3c8218a..0e8dafec0 100644 --- a/applets/appmenu/package/metadata.desktop +++ b/applets/appmenu/package/metadata.desktop @@ -16,6 +16,7 @@ Name[fr]=Menu global Name[gl]=Menú global Name[he]=תפריט גלובלי Name[hu]=Globális menü +Name[id]=Menu Global Name[it]=Menu globale Name[ko]=전역 메뉴 Name[lt]=Visuotinis meniu @@ -51,6 +52,7 @@ Comment[fi]=Työpöydänlaajuinen valikkorivi ruudun ylälaidassa Comment[fr]=Barre de menu globale en haut de l'écran Comment[gl]=Barra de menú global na parte superior da pantalla. Comment[hu]=Globális menüsáv a képernyő tetején +Comment[id]=Bilah menu global berada di atas layar Comment[it]=Barra dei menu globale nella parte alta dello schermo Comment[nl]=Globale menubalk bovenaan het scherm Comment[nn]=Global menylinje øvst på skjermen diff --git a/applets/batterymonitor/package/metadata.desktop b/applets/batterymonitor/package/metadata.desktop index 7b2803f51..d760be221 100644 --- a/applets/batterymonitor/package/metadata.desktop +++ b/applets/batterymonitor/package/metadata.desktop @@ -16,6 +16,7 @@ Name[fr]=Batterie et luminosité Name[gl]=Batería e brillo Name[he]=סוללה ובהירות Name[hu]=Akkumulátor és fényerő +Name[id]=Baterai dan Kecerahan Name[is]=Rafhlaða og skjábirta Name[it]=Batteria e luminosità Name[ja]=バッテリーと明るさ @@ -70,7 +71,7 @@ Comment[hr]=Vidite trenutno stanje baterije Comment[hsb]=Pohladajće na status akuwa Comment[hu]=Kijelzi a telepek állapotát Comment[ia]=Vide le stato de energia de tu batteria -Comment[id]=Lihat status daya dari baterai anda +Comment[id]=Lihat status daya bateraimu Comment[is]=Sjá orkustöðu rafhlöðu Comment[it]=Indica lo stato di carica della batteria Comment[ja]=バッテリの状態を表示します diff --git a/applets/calendar/package/metadata.desktop b/applets/calendar/package/metadata.desktop index 601c256ed..f92f0d930 100644 --- a/applets/calendar/package/metadata.desktop +++ b/applets/calendar/package/metadata.desktop @@ -92,6 +92,7 @@ Comment[fr]=Vue mensuelle avec vos rendez-vous et évènements Comment[gl]=Pantalla do mes con citas e eventos. Comment[he]=תצוגה חודשית עם הפגישות והאירועים שלך Comment[hu]=Megjeleníti a hónapban esedékes időpontokat és eseményeket +Comment[id]=Tayangan bulan dengan acara dan janjimu Comment[it]=Visualizzazione del mese con i tuoi appuntamenti ed eventi Comment[ko]=내 약속과 이벤트가 있는 달력 표시 Comment[lt]=Jūsų užduotys ir įvykiai mėnesiui diff --git a/applets/clipboard/metadata.desktop b/applets/clipboard/metadata.desktop index 8535f2d8b..8e81c981d 100644 --- a/applets/clipboard/metadata.desktop +++ b/applets/clipboard/metadata.desktop @@ -58,6 +58,7 @@ Comment[fi]=Tarjoaa pääsyn leikepöydän historiaan Comment[fr]=Donne accès à l'historique du presse-papiers Comment[gl]=Fornece acceso ao historial do portapapeis. Comment[hu]=Hozzáférést nyújt a vágólap előzményeihez +Comment[id]=Menyediakan akses ke riwayat papan klip Comment[it]=Fornisce l'accesso allo storico degli appunti Comment[ko]=클립보드 기록 표시 Comment[nl]=Biedt toegang tot de geschiedenis van klembord diff --git a/applets/devicenotifier/package/metadata.desktop b/applets/devicenotifier/package/metadata.desktop index 5c4fa893f..83fe809c3 100644 --- a/applets/devicenotifier/package/metadata.desktop +++ b/applets/devicenotifier/package/metadata.desktop @@ -105,7 +105,7 @@ Comment[hr]=Obavijesti i pristup novim uređajima Comment[hsb]=Zdźělenki a spřistupnjenje nowych gratow Comment[hu]=Új eszközök elérése, értesítő üzenetek kezelése Comment[ia]=Notificationes e accesso pro nove dispositivos -Comment[id]=Notifikasi dan akses untuk peranti baru +Comment[id]=Pemberitahuan dan akses terhadap peranti baru Comment[is]=Tilkynningar um og aðgangur að nýjum tækjum Comment[it]=Notifiche e accesso ai nuovi dispositivi Comment[ja]=新しいデバイスの通知とアクセスを提供します diff --git a/applets/devicenotifier/test-predicate-openinwindow.desktop b/applets/devicenotifier/test-predicate-openinwindow.desktop index 429920f13..11bedd42c 100644 --- a/applets/devicenotifier/test-predicate-openinwindow.desktop +++ b/applets/devicenotifier/test-predicate-openinwindow.desktop @@ -30,7 +30,7 @@ Name[hi]=फ़ाइल प्रबंधक से खोलें Name[hr]=Otvori pomoću upravitelja datoteka Name[hu]=Megnyitás a fájlkezelővel Name[ia]=Aperi con le gerente de files -Name[id]=Buka Dengan Manajer Berkas +Name[id]=Buka Dengan Pengelola Fail Name[is]=Opna með skráastjóra Name[it]=Apri con il gestore dei file Name[ja]=ファイルマネージャで開く diff --git a/applets/lock_logout/metadata.desktop b/applets/lock_logout/metadata.desktop index d3ed7fc64..180788b09 100644 --- a/applets/lock_logout/metadata.desktop +++ b/applets/lock_logout/metadata.desktop @@ -32,7 +32,7 @@ Name[hr]=Zaključavanje/odjavljivanje Name[hsb]=Zamknjenje/Wotzjewjenje Name[hu]=Zárolás/kijelentkezés Name[ia]=Bloca/Claude session -Name[id]=Gembok/Log Keluar +Name[id]=Gembok/Logout Name[is]=Læsa/stimpla út Name[it]=Blocca/Esci Name[ja]=ロック/ログアウト @@ -111,7 +111,7 @@ Comment[hr]=Zaključavanje ekrana ili odjava Comment[hsb]=Wobrazowku zamknyć abo so wotzjewić Comment[hu]=Képernyőzárolás vagy kijelentkezés Comment[ia]=Bloca le schermo o claude session -Comment[id]=Gembok layar atau log keluar +Comment[id]=Gembok si layar atau keluar log Comment[is]=Læsa skja eða skrá út Comment[it]=Blocca lo schermo o esci Comment[ja]=スクリーンのロックとログアウト @@ -173,7 +173,7 @@ Keywords[gl]=Trancar;saír;durmir;hibernar;cambiar de usuario; Keywords[he]=Lock;Logout;Sleep;Hibernate;Switch User;נעילה;יציא;שינה;מצב שינה;החלפת משתמש Keywords[hu]=Zárolás;Kijelentkezés;Alvó állapot;Hibernálás;Felhasználóváltás; Keywords[ia]=Bloca;Claude session;Dormi; Hiberna;Cambia Usator; -Keywords[id]=Gembok;Keluar;Tidur;Hibernasi;Ganti Pengguna; +Keywords[id]=Gembok;Logout;Tidur;Hibernasi;Alih Pengguna; Keywords[is]=Læsa;útskrá;svæfa:leggja í dvala;Skipta um notanda; Keywords[it]=Blocca;Esci;Sospendi;Iberna;Cambia utente; Keywords[ja]=ロック;ログアウト;スリープ;ハイバネート;ユーザの切り替え; diff --git a/applets/notifications/package/metadata.desktop b/applets/notifications/package/metadata.desktop index fd61db688..3a759053a 100644 --- a/applets/notifications/package/metadata.desktop +++ b/applets/notifications/package/metadata.desktop @@ -34,7 +34,7 @@ Name[hne]=सूचना मन ल Name[hr]=Obavijesti Name[hu]=Rendszerüzenetek Name[ia]=Notificationes -Name[id]=Notifikasi +Name[id]=Pemberitahuan Name[is]=Kerfistilkynningar Name[it]=Notifiche Name[ja]=通知 @@ -107,7 +107,7 @@ Comment[he]=משמש להצגת הודעות ועבודות Comment[hr]=Prikazuje obavijesti i poslove Comment[hu]=Értesítések és feladatok megjelenítése Comment[ia]=Monstra notificationes e labores -Comment[id]=Tampilan notifikasi dan tugas +Comment[id]=Tampilan pemberitahuan dan tugas Comment[is]=Birting tilkynninga og verka Comment[it]=Mostra notifiche e processi Comment[ja]=ディスプレイ通知とジョブ diff --git a/applets/panelspacer/metadata.desktop b/applets/panelspacer/metadata.desktop index 7cd20b980..75f466218 100644 --- a/applets/panelspacer/metadata.desktop +++ b/applets/panelspacer/metadata.desktop @@ -23,7 +23,7 @@ Name[he]=מרווח לוח Name[hr]=Razmak na traci Name[hu]=Panelelválasztó Name[ia]=Spatiator de pannello -Name[id]=Spasi Panel +Name[id]=Peruang Panel Name[is]=Spjaldabil Name[it]=Spaziatore del pannello Name[ja]=パネルのスペーサー @@ -88,7 +88,7 @@ Comment[he]=משמש לשמירת מקום פנוי על הלוח. Comment[hr]=Rezervacija praznog mjesta na traci Comment[hu]=Üres helyet választ le egy panelen belül. Comment[ia]=Reserva spatios vacue intra le pannello. -Comment[id]=Pesan ruang kosong di panel. +Comment[id]=Cadangan ruang kosong di dalam panel. Comment[is]=Taka frá auð svæði innan spjaldsins. Comment[it]=Lascia dello spazio vuoto nel pannello. Comment[ja]=パネルに空のスペースを確保します diff --git a/applets/systemmonitor/cpu/metadata.desktop b/applets/systemmonitor/cpu/metadata.desktop index b670664a0..5942f750e 100644 --- a/applets/systemmonitor/cpu/metadata.desktop +++ b/applets/systemmonitor/cpu/metadata.desktop @@ -17,6 +17,7 @@ Name[fr]=Surveillance du processeur Name[gl]=Vixilante da carga da CPU Name[he]=מנטר מעבד Name[hu]=Processzorfigyelő +Name[id]=Pemantau Muatan CPU Name[is]=Eftirlit með notkun örgjörva Name[it]=Monitor del carico del processore Name[ja]=CPU 負荷モニタ @@ -58,6 +59,7 @@ Comment[fr]=Surveille la charge des processeurs Comment[gl]=Vixiar a carga das CPU. Comment[he]=צג שימוש במעבד Comment[hu]=A processzorterhelés monitorozása +Comment[id]=Pemantau muatan si CPU Comment[is]=Fylgjast með álagi á örgjörva Comment[it]=Indica il carico dei processori Comment[ja]=CPU の負荷を監視します diff --git a/applets/systemmonitor/diskactivity/metadata.desktop b/applets/systemmonitor/diskactivity/metadata.desktop index 6ad695f94..69290738d 100644 --- a/applets/systemmonitor/diskactivity/metadata.desktop +++ b/applets/systemmonitor/diskactivity/metadata.desktop @@ -20,7 +20,7 @@ Name[gl]=Vixilante da E/S do disco duro Name[he]=מנטר שימוש בכונן הקשיח Name[hu]=Merevlemez I/O monitor Name[ia]=Monitor de I/E del disco dur -Name[id]=Pemantau I/O Cakram Keras +Name[id]=Pemantau I/O Hard Disk Name[is]=Eftirlit með I/O notkun harðdiska Name[it]=Uso del disco fisso Name[ja]=ハードディスク I/O モニタ @@ -71,7 +71,7 @@ Comment[gl]=Un miniaplicativo que vixía o rendemento e a entrada e saída Comment[he]=ישומון למעקב אחר מהירות הכתיבה והקריאה בכונן Comment[hu]=Egy kisalkalmazás, amely figyeli a merevlemez átvitelét és a bemenetet/kimenetet Comment[ia]=Un applet que que monitora le prestation (throughput) e ingresso/egresso de disco dur -Comment[id]=Sebuah applet yang monitor keluran dan masukan/keluaran cakram keras +Comment[id]=Sebuah applet yang memantau lalu-lalang dan masukan/keluaran hard disk Comment[is]=Smáforrit sem fylgist með afköstum harðra diska og ílagi/frálagi Comment[it]=Un'applet che controlla le prestazioni e l'uso del disco fisso Comment[ja]=ハードディスクのスループットと入力/出力を監視するアプレット diff --git a/applets/systemmonitor/diskusage/metadata.desktop b/applets/systemmonitor/diskusage/metadata.desktop index 08224cfd3..f7615f0d2 100644 --- a/applets/systemmonitor/diskusage/metadata.desktop +++ b/applets/systemmonitor/diskusage/metadata.desktop @@ -19,7 +19,7 @@ Name[gl]=Uso do espazo do disco duro Name[he]=שימוש בדיסק Name[hu]=Lemezterület használat Name[ia]=Usage de spatio del disco dur -Name[id]=Penggunaan Ruang Cakram Keras +Name[id]=Penggunaan Ruang Hard Disk Name[is]=Staða harðra diska Name[it]=Spazio del disco fisso Name[ja]=ハードディスク使用量 @@ -70,7 +70,7 @@ Comment[gl]=Un miniaplicativo que vixía o espazo usado do disco duro e a porcen Comment[he]=ישומון להצגת סך השימוש בכוננים השונים Comment[hu]=Egy kisalkalmazás, amely figyeli a merevlemez használatot és százalékot Comment[ia]=Un applet que monitora usage e percentage de spatio de disco dur -Comment[id]=Sebuah applet yang monitor penggunaan dan persentase ruang cakram keras +Comment[id]=Sebuah applet yang memantau persentase dan penggunaan ruang hard disk Comment[is]=Smáforrit sem fylgist með notkun harðra diska og prósentuhlutfalli á lausu plássi Comment[it]=Un'applet che controlla l'uso dello spazio su disco fisso Comment[ja]=ハードディスクの使用量とパーセンテージを監視するアプレット diff --git a/applets/systemmonitor/memory/metadata.desktop b/applets/systemmonitor/memory/metadata.desktop index 2631f50eb..0823c62c1 100644 --- a/applets/systemmonitor/memory/metadata.desktop +++ b/applets/systemmonitor/memory/metadata.desktop @@ -25,7 +25,7 @@ Name[hi]=मेमोरी स्थिति Name[hr]=Stanje memorije Name[hu]=Memóriaállapot Name[ia]=Stato de memoria -Name[id]=Memori Status +Name[id]=Status Memori Name[is]=Staða minnis Name[it]=Stato della memoria Name[ja]=メモリの状態 @@ -90,7 +90,7 @@ Comment[hi]=रेम उपयोग मॉनीटर Comment[hr]=Nadzor korištenja RAM memorije Comment[hu]=Memóriahasználat-figyelő Comment[ia]=Un monitor del usage de RAM -Comment[id]=Monitor penggunaan RAM +Comment[id]=Sebuah pemantau penggunaan RAM Comment[is]=Eftirlit með notkun vinnsluminnis Comment[it]=Indica l'uso della RAM Comment[ja]=RAM 使用率を監視します diff --git a/applets/systemmonitor/net/metadata.desktop b/applets/systemmonitor/net/metadata.desktop index 598a3080b..5c42e5f66 100644 --- a/applets/systemmonitor/net/metadata.desktop +++ b/applets/systemmonitor/net/metadata.desktop @@ -92,7 +92,7 @@ Comment[hr]=Nadzor korištenja mreže Comment[hsb]=Monitor, kiž pokazuje wućeženosć syće Comment[hu]=Kijelzi a hálózat állapotát Comment[ia]=Un monitor de usage de rete -Comment[id]=Monitor penggunaan jaringan +Comment[id]=Sebuah pemantau penggunaan jaringan Comment[is]=Eftirlit með notkun netsins Comment[it]=Indica l'uso della rete Comment[ja]=ネットワークの活動を監視します diff --git a/components/shellprivate/widgetexplorer/plasmoids.knsrc b/components/shellprivate/widgetexplorer/plasmoids.knsrc index 5fff76147..2e22a3cab 100644 --- a/components/shellprivate/widgetexplorer/plasmoids.knsrc +++ b/components/shellprivate/widgetexplorer/plasmoids.knsrc @@ -15,6 +15,7 @@ Name[fr]=Composants graphiques Plasma Name[gl]=Trebellos de Plasma Name[he]=יישומוני Plasma Name[hu]=Plasma widgetek +Name[id]=Widget Plasma Name[it]=Oggetti di Plasma Name[ko]=Plasma 위젯 Name[lt]=„Plasma“ valdikliai diff --git a/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop b/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop index 38e8869d6..9c2f2b701 100644 --- a/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop +++ b/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop @@ -91,7 +91,7 @@ Comment[he]=התפריט שמופיע בעת לחיצה על הכפתור הימ Comment[hr]=Izbornik koji se obično pojavljuje na desni klik Comment[hu]=A jobb egérkattintásra megjelenő menü Comment[ia]=Le menu que normalmente monstra se sur le pression dextere -Comment[id]=Menu yang normalnya muncul saat klik-kanan +Comment[id]=Menu yang biasanya tampil saat klik-kanan Comment[is]=Valmyndin sem kemur venjulega upp við hægrismell Comment[it]=Il menu che normalmente appare su clic destro Comment[ja]=通常は右クリックで表示されるメニュー diff --git a/containmentactions/paste/plasma-containmentactions-paste.desktop b/containmentactions/paste/plasma-containmentactions-paste.desktop index 2b9a6cf32..f37e5369d 100644 --- a/containmentactions/paste/plasma-containmentactions-paste.desktop +++ b/containmentactions/paste/plasma-containmentactions-paste.desktop @@ -93,7 +93,7 @@ Comment[he]=משמש ליצירת ווידג׳ט מתוכן לוח העריכה Comment[hr]=Stvara widget iz sadržaja međuspremnika Comment[hu]=Készít egy widgetet a vágólap tartalmából Comment[ia]=Il crea elemento graphic (Widget) ex le contentos del area de transferentia (clipboard) -Comment[id]=Menciptakan widget dari isi papan klip +Comment[id]=Menciptakan widget dari konten papan klip Comment[is]=Búa til græju úr innihaldi klippispjaldsins Comment[it]=Crea un oggetto dai contenuti degli appunti Comment[ja]=クリップボードの内容からウィジェットを作成します diff --git a/containmentactions/switchactivity/plasma-containmentactions-switchactivity.desktop b/containmentactions/switchactivity/plasma-containmentactions-switchactivity.desktop index 13d6ca989..660c2ab41 100644 --- a/containmentactions/switchactivity/plasma-containmentactions-switchactivity.desktop +++ b/containmentactions/switchactivity/plasma-containmentactions-switchactivity.desktop @@ -24,7 +24,7 @@ Name[hi]=क्रिया बदलें Name[hr]=Prebaci aktivnost Name[hu]=Aktivitásváltás Name[ia]=Commuta activitate -Name[id]=Aktivitas Pindah +Name[id]=Alih Aktivitas Name[is]=Skipta um virkni Name[it]=Cambia attività Name[ja]=アクティビティを切り替え @@ -90,7 +90,7 @@ Comment[he]=משמש למעבר בין פעילות Comment[hr]=Prebaci na drugu aktivnost Comment[hu]=Váltás másik aktivitásra Comment[ia]=Commuta a altere activitate -Comment[id]=Pindah ke aktivitas lain +Comment[id]=Alihkan ke aktivitas lainnya Comment[is]=Skipta í aðra virkni Comment[it]=Passa ad un'altra attività Comment[ja]=他のアクティビティに切り替えます diff --git a/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop b/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop index 03f2bde12..1a7ef7879 100644 --- a/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop +++ b/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop @@ -26,7 +26,7 @@ Name[hi]=डेस्कटॉप बदलें Name[hr]=Prebaci radnu površinu Name[hu]=Asztalváltás Name[ia]=Commuta scriptorio -Name[id]=Pindah Desktop +Name[id]=Alih Desktop Name[is]=Skipta um skjáborð Name[it]=Cambia desktop Name[ja]=デスクトップを切り替え @@ -93,7 +93,7 @@ Comment[hi]=दूसरे आभासी डेस्कटॉप्स प Comment[hr]=Prebaci na drugu virtualnu radnu površinu Comment[hu]=Váltás másik virtuális asztalra Comment[ia]=Commuta a altere scriptorio virtual -Comment[id]=Berpindah ke desktop virtual lain +Comment[id]=Alihkan ke desktop virtual lainnya Comment[is]=Skiptir milli sýndarskjáborða Comment[it]=Passa ad un altro desktop virtuale Comment[ja]=他の仮想デスクトップに切り替えます diff --git a/containmentactions/switchwindow/plasma-containmentactions-switchwindow.desktop b/containmentactions/switchwindow/plasma-containmentactions-switchwindow.desktop index e9fd7b40a..069134cac 100644 --- a/containmentactions/switchwindow/plasma-containmentactions-switchwindow.desktop +++ b/containmentactions/switchwindow/plasma-containmentactions-switchwindow.desktop @@ -24,7 +24,7 @@ Name[hi]=विंडो बदलें Name[hr]=Prebaci prozor Name[hu]=Ablakváltás Name[ia]=Commuta fenestra -Name[id]=Pindah Jendela +Name[id]=Alih Jendela Name[is]=Skipta um glugga Name[it]=Cambia finestra Name[ja]=ウィンドウを切り替え @@ -89,7 +89,7 @@ Comment[he]=משמש להצגת רשימת חלונות שניתן לעבור א Comment[hr]=Prikaži listu prozora na koju se moguće prebaciti Comment[hu]=Ablakok listájának megjelenítése váltáshoz Comment[ia]=Monstra un lista de fenestras ubi commutar -Comment[id]=Tampilkan senarai jendela yang akan dipindahkan +Comment[id]=Tampilkan daftar jendela yang akan dialihkan Comment[is]=Sýna lista yfir glugga sem hægt er að skipta yfir í Comment[it]=Mostra un elenco di finestre a cui passare Comment[ja]=他のウィンドウに切り替えるためにウィンドウのリストを表示します diff --git a/dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop b/dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop index 531ee3188..d488c6589 100644 --- a/dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop +++ b/dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop @@ -23,7 +23,7 @@ Name[hi]=औज़ार सूचनाएँ Name[hr]=Obavijesti uređaja Name[hu]=Eszközértesítések Name[ia]=Notificationes de dispositivo -Name[id]=Notifikasi Peranti +Name[id]=Pemberitahuan Peranti Name[is]=Tilkynningar um tæki Name[it]=Notifiche dei dispositivi Name[ja]=デバイスの通知 diff --git a/dataengines/filebrowser/plasma-dataengine-filebrowser.desktop b/dataengines/filebrowser/plasma-dataengine-filebrowser.desktop index b371b484e..412790609 100644 --- a/dataengines/filebrowser/plasma-dataengine-filebrowser.desktop +++ b/dataengines/filebrowser/plasma-dataengine-filebrowser.desktop @@ -30,7 +30,7 @@ Name[hne]=फाइल अउ डिरेक्टरी Name[hr]=Datoteke i direktoriji Name[hu]=Fájlok és mappák Name[ia]=Files e directorios -Name[id]=Berkas dan Direktori +Name[id]=Fail dan Direktori Name[is]=Skrár og möppur Name[it]=File e cartelle Name[ja]=ファイルとディレクトリ @@ -102,7 +102,7 @@ Comment[hi]=फ़ाइलों व डिरेक्ट्रियों Comment[hr]=Informacije o datotekama i direktorijima. Comment[hu]=Fájl- és mappajellemzők. Comment[ia]=Information re files e directorios. -Comment[id]=Informasi tentang berkas dan direktori. +Comment[id]=Informasi tentang fail dan direktori. Comment[is]=Upplýsingar um skrár og möppur. Comment[it]=Informazioni su file e cartelle. Comment[ja]=ファイルとディレクトリに関する情報 diff --git a/dataengines/notifications/plasma-dataengine-notifications.desktop b/dataengines/notifications/plasma-dataengine-notifications.desktop index 203c5723e..07d51833b 100644 --- a/dataengines/notifications/plasma-dataengine-notifications.desktop +++ b/dataengines/notifications/plasma-dataengine-notifications.desktop @@ -30,7 +30,7 @@ Name[hne]=अनुपरयोग सूचना Name[hr]=Obavijesti aplikacija Name[hu]=Értesítő üzenetek Name[ia]=Notificationes de application -Name[id]=Notifikasi Aplikasi +Name[id]=Pemberitahuan Aplikasi Name[is]=Tilkynningar forrita Name[it]=Notifiche delle applicazioni Name[ja]=アプリケーションの通知 diff --git a/dataengines/places/plasma-dataengine-places.desktop b/dataengines/places/plasma-dataengine-places.desktop index 772add512..f6ec4c7f0 100644 --- a/dataengines/places/plasma-dataengine-places.desktop +++ b/dataengines/places/plasma-dataengine-places.desktop @@ -97,7 +97,7 @@ Comment[he]=מיקומים, כפי שהם נראים במנהל הקבצים ו Comment[hr]=Mjesta, kao što ih se vidi u pregledniku datoteka i dialozima za izbor datoteka Comment[hu]=Helyek panel (ahogy a fájlkezelőben és a fájlmegnyitó ablakokban látható). Comment[ia]=Placias, tal como vidite in le gerente de file e in le dialogos de file -Comment[id]=Tempat, seperti terlihat di pengelola berkas dan di dialog berkas. +Comment[id]=Tempat, seperti terlihat di pengelola fail dan di dialog fail. Comment[is]=Staðir, eins og sýnt er í skráastjóra og samskiptagluggum. Comment[it]=Risorse, come nel gestore dei file e nelle finestre di selezione dei file. Comment[ja]=ファイルマネージャやファイル選択ダイアログに表示される場所 diff --git a/freespacenotifier/freespacenotifier.notifyrc b/freespacenotifier/freespacenotifier.notifyrc index 6bbdd7bc0..c18fd11bc 100644 --- a/freespacenotifier/freespacenotifier.notifyrc +++ b/freespacenotifier/freespacenotifier.notifyrc @@ -244,7 +244,7 @@ Comment[hne]=चेतावनी सूचना बर उपयोग हो Comment[hr]=Korišten za upozoravajuće obavijesti Comment[hu]=Kezelőprogram figyelmeztető üzenetekhez Comment[ia]=Usate pro notificationes de avisos -Comment[id]=Digunakan untuk notifikasi peringatan +Comment[id]=Digunakan untuk pemberitahuan peringatan Comment[is]=Notað fyrir aðvaranir Comment[it]=Usato per notifiche di avviso Comment[ja]=警告の通知に使用 diff --git a/klipper/klipperrc.desktop b/klipper/klipperrc.desktop index 256a1ca80..fd712563c 100644 --- a/klipper/klipperrc.desktop +++ b/klipper/klipperrc.desktop @@ -1141,7 +1141,7 @@ Description[hr]=Tekstualna datoteka Description[hsb]=Tekstowa dataja Description[hu]=Szöveges fájl Description[ia]=File de texto -Description[id]=Berkas Teks +Description[id]=Fail Teks Description[is]=Textaskrá Description[it]=File di testo Description[ja]=テキストファイル @@ -1328,7 +1328,7 @@ Description[hr]=URL lokalne datoteke Description[hsb]=URL za lokalnu dataju Description[hu]=helyi fájl URL-je Description[ia]=URL de file local -Description[id]=URL berkas lokal +Description[id]=URL fail lokal Description[is]=Staðbundin slóð Description[it]=URL di file locale Description[ja]=ローカルファイル URL @@ -1516,7 +1516,7 @@ Description[hr]=Pošalji &datoteku Description[hsb]=&Dataju pósłać Description[hu]=&Fájl elküldése Description[ia]=Invia &file -Description[id]=Kirim &Berkas +Description[id]=Kirim &Fail Description[is]=Senda &skrá Description[it]=Invia &file Description[ja]=ファイルを送信(&F) @@ -1796,7 +1796,7 @@ Description[hr]=Pošalji &datoteku Description[hsb]=&Dataju pósłać Description[hu]=&Fájl elküldése Description[ia]=Invia &file -Description[id]=Kirim &Berkas +Description[id]=Kirim &Fail Description[is]=Senda &skrá Description[it]=Invia &file Description[ja]=ファイルを送信(&F) @@ -2345,7 +2345,7 @@ Description[hr]=Pošalji &datoteku Description[hsb]=&Dataju pósłać Description[hu]=&Fájl elküldése Description[ia]=Invia &file -Description[id]=Kirim &Berkas +Description[id]=Kirim &Fail Description[is]=Senda &skrá Description[it]=Invia &file Description[ja]=ファイルを送信(&F) diff --git a/menu/desktop/kf5-utilities-file.directory b/menu/desktop/kf5-utilities-file.directory index bab06ddce..27b7b9671 100644 --- a/menu/desktop/kf5-utilities-file.directory +++ b/menu/desktop/kf5-utilities-file.directory @@ -23,7 +23,7 @@ Name[he]=קובץ Name[hr]=Datoteka Name[hu]=Fájl Name[ia]=File -Name[id]=Berkas +Name[id]=Fail Name[is]=Skrá Name[it]=File Name[ja]=ファイル @@ -74,7 +74,7 @@ Comment[he]=קובץ Comment[hr]=Datoteka Comment[hu]=Fájl Comment[ia]=File -Comment[id]=Berkas +Comment[id]=Fail Comment[is]=Skrá Comment[it]=File Comment[ja]=ファイル diff --git a/phonon/platform_kde/phonon.notifyrc b/phonon/platform_kde/phonon.notifyrc index c142a1f9e..e2cb836a2 100644 --- a/phonon/platform_kde/phonon.notifyrc +++ b/phonon/platform_kde/phonon.notifyrc @@ -209,7 +209,7 @@ Comment[hi]=अधिसूचना जब ऑडियो आउटपुट Comment[hr]=Obavijest prilikom automatske promijene izlaznog audio uređaja Comment[hu]=Értesítés a hangkimeneti eszköz automatikus megváltozásakor Comment[ia]=Notification quando un dispositivo de egresso de sono ha modificate automaticamente -Comment[id]=Notifikasi ketika peranti keluaran audio telah berubah secara otomatis +Comment[id]=Pemberitahuan ketika peranti keluaran audio telah berubah secara otomatis Comment[is]=Tilkynning þegar skipt hefur verið sjálfvirkt um úttakstæki fyrir hljóð Comment[it]=Notifica di quando il dispositivo di uscita audio è stato cambiato automaticamente Comment[ja]=オーディオ出力デバイスが自動的に変更された時の通知 diff --git a/runners/activities/plasma-runner-activityrunner.desktop b/runners/activities/plasma-runner-activityrunner.desktop index de606fb2f..6974c565f 100644 --- a/runners/activities/plasma-runner-activityrunner.desktop +++ b/runners/activities/plasma-runner-activityrunner.desktop @@ -78,7 +78,7 @@ Comment[he]=הצגה והחלפה בין פעילויות שולחן עבודה Comment[hr]=Izlistaj i prebacuj između aktivnosti radne površine Comment[hu]=Asztali aktivitások listázása és váltás közöttük Comment[ia]=Lista e commuta inter activitates de scriptorio -Comment[id]=Daftar dan berpindah di antara aktivitas desktop +Comment[id]=Daftar dan alih antara aktivitas desktop Comment[is]=Telur upp og skiptir milli skjáborðsvirkni Comment[it]=Visualizza e cambia le attività del desktop Comment[ja]=デスクトップアクティビティを一覧表示して切り替える diff --git a/runners/locations/plasma-runner-locations.desktop b/runners/locations/plasma-runner-locations.desktop index f0b36b7b9..6e6b72438 100644 --- a/runners/locations/plasma-runner-locations.desktop +++ b/runners/locations/plasma-runner-locations.desktop @@ -105,7 +105,7 @@ Comment[hne]=फाइल अउ यूआरएल खोलइया Comment[hr]=Otvarač datoteka i URL-ova Comment[hu]=Fájlmegnyitó Comment[ia]=Aperitor de file e de URL -Comment[id]=Pembuka Berkas dan URL +Comment[id]=Pembuka Fail dan URL Comment[is]=Opnun skráa og slóða Comment[it]=Apertura di file e URL Comment[ja]=ファイルと URL を開きます diff --git a/runners/sessions/plasma-runner-sessions.desktop b/runners/sessions/plasma-runner-sessions.desktop index f9094000f..56de9d044 100644 --- a/runners/sessions/plasma-runner-sessions.desktop +++ b/runners/sessions/plasma-runner-sessions.desktop @@ -103,7 +103,7 @@ Comment[hne]=उपयोग करइया के जल्दी अदल- Comment[hr]=Brza promjena korisnika Comment[hu]=Felhasználóváltó Comment[ia]=Commutation rapide de usator -Comment[id]=Penggantian pengguna cepat +Comment[id]=Peralihan pengguna yang cepat Comment[is]=Hröð skipting milli notenda Comment[it]=Cambio rapido dell'utente Comment[ja]=ユーザを素早く切り替えます diff --git a/runners/windows/plasma-runner-windows.desktop b/runners/windows/plasma-runner-windows.desktop index fc3133f08..79e1df997 100644 --- a/runners/windows/plasma-runner-windows.desktop +++ b/runners/windows/plasma-runner-windows.desktop @@ -93,7 +93,7 @@ Comment[he]=משמש להצגת חלונות ושולחנות עבודה ולה Comment[hr]=Popis prozora i radnih površina za laku promjenu među njima Comment[hu]=Kilistázza az ablakokat és asztalokat, és vált rájuk Comment[ia]=Lista fenestras e scriptorios e commuta los -Comment[id]=Urutkan jendela dan desktop lalu kemudian tukar mereka +Comment[id]=Daftar jendela dan desktop dan alihkan mereka Comment[is]=Telur upp glugga og skjáborð og skiptir á milli þeirra Comment[it]=Elenca e scegli finestre e desktop Comment[ja]=ウィンドウとデスクトップの一覧表示と切り替えを行います diff --git a/statusnotifierwatcher/statusnotifierwatcher.desktop b/statusnotifierwatcher/statusnotifierwatcher.desktop index 5ee64e488..94cc83084 100644 --- a/statusnotifierwatcher/statusnotifierwatcher.desktop +++ b/statusnotifierwatcher/statusnotifierwatcher.desktop @@ -22,7 +22,7 @@ Name[hi]=स्थिति संकेत प्रबंधक Name[hr]=Upravitelj glasnika stanja Name[hu]=Állapotértesítés-kezelő Name[ia]=Gerente de notificator de stato -Name[id]=Manajer Notifikasi Status +Name[id]=Pengelola Notifikasi Status Name[is]=Stöðutilkynningaþjónn Name[it]=Gestore del notificatore di stato Name[ja]=ステータス通知マネージャ diff --git a/themes/qtmacintosh.themerc b/themes/qtmacintosh.themerc index bb70d9af2..e600d215d 100644 --- a/themes/qtmacintosh.themerc +++ b/themes/qtmacintosh.themerc @@ -95,7 +95,7 @@ Comment[he]=סגנון המשתמש במנהל המראה של Apple Comment[hr]=Stil koji koristi Appleov upravitelj izgleda Comment[hu]=Az Apple Megjelenítéskezelőt használó stílus Comment[ia]=Stilo que usa le gerente de apparentia Apple -Comment[id]=Gaya yang menggunakan Manajer Tampilan Apple +Comment[id]=Gaya yang menggunakan Pengelola Tampilan Apple Comment[is]=Stíll sem notar Apple Appearance Manager Comment[it]=Stile che usa il gestore dell'aspetto di Apple Comment[ja]=Apple のアピアランスマネージャを使うスタイル From 1384cc92ce39a6d6172445fc5f7a62d03a1c283e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 13 Mar 2018 07:08:50 +0100 Subject: [PATCH 2/4] 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" --- dataengines/dict/plasma-dataengine-dict.desktop | 2 +- dataengines/executable/plasma-dataengine-executable.desktop | 4 ++-- runners/appstream/plasma-runner-appstream.desktop | 2 +- runners/baloo/plasma-runner-baloosearch.desktop | 4 ++-- runners/bookmarks/plasma-runner-bookmarks.desktop | 2 +- runners/services/plasma-runner-services.desktop | 2 +- runners/shell/plasma-runner-shell.desktop | 4 ++-- runners/windowedwidgets/plasma-runner-windowedwidgets.desktop | 2 +- .../shell/plasma-packagestructure-plasma-shell.desktop | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dataengines/dict/plasma-dataengine-dict.desktop b/dataengines/dict/plasma-dataengine-dict.desktop index 3298c6ad3..50ac53bfd 100644 --- a/dataengines/dict/plasma-dataengine-dict.desktop +++ b/dataengines/dict/plasma-dataengine-dict.desktop @@ -85,7 +85,7 @@ Comment[bg]=Търсене значението на думи Comment[bn_IN]=শব্দের অর্থ অনুসন্ধান করুন Comment[bs]=Potražite značenja riječi Comment[ca]=Cerca els significats de paraules -Comment[ca@valencia]=Busca els significats de paraules +Comment[ca@valencia]=Cerca els significats de paraules Comment[cs]=Vyhledávání významu slov Comment[da]=Slå ords betydning op Comment[de]=Nachschlagen von Wortbedeutungen diff --git a/dataengines/executable/plasma-dataengine-executable.desktop b/dataengines/executable/plasma-dataengine-executable.desktop index 34d38b6c6..d66585da6 100644 --- a/dataengines/executable/plasma-dataengine-executable.desktop +++ b/dataengines/executable/plasma-dataengine-executable.desktop @@ -8,7 +8,7 @@ Name[bn]=কমান্ড চালাও Name[bn_IN]=কমান্ড সঞ্চালনা Name[bs]=Izvršavanje naredbi Name[ca]=Execució d'ordres -Name[ca@valencia]=Execució d'ordes +Name[ca@valencia]=Execució d'ordres Name[cs]=Spustit příkazy Name[csb]=Zrëszanié pòlétów Name[da]=Kør kommandoer @@ -79,7 +79,7 @@ Comment[be@latin]=Uklučaj systemu dostupu da źviestak Comment[bg]=Изпълнение на програми Comment[bs]=Datomotor pokretanja izvršnih Comment[ca]=Motor de dades d'ordres executables -Comment[ca@valencia]=Motor de dades d'ordes executables +Comment[ca@valencia]=Motor de dades d'ordres executables Comment[cs]=Spustit rozhraní pro spouštění programů Comment[csb]=Zrëszanié wëkònëwólnëgò mòtóra pòdôwków Comment[da]=Datamotor til at afvikle kørbare filer diff --git a/runners/appstream/plasma-runner-appstream.desktop b/runners/appstream/plasma-runner-appstream.desktop index 6df83c7b6..bfddba335 100644 --- a/runners/appstream/plasma-runner-appstream.desktop +++ b/runners/appstream/plasma-runner-appstream.desktop @@ -40,7 +40,7 @@ Name[zh_TW]=軟體中心 Comment=Lets you find software Comment[ar]=ابحث عن البرمجيّات Comment[ca]=Permet cercar programari -Comment[ca@valencia]=Permet buscar programari +Comment[ca@valencia]=Permet cercar programari Comment[cs]=Umožní vám hledat software Comment[da]=Hjælper dig med at finde software Comment[de]=Unterstützt die Suche nach Software diff --git a/runners/baloo/plasma-runner-baloosearch.desktop b/runners/baloo/plasma-runner-baloosearch.desktop index 32cca20af..3b855cc76 100644 --- a/runners/baloo/plasma-runner-baloosearch.desktop +++ b/runners/baloo/plasma-runner-baloosearch.desktop @@ -3,7 +3,7 @@ Name=Desktop Search Name[ar]=بحث سطح المكتب Name[bs]=Pretraga radne površine Name[ca]=Cerca a l'escriptori -Name[ca@valencia]=Busca a l'escriptori +Name[ca@valencia]=Cerca a l'escriptori Name[cs]=Vyhledávací služby Name[da]=Skrivebordssøgning Name[de]=Desktop-Suche @@ -47,7 +47,7 @@ Name[zh_TW]=桌面搜尋 Comment=Searches through files, emails and contacts Comment[ar]=يبحث في الملفات، والبُرُد الإلكترونية والمتراسلين Comment[ca]=Cerca pels fitxers, correus electrònics i contactes -Comment[ca@valencia]=Busca pels fitxers, correus electrònics i contactes +Comment[ca@valencia]=Cerca pels fitxers, correus electrònics i contactes Comment[cs]=Prohledává v souborech, emailech a kontaktech Comment[da]=Gennemsøger filer, e-mails og kontakter Comment[de]=Durchsucht Dateien, E-Mails und Kontakte diff --git a/runners/bookmarks/plasma-runner-bookmarks.desktop b/runners/bookmarks/plasma-runner-bookmarks.desktop index cedf78580..7403a4dc6 100644 --- a/runners/bookmarks/plasma-runner-bookmarks.desktop +++ b/runners/bookmarks/plasma-runner-bookmarks.desktop @@ -77,7 +77,7 @@ Comment[bn]=বুকমার্ক খোঁজো এবং খোলো Comment[bn_IN]=বুকমার্ক অনুসন্ধান করুন ও খুলুন Comment[bs]=Nađite i otvorite zabilješku Comment[ca]=Cerca i obre adreces d'interès -Comment[ca@valencia]=Busca i obri adreces d'interés +Comment[ca@valencia]=Cerca i obri adreces d'interés Comment[cs]=Najít a otevřít záložku Comment[csb]=Malézë ë òtemkni załóżczi Comment[da]=Find og åbn bogmærker diff --git a/runners/services/plasma-runner-services.desktop b/runners/services/plasma-runner-services.desktop index c0946c512..a0791512f 100644 --- a/runners/services/plasma-runner-services.desktop +++ b/runners/services/plasma-runner-services.desktop @@ -96,7 +96,7 @@ Comment[be@latin]=Pošuk aplikacyjaŭ, panelaŭ kiravańnia j słužbaŭ Comment[bg]=Търсене на програми, панели и услуги Comment[bs]=Tražite programe, kontrolne panele i servise Comment[ca]=Cerca aplicacions, plafons de control i serveis -Comment[ca@valencia]=Busca aplicacions, plafons de control i serveis +Comment[ca@valencia]=Cerca aplicacions, plafons de control i serveis Comment[cs]=Najít aplikace, ovládací panely a služby Comment[da]=Find programmer, kontrolpaneler og tjenester Comment[de]=Auffinden von Anwendungen, Einrichtungsprogrammen und Diensten diff --git a/runners/shell/plasma-runner-shell.desktop b/runners/shell/plasma-runner-shell.desktop index 888ff80a4..41bd54876 100644 --- a/runners/shell/plasma-runner-shell.desktop +++ b/runners/shell/plasma-runner-shell.desktop @@ -7,7 +7,7 @@ Name[bn]=কমান্ড লাইন Name[bn_IN]=কমান্ড-লাইন Name[bs]=Komandna linija Name[ca]=Línia d'ordres -Name[ca@valencia]=Línia d'ordes +Name[ca@valencia]=Línia d'ordres Name[cs]=Příkazový řádek Name[csb]=Réga pòlétu Name[da]=Kommandolinje @@ -85,7 +85,7 @@ Comment[bn]=শেল কমাণ্ড চালায় Comment[bn_IN]=শেল কমান্ড সঞ্চালনের জন্য প্রয়োগ হবে Comment[bs]=Izvršavanje naredbi školjke Comment[ca]=Executa ordres de l'intèrpret d'ordres -Comment[ca@valencia]=Executa ordes de l'intèrpret d'ordes +Comment[ca@valencia]=Executa ordres de l'intèrpret d'ordres Comment[cs]=Spouští shellové příkazy Comment[da]=Kører skal-kommandoer Comment[de]=Führt Shell-Befehle aus diff --git a/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop b/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop index 6024ea55a..8c1047f44 100644 --- a/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop +++ b/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop @@ -66,7 +66,7 @@ Comment[ar]=اعثر على ودجات بلازما التي يمكن أن تع Comment[bg]=Търсене на джаджи, които могат да се използват като самостоятелни прозорци Comment[bs]=Nađite plazma grafičke kontrole koje mogu da rade kao samostalni prozori Comment[ca]=Cerca estris del Plasma que es poden executar en finestres autònomes -Comment[ca@valencia]=Busca estris del Plasma que es poden executar en finestres autònomes +Comment[ca@valencia]=Cerca estris del Plasma que es poden executar en finestres autònomes Comment[cs]=Najít Plasma widgety, které mohou být spuštěny ve vlastních oknech Comment[da]=Find Plasma-widgets der kan køres som selvstændige vinduer Comment[de]=Findet Plasma-Miniprogramme, die als eigenständige Anwendungen gestartet werden können diff --git a/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop b/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop index 86bc471db..8bfcabd33 100644 --- a/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop +++ b/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop @@ -3,7 +3,7 @@ Name=Plasma Shell Name[ar]=صدفة بلازما Name[bs]=Plazma školjka Name[ca]=Intèrpret d'ordres del Plasma -Name[ca@valencia]=Intèrpret d'ordes del Plasma +Name[ca@valencia]=Intèrpret d'ordres del Plasma Name[cs]=Shell Plasmy Name[da]=Plasma-skal Name[de]=Plasma-Umgebung From a9df1e20f527dadcc43bcbbad48a9de52f83d9dd Mon Sep 17 00:00:00 2001 From: Eike Hein Date: Mon, 12 Mar 2018 18:24:10 +0900 Subject: [PATCH 3/4] Improve By Desktop sorting for task groups Summary: TaskGroupingProxyModel used to return QVariant() as the AbstractTasksModel::VirtualDesktop role for task groups, resulting in TasksModel to sort task groups indiscrimi- nately at the front of the list. In this patch, it instead returns the lowest virtual desktop found among the children. BUG:384747 Reviewers: #plasma Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D11257 --- libtaskmanager/taskgroupingproxymodel.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/libtaskmanager/taskgroupingproxymodel.cpp b/libtaskmanager/taskgroupingproxymodel.cpp index bcad638ef..cfff6772a 100644 --- a/libtaskmanager/taskgroupingproxymodel.cpp +++ b/libtaskmanager/taskgroupingproxymodel.cpp @@ -722,12 +722,23 @@ QVariant TaskGroupingProxyModel::data(const QModelIndex &proxyIndex, int role) c } else if (role == AbstractTasksModel::IsVirtualDesktopChangeable) { return d->all(proxyIndex, AbstractTasksModel::IsVirtualDesktopChangeable); } else if (role == AbstractTasksModel::VirtualDesktop) { - // TODO: Nothing needs this for now and it would add complexity to - // make it a list; skip it until needed. - return QVariant(); + // Returns the lowest virtual desktop id among all children of the + // group. + int virtualDesktop = INT_MAX; + + for (int i = 0; i < rowCount(proxyIndex); ++i) { + const int childVirtualDesktop = proxyIndex.child(i, 0).data(AbstractTasksModel::VirtualDesktop).toInt(); + + if (childVirtualDesktop < virtualDesktop) { + virtualDesktop = childVirtualDesktop; + } + } + + return virtualDesktop; } else if (role == AbstractTasksModel::ScreenGeometry) { // TODO: Nothing needs this for now and it would add complexity to - // make it a list; skip it until needed. + // make it a list; skip it until needed. Once it is, do it similarly + // to the AbstractTasksModel::VirtualDesktop case. return QVariant(); } else if (role == AbstractTasksModel::Activities) { QStringList activities; From 71f16881843915187af4dee0a7ce2ec85bfb400c Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Tue, 13 Mar 2018 16:37:48 +0100 Subject: [PATCH 4/4] [Notifications] Remove NoAccessNetworkAccessManagerFactory With shared QML engine this would affect all applets and since we properly escape HTML in notifications now this is unneccessary. Differential Revision: https://phabricator.kde.org/D11109 --- .../plugin/notificationshelperplugin.cpp | 21 ------------------- .../plugin/notificationshelperplugin.h | 2 -- 2 files changed, 23 deletions(-) diff --git a/applets/notifications/plugin/notificationshelperplugin.cpp b/applets/notifications/plugin/notificationshelperplugin.cpp index 48ae488ac..83289b8c3 100644 --- a/applets/notifications/plugin/notificationshelperplugin.cpp +++ b/applets/notifications/plugin/notificationshelperplugin.cpp @@ -23,19 +23,8 @@ #include #include -#include #include -class NoAccessNetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory -{ -public: - QNetworkAccessManager *create(QObject *parent) override { - QNetworkAccessManager *manager = new QNetworkAccessManager(parent); - manager->setNetworkAccessible(QNetworkAccessManager::NotAccessible); - return manager; - } -}; - class UrlHelper : public QObject { Q_OBJECT public: @@ -71,14 +60,4 @@ void NotificationsHelperPlugin::registerTypes(const char *uri) qmlRegisterSingletonType(uri, 1, 0, "DragHelper", draghelper_singletontype_provider); } -void NotificationsHelperPlugin::initializeEngine(QQmlEngine *engine, const char *uri) -{ - Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.notifications")); - - auto oldFactory = engine->networkAccessManagerFactory(); - engine->setNetworkAccessManagerFactory(nullptr); - delete oldFactory; - engine->setNetworkAccessManagerFactory(new NoAccessNetworkAccessManagerFactory); -} - #include "notificationshelperplugin.moc" diff --git a/applets/notifications/plugin/notificationshelperplugin.h b/applets/notifications/plugin/notificationshelperplugin.h index 9afe12b99..5d9149bd3 100644 --- a/applets/notifications/plugin/notificationshelperplugin.h +++ b/applets/notifications/plugin/notificationshelperplugin.h @@ -22,7 +22,6 @@ #include -class QQmlEngine; class NotificationsHelperPlugin : public QQmlExtensionPlugin { Q_OBJECT @@ -30,7 +29,6 @@ class NotificationsHelperPlugin : public QQmlExtensionPlugin public: void registerTypes(const char *uri) override; - void initializeEngine(QQmlEngine *engine, const char *uri) override; };