From 4d909b239ead4b89bf2b81601e99f8b10476b93f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 25 Dec 2017 06:07:31 +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" --- .../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 4c41e740e..925f35f05 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]=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 937035a30..d5d51ca3f 100644 --- a/dataengines/keystate/plasma-dataengine-keystate.desktop +++ b/dataengines/keystate/plasma-dataengine-keystate.desktop @@ -27,7 +27,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 54b4c3c88..a48fe942b 100644 --- a/dataengines/mouse/plasma-dataengine-mouse.desktop +++ b/dataengines/mouse/plasma-dataengine-mouse.desktop @@ -95,7 +95,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 c758248f4d312e3f72a16a10ba6afd63b71c16c2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 28 Dec 2017 06:04:42 +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" --- 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 faf488c13..fa258563d 100644 --- a/applets/batterymonitor/package/metadata.desktop +++ b/applets/batterymonitor/package/metadata.desktop @@ -131,7 +131,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 ed6840337..3f4ffd81f 100644 --- a/applets/mediacontroller/metadata.desktop +++ b/applets/mediacontroller/metadata.desktop @@ -64,7 +64,7 @@ Comment[gl]=Controis 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 4b00fc920..ee5a49845 100644 --- a/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop +++ b/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop @@ -28,7 +28,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 c007e8623..a15e8e95f 100644 --- a/runners/powerdevil/plasma-runner-powerdevil.desktop +++ b/runners/powerdevil/plasma-runner-powerdevil.desktop @@ -27,7 +27,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 eeb4b14d445ca533d1fe562c714936e1cc380964 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Tue, 2 Jan 2018 11:17:07 +0100 Subject: [PATCH 3/4] Update version number for 5.11.5 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 172e485cb..7fe33402a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(plasma-workspace) -set(PROJECT_VERSION "5.11.4") +set(PROJECT_VERSION "5.11.5") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) From 59d637f67e674a7072ce14fd85fe74c4a87782a0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 11 Jan 2018 06:28:15 +0100 Subject: [PATCH 4/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/batterymonitor/package/metadata.desktop | 2 +- applets/lock_logout/metadata.desktop | 2 +- lookandfeel/metadata.desktop | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/applets/batterymonitor/package/metadata.desktop b/applets/batterymonitor/package/metadata.desktop index fa258563d..42d140c55 100644 --- a/applets/batterymonitor/package/metadata.desktop +++ b/applets/batterymonitor/package/metadata.desktop @@ -126,7 +126,7 @@ Keywords[es]=Gestión de energía;Batería;Sistema;Energía; Keywords[et]=Toitehaldus;aku;süsteem;energia; Keywords[eu]=Energia kudeaketa;bateria;sistema,energia; Keywords[fi]=Virranhallinta;Akku;Järjestelmä;Virransäästö; -Keywords[fr]=Gestion de l'énergie, Batterie, Système, Énergie, +Keywords[fr]=Gestion de l'énergie;Batterie;Système;Énergie; 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; diff --git a/applets/lock_logout/metadata.desktop b/applets/lock_logout/metadata.desktop index 0a9da3ef0..173a4855b 100644 --- a/applets/lock_logout/metadata.desktop +++ b/applets/lock_logout/metadata.desktop @@ -168,7 +168,7 @@ Keywords[es]=Bloquear;Terminar la sesión;Dormir;Hibernar;Cambiar de usuario; Keywords[et]=Lukustamine;Väljalogimine;Uni;Talveuni;Kasutaja vahetamine; Keywords[eu]=Giltzatu;blokeatu;saio-bukaera;lokartu;hibernatu;aldatu erabiltzailea; Keywords[fi]=Lukitse;kirjaudu ulos;valmiustila;lepotila;vaihda käyttäjää; -Keywords[fr]=Verrouillage, Déconnexion, Hibernation, Changement d'utilisateur, +Keywords[fr]=Verrouillage;Déconnexion;Hibernation;Changement d'utilisateur; 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; diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop index 7abb14811..3d7679509 100644 --- a/lookandfeel/metadata.desktop +++ b/lookandfeel/metadata.desktop @@ -52,7 +52,7 @@ Keywords[es]=Escritorio;Espacio de trabajo;Apariencia;Aspecto visual;Cerrar sesi Keywords[et]=töölaud;töötsoon;välimus;väljalogimine;lukustamine;seiskamine;väljalülitamine;talveuni;uni; Keywords[eu]=mahaigain;lan-eremu;lan-gune;itxura;itxura eta izaera;saioa-amaitu;giltzatu;blokeatu;eseki;itzali;hibernatu; Keywords[fi]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;Työpöytä;Työtila;Ulkoasu;Ulkoasu ja tuntuma;Kirjaudu ulos;Lukitse;Valmiustila;Sammuta;Lepotila; -Keywords[fr]=bureau;espace de travail;apparence;déconnexion;verrouillage;suspension;arrêt;hibernation +Keywords[fr]=bureau;espace de travail;apparence;déconnexion;verrouillage;suspension;arrêt;hibernation; Keywords[gl]=Escritorio;Espazo de traballo;Aparencia;Aparencia e Comportamento;Saír;Trancar;Bloquear;Suspender;Apagar;Hibernar; Keywords[hu]=Asztal;Munkaterület;Megjelenés;Kinézet;Kijelentkezés;Zárolás;Felfüggesztés;Leállítás;Hibernálás; Keywords[id]=Desktop;Ruang Kerja;Tampilan;Tampilan dan Rasa;Keluar;Kunci;Suspensi;Matikan;Hibernasi;