From 31e4ddf6d999680db8c9f3347bdbe8c0fc6f043d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 25 Aug 2017 06:27:03 +0200 Subject: [PATCH 1/7] 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" --- klipper/klipperrc.desktop | 12 ++++++------ plasma.desktop.cmake | 4 ++-- plasmawayland.desktop.cmake | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/klipper/klipperrc.desktop b/klipper/klipperrc.desktop index 0e0e406c4..de0f8032c 100644 --- a/klipper/klipperrc.desktop +++ b/klipper/klipperrc.desktop @@ -1489,8 +1489,8 @@ Description[bn]=ফাই&ল পাঠাও Description[bn_IN]=ফাইল পাঠানো হবে (&F) Description[br]=Kas ar &restr Description[bs]=Pošalji &datoteku -Description[ca]=Envia &fitxer -Description[ca@valencia]=Envia &fitxer +Description[ca]=Envia un &fitxer +Description[ca@valencia]=Envia un &fitxer Description[cs]=Posl&at soubor Description[csb]=Nalezë lopczi Description[cy]=Anfon &Ffeil @@ -1769,8 +1769,8 @@ Description[bn]=ফাই&ল পাঠাও Description[bn_IN]=ফাইল পাঠানো হবে (&F) Description[br]=Kas ar &restr Description[bs]=Pošalji &datoteku -Description[ca]=Envia &fitxer -Description[ca@valencia]=Envia &fitxer +Description[ca]=Envia un &fitxer +Description[ca@valencia]=Envia un &fitxer Description[cs]=Posl&at soubor Description[csb]=Nalezë lopczi Description[cy]=Anfon &Ffeil @@ -2318,8 +2318,8 @@ Description[bn]=ফাই&ল পাঠাও Description[bn_IN]=ফাইল পাঠানো হবে (&F) Description[br]=Kas ar &restr Description[bs]=Pošalji &datoteku -Description[ca]=Envia &fitxer -Description[ca@valencia]=Envia &fitxer +Description[ca]=Envia un &fitxer +Description[ca@valencia]=Envia un &fitxer Description[cs]=Posl&at soubor Description[csb]=Nalezë lopczi Description[cy]=Anfon &Ffeil diff --git a/plasma.desktop.cmake b/plasma.desktop.cmake index b0ca5cc4f..f90ed55cf 100644 --- a/plasma.desktop.cmake +++ b/plasma.desktop.cmake @@ -54,8 +54,8 @@ Comment=Plasma by KDE Comment[ar]=بلازما كدي Comment[ast]=Plasma por KDE Comment[bs]=Plazma od strane KDe -Comment[ca]=Plasma pel KDE -Comment[ca@valencia]=Plasma pel KDE +Comment[ca]=Plasma creat per la comunitat KDE +Comment[ca@valencia]=Plasma creat per la comunitat KDE Comment[cs]=Plasma z KDE Comment[da]=Plasma fra KDE Comment[de]=Plasma von KDE diff --git a/plasmawayland.desktop.cmake b/plasmawayland.desktop.cmake index b510ce690..4c7112f12 100644 --- a/plasmawayland.desktop.cmake +++ b/plasmawayland.desktop.cmake @@ -53,8 +53,8 @@ Comment=Plasma by KDE Comment[ar]=بلازما كدي Comment[ast]=Plasma por KDE Comment[bs]=Plazma od strane KDe -Comment[ca]=Plasma pel KDE -Comment[ca@valencia]=Plasma pel KDE +Comment[ca]=Plasma creat per la comunitat KDE +Comment[ca@valencia]=Plasma creat per la comunitat KDE Comment[cs]=Plasma z KDE Comment[da]=Plasma fra KDE Comment[de]=Plasma von KDE From 70234987049ea42ebc174756273c2ed593207adf Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Wed, 25 Oct 2017 10:59:56 +0100 Subject: [PATCH 2/7] Update version number for 5.8.8 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f98e4601..8c9333758 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(plasma-workspace) -set(PROJECT_VERSION "5.8.7") +set(PROJECT_VERSION "5.8.8") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) From d02f03f46e9c380c2a18045b335a8e26f385999d Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 17 Jul 2017 00:07:47 +0200 Subject: [PATCH 3/7] Fix compilation with current cmake (git branch release). I don't see what the private/ in front of the moc_ filenames was for anyway. --- shell/containmentconfigview.cpp | 2 +- shell/currentcontainmentactionsmodel.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/containmentconfigview.cpp b/shell/containmentconfigview.cpp index 833cfb06f..0b3f11876 100644 --- a/shell/containmentconfigview.cpp +++ b/shell/containmentconfigview.cpp @@ -243,4 +243,4 @@ void ContainmentConfigView::syncWallpaperObjects() m_currentWallpaperConfig = static_cast(wallpaperGraphicsObject->property("configuration").value()); } -#include "private/moc_containmentconfigview.cpp" +#include "moc_containmentconfigview.cpp" diff --git a/shell/currentcontainmentactionsmodel.cpp b/shell/currentcontainmentactionsmodel.cpp index 836f463ea..212d40a20 100644 --- a/shell/currentcontainmentactionsmodel.cpp +++ b/shell/currentcontainmentactionsmodel.cpp @@ -266,4 +266,4 @@ void CurrentContainmentActionsModel::save() } } -#include "private/moc_currentcontainmentactionsmodel.cpp" +#include "moc_currentcontainmentactionsmodel.cpp" From 15df7f02c05a7a4e43bda715119cb3f45cd1766b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 20 Dec 2017 08:48:58 +0100 Subject: [PATCH 4/7] 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 | 4 ++-- applets/devicenotifier/package/metadata.desktop | 4 ++-- applets/mediacontroller/metadata.desktop | 4 ++-- .../plasma-dataengine-devicenotifications.desktop | 4 ++-- dataengines/hotplug/plasma-dataengine-hotplug.desktop | 2 +- dataengines/keystate/plasma-dataengine-keystate.desktop | 4 ++-- dataengines/mpris2/plasma-dataengine-mpris2.desktop | 2 +- dataengines/places/plasma-dataengine-places.desktop | 2 +- dataengines/soliddevice/plasma-dataengine-soliddevice.desktop | 4 ++-- klipper/klipperrc.desktop | 4 ++-- ksmserver/themes/default/metadata.desktop | 4 ++-- lookandfeel/metadata.desktop | 2 +- menu/desktop/kf5-more.directory | 2 +- menu/desktop/kf5-settingsmenu.directory | 2 +- phonon/platform_kde/phonon.notifyrc | 4 ++-- runners/places/plasma-runner-places.desktop | 2 +- runners/services/plasma-runner-services.desktop | 2 +- runners/solid/plasma-runner-solid.desktop | 4 ++-- runners/webshortcuts/plasma-runner-webshortcuts.desktop | 4 ++-- sddm-theme/metadata.desktop | 4 ++-- 20 files changed, 32 insertions(+), 32 deletions(-) diff --git a/applets/activitybar/metadata.desktop b/applets/activitybar/metadata.desktop index 2c23339f4..d69417c0f 100644 --- a/applets/activitybar/metadata.desktop +++ b/applets/activitybar/metadata.desktop @@ -29,7 +29,7 @@ Name[hr]=Traka aktivnosti Name[hsb]=Pas aktiwitow Name[hu]=Aktivitásjelző Name[ia]=Barra de activitate -Name[id]=Batang Aktivitas +Name[id]=Bilah Aktivitas Name[is]=Virknislá Name[it]=Barra delle attività Name[ja]=アクティビティバー @@ -100,7 +100,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]=Batang tab untuk berpindah aktivitas +Comment[id]=Bilah tab untuk berpindah aktivitas Comment[is]=Flipaslá til að skipta um verkefni Comment[it]=Barra a schede per cambiare attività Comment[ja]=アクティビティを切り替えるタブバー diff --git a/applets/devicenotifier/package/metadata.desktop b/applets/devicenotifier/package/metadata.desktop index 665b68a62..28c9e4f5d 100644 --- a/applets/devicenotifier/package/metadata.desktop +++ b/applets/devicenotifier/package/metadata.desktop @@ -33,7 +33,7 @@ Name[hr]=Glasnik uređaja Name[hsb]=Zdźělenki wo gratach Name[hu]=Eszközértesítő Name[ia]=Notificator de dispositivo -Name[id]=Pemberitahu Divais +Name[id]=Pemberitahu Peranti Name[is]=Tilkynningar um ný tæki Name[it]=Notificatore dei dispositivi Name[ja]=デバイスの通知 @@ -107,7 +107,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 divais baru +Comment[id]=Notifikasi dan akses untuk 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/mediacontroller/metadata.desktop b/applets/mediacontroller/metadata.desktop index e9d98ab28..fbabbf2e5 100644 --- a/applets/mediacontroller/metadata.desktop +++ b/applets/mediacontroller/metadata.desktop @@ -19,7 +19,7 @@ Name[gl]=Reprodutor multimedia Name[he]=נגן מדיה Name[hu]=Médialejátszó Name[ia]=Media Player (Reproductor de Media) -Name[id]=Pemutar Media +Name[id]=Pemain Media Name[is]=Margmiðlunarspilari Name[it]=Lettore multimediale Name[ja]=メディアプレーヤー @@ -66,7 +66,7 @@ Comment[gl]=Controles do reprodutor multimedia Comment[he]=פקדי ניגון מדיה Comment[hu]=Médialejátszó vezérlők Comment[ia]=Controlos de Reproductor de Multimedia -Comment[id]=Kontrol Pemutar Media +Comment[id]=Kontrol Pemain Media Comment[is]=Stjórntæki margmiðlunarspilara Comment[it]=Controlli del lettore multimediale Comment[ja]=メディアプレーヤーコントロール diff --git a/dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop b/dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop index f941d0fa8..103a53284 100644 --- a/dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop +++ b/dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop @@ -24,7 +24,7 @@ Name[hi]=औज़ार सूचनाएँ Name[hr]=Obavijesti uređaja Name[hu]=Eszközértesítések Name[ia]=Notificationes de dispositivo -Name[id]=Notifikasi Divais +Name[id]=Notifikasi Peranti Name[is]=Tilkynningar um tæki Name[it]=Notifiche dei dispositivi Name[ja]=デバイスの通知 @@ -84,7 +84,7 @@ Comment[he]=הודעות פאסיביות של התקנים למשתמש. Comment[hr]=Pasivne obavijesti uređaja za korisnika. Comment[hu]=Passzív eszközértesítések a felhasználónak. Comment[ia]=Notificationes de dispositivo passive pro le usator. -Comment[id]=Notifikasi divais pasif untuk pengguna. +Comment[id]=Notifikasi peranti pasif untuk pengguna. Comment[is]=Hlutlausar sjónrænar tilkynningar til notandans. Comment[it]=Notifiche dei dispositivi passive per l'utente. Comment[ja]=ユーザ用の受動的デバイス通知です。 diff --git a/dataengines/hotplug/plasma-dataengine-hotplug.desktop b/dataengines/hotplug/plasma-dataengine-hotplug.desktop index b74a08630..454782651 100644 --- a/dataengines/hotplug/plasma-dataengine-hotplug.desktop +++ b/dataengines/hotplug/plasma-dataengine-hotplug.desktop @@ -88,7 +88,7 @@ Comment[he]=משמש למעקב אחר התקנים נשלפים בעת חיבו Comment[hr]=Pratite uređaje za brzo uštekavanje kako se pojavljuju i nestaju Comment[hu]=Követi a menet közben csatolható (hot-pluggable) eszközöket. Comment[ia]=Il tracia dispositivos hot-pluggable (insertabile a calide) assi como illos appare e disappare -Comment[id]=Lacak divais hot-plug ketika mereka muncul atau menghilang. +Comment[id]=Lacak peranti hot-plug ketika mereka muncul atau menghilang. Comment[is]=Fylgist með hraðtengdum tækjum um leið og þau birtast eða hverfa. Comment[it]=Sorveglia il collegamento e lo scollegamento dei dispositivi collegabili mentre il sistema è in funzione. Comment[ja]=ホットプラグ可能なデバイスが抜き差しされるのを捕捉します。 diff --git a/dataengines/keystate/plasma-dataengine-keystate.desktop b/dataengines/keystate/plasma-dataengine-keystate.desktop index 82f09ce60..c016e8e88 100644 --- a/dataengines/keystate/plasma-dataengine-keystate.desktop +++ b/dataengines/keystate/plasma-dataengine-keystate.desktop @@ -28,7 +28,7 @@ Name[hi]=कुंजीपट व माउस स्थिति Name[hr]=Stanje tipkovnice i miša Name[hu]=Egér- és billentyűzetállapot-jelző Name[ia]=Stato del mus e del claviero -Name[id]=Kondisi Papan Ketik dan Tetikus +Name[id]=Kondisi Keyboard dan Tetikus Name[is]=Staða lyklaborðs og músar Name[it]=Stato di tastiera e mouse Name[ja]=キーボードとマウスの状態 @@ -93,7 +93,7 @@ Comment[he]=המצב של לחצני מקלדת משני מצב ולחצני ע Comment[hr]=Stanja tipaka ctrl, alt, shift i tipaka miša Comment[hu]=Módosítóbillentyűk és egérgombok Comment[ia]=Modificator de claviero e statos de buttones del mus -Comment[id]=Pengubah pepan ketik dan kondisi tombol tetikus +Comment[id]=Pengubah pepan ketik dan kondisi tombol mouse Comment[is]=Breytingar á lyklaborði og músarhnöppum Comment[it]=Stati dei modificatori della tastiera e dei pulsanti del mouse Comment[ja]=キーボードの修飾キーとマウスボタンの状態 diff --git a/dataengines/mpris2/plasma-dataengine-mpris2.desktop b/dataengines/mpris2/plasma-dataengine-mpris2.desktop index 0b73ee81b..3aadf0340 100644 --- a/dataengines/mpris2/plasma-dataengine-mpris2.desktop +++ b/dataengines/mpris2/plasma-dataengine-mpris2.desktop @@ -67,7 +67,7 @@ Comment[gl]=Fornece información e control de reprodutores multimedia mediante M Comment[he]=מספק מידע ושליטה על מדיה דרך MPRIS2 Comment[hu]=Információkat szolgáltat és vezérli a médialejátszókat az MPRIS2-n keresztül Comment[ia]=Il provide information ex e control super media players via MPRIS2 -Comment[id]=Menyediakan informasi dari dan kontrol pemutar media via MPRIS2 +Comment[id]=Menyediakan informasi dari dan kendali pemutar media via MPRIS2 Comment[is]=Stýrir og gefur upplýsingar um margmiðlunarspilara með MPRIS2 Comment[it]=Fornisce le informazioni da e controlla lettori multimediali via MPRIS2 Comment[ja]=MPRIS2 を通して、メディアプレーヤーからの情報を提供し、メディアプレーヤーを制御します diff --git a/dataengines/places/plasma-dataengine-places.desktop b/dataengines/places/plasma-dataengine-places.desktop index 7321eeacf..e9870d3f5 100644 --- a/dataengines/places/plasma-dataengine-places.desktop +++ b/dataengines/places/plasma-dataengine-places.desktop @@ -99,7 +99,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 manajer berkas dan di dialog berkas. +Comment[id]=Tempat, seperti terlihat di pengelola berkas dan di dialog berkas. 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/dataengines/soliddevice/plasma-dataengine-soliddevice.desktop b/dataengines/soliddevice/plasma-dataengine-soliddevice.desktop index 46a0c903b..b0bd25f60 100644 --- a/dataengines/soliddevice/plasma-dataengine-soliddevice.desktop +++ b/dataengines/soliddevice/plasma-dataengine-soliddevice.desktop @@ -31,7 +31,7 @@ Name[hne]=उपकरन जानकारी Name[hr]=Podaci o uređaju Name[hu]=Eszközjellemzők Name[ia]=Information de dispositivo -Name[id]=Informasi Divais +Name[id]=Informasi Peranti Name[is]=Upplýsingar tækis Name[it]=Informazioni sui dispositivi Name[ja]=デバイス情報 @@ -101,7 +101,7 @@ Comment[he]=מידע אודות התקן באמצעות Solid Comment[hr]=Podaci o uređajima preko Solida Comment[hu]=Eszközjellemzők a Solid alrendszerből Comment[ia]=Datos de dispositivos via Solid -Comment[id]=Data divais via Solid +Comment[id]=Data peranti via Solid Comment[is]=Vélbúnaðarupplýsingar með Solid Comment[it]=Dati sui dispositivi con Solid Comment[ja]=Solid によるデバイスデータ diff --git a/klipper/klipperrc.desktop b/klipper/klipperrc.desktop index de0f8032c..9184996c9 100644 --- a/klipper/klipperrc.desktop +++ b/klipper/klipperrc.desktop @@ -313,7 +313,7 @@ Description[hr]=Otvori pomoću &zadanog preglednika Description[hsb]=Ze &standardnym browserom wočinić Description[hu]=Megnyitás az &alapértelmezett böngészővel Description[ia]=Aperi con navigator pre&definite -Description[id]=Buka &dengan Peramban standar +Description[id]=Buka &dengan Peramban baku Description[is]=Opna með sjálf&gefnum vefskoðara Description[it]=Apri con browser pre&definito Description[ja]=デフォルトのブラウザで開く(&D) @@ -1979,7 +1979,7 @@ Description[hr]=Otvori pomoću &zadanog preglednika Description[hsb]=Ze &standardnym browserom wočinić Description[hu]=Megnyitás az &alapértelmezett böngészővel Description[ia]=Aperi con navigator pre&definite -Description[id]=Buka &dengan Peramban standar +Description[id]=Buka &dengan Peramban baku Description[is]=Opna með sjálf&gefnum vefskoðara Description[it]=Apri con browser pre&definito Description[ja]=デフォルトのブラウザで開く(&D) diff --git a/ksmserver/themes/default/metadata.desktop b/ksmserver/themes/default/metadata.desktop index 036727196..6d77c6919 100644 --- a/ksmserver/themes/default/metadata.desktop +++ b/ksmserver/themes/default/metadata.desktop @@ -38,7 +38,7 @@ Name[hr]=Zadano Name[hsb]=Standard Name[hu]=Alapértelmezett Name[ia]=Predefinite -Name[id]=Standar +Name[id]=Baku Name[is]=Sjálfgefið Name[it]=Predefinito Name[ja]=標準 @@ -110,7 +110,7 @@ Comment[gl]=Tema predeterminado do escritorio Plasma Comment[he]=ברירת המחדל של ערכת הנושא של שולחן העבודה של Plasma Comment[hu]=Alapértelmezett plazma asztaltéma Comment[ia]=Thema predefinite de scriptorio de Plasma -Comment[id]=Tema Desktop Plasma standar +Comment[id]=Tema Desktop Plasma baku Comment[is]=Sjálfgefið Plasma skjáborðsþema Comment[it]=Tema standard del desktop di Plasma Comment[ja]=Plasma デスクトップの標準テーマ diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop index b6d8e6445..143be3e5f 100644 --- a/lookandfeel/metadata.desktop +++ b/lookandfeel/metadata.desktop @@ -97,7 +97,7 @@ Name[fi]=Breeze Name[fr]=Brise Name[gl]=Breeze Name[hu]=Breeze -Name[id]=Angin +Name[id]=Breeze Name[is]=Breeze Name[it]=Brezza Name[ja]=Breeze diff --git a/menu/desktop/kf5-more.directory b/menu/desktop/kf5-more.directory index a16eb0c6b..36053ff5d 100644 --- a/menu/desktop/kf5-more.directory +++ b/menu/desktop/kf5-more.directory @@ -23,7 +23,7 @@ Name[he]=עוד ישומים Name[hr]=Više aplikacija Name[hu]=További alkalmazások Name[ia]=Altere Applicationes -Name[id]=Aplikasi Lainnya +Name[id]=Aplikasi Selebihnya Name[is]=Fleiri forrit Name[it]=Altre applicazioni Name[ja]=その他のアプリケーション diff --git a/menu/desktop/kf5-settingsmenu.directory b/menu/desktop/kf5-settingsmenu.directory index 8f3e0eb45..83ca55164 100644 --- a/menu/desktop/kf5-settingsmenu.directory +++ b/menu/desktop/kf5-settingsmenu.directory @@ -40,7 +40,7 @@ Name[hr]=Postavke Name[hsb]=Nastajenja Name[hu]=Beállítások Name[ia]=Preferentias -Name[id]=Pengaturan +Name[id]=Setelan Name[is]=Stillingar Name[it]=Impostazioni Name[ja]=設定 diff --git a/phonon/platform_kde/phonon.notifyrc b/phonon/platform_kde/phonon.notifyrc index 0a4704c09..aab906682 100644 --- a/phonon/platform_kde/phonon.notifyrc +++ b/phonon/platform_kde/phonon.notifyrc @@ -146,7 +146,7 @@ Name[hi]=ऑडियो आउटपुट युक्ति परिवर Name[hr]=Promijenjen je uređaj za izlaz zvuka Name[hu]=A hangkimeneti eszköz megváltozott Name[ia]=Dispositivo de egresso de sono modificate -Name[id]=Divais Keluaran Audio Berubah +Name[id]=Peranti Keluaran Audio Berubah Name[is]=Skipt um úttakstæki fyrir hljóð Name[it]=Il dispositivo di uscita dell'audio è cambiato Name[ja]=オーディオ出力デバイスが変更されました @@ -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 divais keluaran audio telah berubah secara otomatis +Comment[id]=Notifikasi 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/places/plasma-runner-places.desktop b/runners/places/plasma-runner-places.desktop index 57b5ed52f..bd4f6c31e 100644 --- a/runners/places/plasma-runner-places.desktop +++ b/runners/places/plasma-runner-places.desktop @@ -98,7 +98,7 @@ Comment[gl]=Abre dispositivos e cartafoles de marcadores Comment[he]=פותח סימניות התקנים ותיקיות Comment[hu]=Eszközökre és mappákra mutató könyvjelzők megnyitása Comment[ia]=Aperi dispositivos e marcatores de libros de dossieres -Comment[id]=Buka divais dan penanda folder +Comment[id]=Buka peranti dan penanda folder Comment[is]=Opna bókamerki fyrir tæki og möppur Comment[it]=Apre segnalibri di dispositivi e cartelle Comment[ja]=デバイスやブックマークされたフォルダを開きます diff --git a/runners/services/plasma-runner-services.desktop b/runners/services/plasma-runner-services.desktop index 55ef983c1..dd44e55d7 100644 --- a/runners/services/plasma-runner-services.desktop +++ b/runners/services/plasma-runner-services.desktop @@ -119,7 +119,7 @@ Comment[hne]=अनुपरयोग ढूंढव, नियंत्रन Comment[hr]=Pronađi aplikacije, kontrolne okvire i usluge Comment[hu]=Alkalmazások, vezérlőpanelek és szolgáltatások keresése Comment[ia]=Trova applicationes, pannellos de controlo e servicios -Comment[id]=Cari aplikasi, panel kontrol dan layanan +Comment[id]=Cari aplikasi, panel kendali dan layanan Comment[is]=Finna forrit, stjórneiningar og þjónustur Comment[it]=Trova applicazioni, pannelli di controllo e servizi Comment[ja]=アプリケーション、コントロールパネル、サービスを探します diff --git a/runners/solid/plasma-runner-solid.desktop b/runners/solid/plasma-runner-solid.desktop index 2dfb6d733..3bef059cd 100644 --- a/runners/solid/plasma-runner-solid.desktop +++ b/runners/solid/plasma-runner-solid.desktop @@ -30,7 +30,7 @@ Name[hi]=औज़ार Name[hr]=Uređaji Name[hu]=Eszközök Name[ia]=Dispositivos -Name[id]=Divais +Name[id]=Peranti Name[is]=Tæki Name[it]=Dispositivi Name[ja]=デバイス @@ -95,7 +95,7 @@ Comment[he]=משמש לניהול התקנים נשלפים Comment[hr]=Upravlja uklonjivim uređajima Comment[hu]=Cserélhető eszközök kezelése Comment[ia]=Gere dispositivos removibile -Comment[id]=Kelola divais dapat dilepas +Comment[id]=Kelola peranti dapat dilepas Comment[is]=Sýsla með fjarlægjanleg tæki Comment[it]=Gestisci i dispositivi rimovibili Comment[ja]=リムーバブルデバイスを管理します diff --git a/runners/webshortcuts/plasma-runner-webshortcuts.desktop b/runners/webshortcuts/plasma-runner-webshortcuts.desktop index 401a43435..371488d7b 100644 --- a/runners/webshortcuts/plasma-runner-webshortcuts.desktop +++ b/runners/webshortcuts/plasma-runner-webshortcuts.desktop @@ -30,7 +30,7 @@ Name[hi]=वेब शॉर्टकट Name[hr]=Internetski prečaci Name[hu]=Keresési azonosítók Name[ia]=Vias breve de Web -Name[id]=Jalan Pintas Web +Name[id]=Pintasan Web Name[is]=Vefskammstafanir Name[it]=Scorciatoie del Web Name[ja]=ウェブショートカット @@ -90,7 +90,7 @@ Comment[gl]=Permítelle ao usuario empregar os atallos web de Konqueror Comment[he]=מאפשר למשתמש להשתמש בקיצורי דרך אינטרנטיים של Konqueror Comment[hu]=Lehetővé teszi a felhasználónak a Konqueror kereső azonosítóinak használatát Comment[ia]=Il permitte al usator de usar vias breve de Web de Konqueror -Comment[id]=Memungkinkan pengguna untuk menggunakan jalan pintas web Konqueror +Comment[id]=Memungkinkan pengguna untuk menggunakan pintasan web Konqueror Comment[is]=Gerir notanda kleift að nota vefflýtilykla Konqueror Comment[it]=Permette all'utente di usare le scorciatoie del Web di Konqueror Comment[ja]=ユーザに Konqueror のウェブショートカットを使えるようにします diff --git a/sddm-theme/metadata.desktop b/sddm-theme/metadata.desktop index 3d275d377..2546f7685 100644 --- a/sddm-theme/metadata.desktop +++ b/sddm-theme/metadata.desktop @@ -17,7 +17,7 @@ Name[fi]=Breeze Name[fr]=Brise Name[gl]=Breeze Name[hu]=Breeze -Name[id]=Angin +Name[id]=Breeze Name[is]=Breeze Name[it]=Brezza Name[ja]=Breeze @@ -62,7 +62,7 @@ Description[fr]=Thème brise Description[gl]=Tema Breeze Description[he]=ערכת הנושא Breeze Description[hu]=Breeze téma -Description[id]=Tema Angin +Description[id]=Tema Breeze Description[is]=Breeze þema Description[it]=Tema Brezza Description[ja]=Breeze テーマ From 29cde5f16970c3d5904f484a479fcae8579563f7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 25 Dec 2017 06:30:46 +0100 Subject: [PATCH 5/7] 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" --- .../paste/plasma-containmentactions-paste.desktop | 2 +- dataengines/keystate/plasma-dataengine-keystate.desktop | 2 +- dataengines/mouse/plasma-dataengine-mouse.desktop | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/containmentactions/paste/plasma-containmentactions-paste.desktop b/containmentactions/paste/plasma-containmentactions-paste.desktop index d6c09725f..5a3ddf989 100644 --- a/containmentactions/paste/plasma-containmentactions-paste.desktop +++ b/containmentactions/paste/plasma-containmentactions-paste.desktop @@ -95,7 +95,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]=Membuat widget dari isi papan klip +Comment[id]=Menciptakan widget dari isi 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/dataengines/keystate/plasma-dataengine-keystate.desktop b/dataengines/keystate/plasma-dataengine-keystate.desktop index c016e8e88..834e17cd5 100644 --- a/dataengines/keystate/plasma-dataengine-keystate.desktop +++ b/dataengines/keystate/plasma-dataengine-keystate.desktop @@ -28,7 +28,7 @@ Name[hi]=कुंजीपट व माउस स्थिति Name[hr]=Stanje tipkovnice i miša Name[hu]=Egér- és billentyűzetállapot-jelző Name[ia]=Stato del mus e del claviero -Name[id]=Kondisi Keyboard dan Tetikus +Name[id]=Kondisi Keyboard dan Mouse Name[is]=Staða lyklaborðs og músar Name[it]=Stato di tastiera e mouse Name[ja]=キーボードとマウスの状態 diff --git a/dataengines/mouse/plasma-dataengine-mouse.desktop b/dataengines/mouse/plasma-dataengine-mouse.desktop index fb30b2301..e9cec46c5 100644 --- a/dataengines/mouse/plasma-dataengine-mouse.desktop +++ b/dataengines/mouse/plasma-dataengine-mouse.desktop @@ -97,7 +97,7 @@ Comment[he]=מיקום עכבר וסמן Comment[hr]=Pozicija miša i pokazivača miša Comment[hu]=Egérmutató-pozíció Comment[ia]=Position e cursor del mus -Comment[id]=Posisi tetikus dan kursor +Comment[id]=Posisi mouse dan kursor Comment[is]=Staðsetning músar og bendils Comment[it]=Posizione e cursore del mouse Comment[ja]=マウスの位置とカーソル From 1c8eb7a73215567754c4f20f44e98d2e54e2c954 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 28 Dec 2017 06:23:50 +0100 Subject: [PATCH 6/7] 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/batterymonitor/package/metadata.desktop | 2 +- applets/mediacontroller/metadata.desktop | 2 +- .../powermanagement/plasma-dataengine-powermanagement.desktop | 2 +- runners/powerdevil/plasma-runner-powerdevil.desktop | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/applets/batterymonitor/package/metadata.desktop b/applets/batterymonitor/package/metadata.desktop index 42cccdde0..1a416de45 100644 --- a/applets/batterymonitor/package/metadata.desktop +++ b/applets/batterymonitor/package/metadata.desktop @@ -133,7 +133,7 @@ Keywords[gl]=Xestión da enerxía;batería;sistema;enerxía; Keywords[he]=Power Management; Battery; System; Energy;ניהול חשמל;חשמל; סוללה; מערכת;אנרגיה; בטריה; Keywords[hu]=Energiakezelés;Akkumulátor;Rendszer;Energia; Keywords[ia]=Gestion de energia;Batteria;Systema; Energia; -Keywords[id]=Manajemen Daya;Baterai;Sistem;Energi; +Keywords[id]=Pengelolaan Daya;Baterai;Sistem;Energi; Keywords[is]=Orkustjórnun;Rafhlaða;Kerfi;Afl; Keywords[it]=Gestione energetica;Batteria;Sistema;Energia; Keywords[ja]=電源管理;バッテリー;システム;エネルギー; diff --git a/applets/mediacontroller/metadata.desktop b/applets/mediacontroller/metadata.desktop index fbabbf2e5..c0ded0f91 100644 --- a/applets/mediacontroller/metadata.desktop +++ b/applets/mediacontroller/metadata.desktop @@ -66,7 +66,7 @@ Comment[gl]=Controles do reprodutor multimedia Comment[he]=פקדי ניגון מדיה Comment[hu]=Médialejátszó vezérlők Comment[ia]=Controlos de Reproductor de Multimedia -Comment[id]=Kontrol Pemain Media +Comment[id]=Kendali Pemain Media Comment[is]=Stjórntæki margmiðlunarspilara Comment[it]=Controlli del lettore multimediale Comment[ja]=メディアプレーヤーコントロール diff --git a/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop b/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop index 38a96ee03..4c3e45e4a 100644 --- a/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop +++ b/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop @@ -29,7 +29,7 @@ Name[hi]=बिज़ली प्रबंधन Name[hr]=Upravljanje potrošnjom energije Name[hu]=Energiakezelő Name[ia]=Gestion de energia -Name[id]=Manajemen Daya +Name[id]=Pengelolaan Daya Name[is]=Orkustýring Name[it]=Gestione energetica Name[ja]=電源管理 diff --git a/runners/powerdevil/plasma-runner-powerdevil.desktop b/runners/powerdevil/plasma-runner-powerdevil.desktop index 61165d1f3..97eee5183 100644 --- a/runners/powerdevil/plasma-runner-powerdevil.desktop +++ b/runners/powerdevil/plasma-runner-powerdevil.desktop @@ -28,7 +28,7 @@ Comment[hne]=मूल पावर प्रबंधन आपरेसन Comment[hr]=Osnovne operacije upravljanja potrošnjom energije Comment[hu]=Energiakezelési funkciók Comment[ia]=Operationes basic de gestion de energia -Comment[id]=Operasi Manajemen Daya Dasar +Comment[id]=Operasi Pengelolaan Daya Dasar Comment[is]=Grunnaðgerðir orkustýringarkerfis Comment[it]=Operazioni di base per la gestione energetica Comment[ja]=基本的な電源管理操作 From 12e3568042fb365aad3eccf2fefa58bbeb065210 Mon Sep 17 00:00:00 2001 From: Maciej Sitarz Date: Mon, 8 Jan 2018 15:01:11 +0000 Subject: [PATCH 7/7] Fix for xembedsniproxy crash due to NULL returned from xcb_image_get() Summary: In my environment (Fedora 27, plasma-workspace-5.11.4-1.fc27.x86_64) xembedsniproxy crashes. This is caused by NULL being returned by xcb_image_get(). This should fix or at least mitigate the problems from bugs: https://bugs.kde.org/show_bug.cgi?id=355463 https://bugs.kde.org/show_bug.cgi?id=359664 https://bugzilla.redhat.com/show_bug.cgi?id=1497829 Reviewers: #plasma, davidedmundson Reviewed By: #plasma, davidedmundson Subscribers: broulik, plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D9732 --- xembed-sni-proxy/sniproxy.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xembed-sni-proxy/sniproxy.cpp b/xembed-sni-proxy/sniproxy.cpp index c935c9ea1..097a49010 100644 --- a/xembed-sni-proxy/sniproxy.cpp +++ b/xembed-sni-proxy/sniproxy.cpp @@ -270,7 +270,13 @@ QImage SNIProxy::getImageNonComposite() const xcb_image_t *image = xcb_image_get(c, m_windowId, 0, 0, geom->width, geom->height, 0xFFFFFFFF, XCB_IMAGE_FORMAT_Z_PIXMAP); // Don't hook up cleanup yet, we may use a different QImage after all - QImage naiveConversion = QImage(image->data, image->width, image->height, QImage::Format_ARGB32); + QImage naiveConversion; + if (image) { + naiveConversion = QImage(image->data, image->width, image->height, QImage::Format_ARGB32); + } else { + qCDebug(SNIPROXY) << "Skip NULL image returned from xcb_image_get() for" << m_windowId << Title(); + return QImage(); + } if (isTransparentImage(naiveConversion)) { QImage elaborateConversion = QImage(convertFromNative(image));