From ee25d4705b1bf673fb3f02a19b2a2338434d5c31 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 5 Nov 2019 05:35:07 +0100 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" --- applets/batterymonitor/package/metadata.desktop | 2 +- applets/lock_logout/metadata.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applets/batterymonitor/package/metadata.desktop b/applets/batterymonitor/package/metadata.desktop index 4e70a0a9b..77d33d4be 100644 --- a/applets/batterymonitor/package/metadata.desktop +++ b/applets/batterymonitor/package/metadata.desktop @@ -142,7 +142,7 @@ Keywords[it]=Gestione energetica;Batteria;Sistema;Energia; Keywords[ja]=電源管理;バッテリー;システム;エネルギー; Keywords[kk]=Power Management;Battery;System;Energy; Keywords[ko]=Power Management;Battery;System;Energy;전원 관리;전력 관리;배터리;시스템;에너지; -Keywords[lt]=Energijos valdymas;Baterija;Sistema;Energija;Akumuliatorius; +Keywords[lt]=Energijos valdymas;Baterija;Sistema;Energija;Akumuliatorius;Maitinimo valdymas Keywords[mr]=वीज व्यवस्थापन; बॅटरी; प्रणाली; ऊर्जा; Keywords[nb]=Strømstyring; Batteri; System; Energi; Keywords[nds]=Stroompleeg,Batterie,Systeem,Energie diff --git a/applets/lock_logout/metadata.desktop b/applets/lock_logout/metadata.desktop index 2e99b4965..6dae4d5cb 100644 --- a/applets/lock_logout/metadata.desktop +++ b/applets/lock_logout/metadata.desktop @@ -178,7 +178,7 @@ Keywords[it]=Blocca;Esci;Sospendi;Iberna;Cambia utente; Keywords[ja]=ロック;ログアウト;スリープ;ハイバネート;ユーザの切り替え; Keywords[kk]=Lock;Logout;Sleep;Hibernate;Switch User; Keywords[ko]=Lock;Logout;Sleep;Hibernate;Switch User;잠금;로그아웃;대기;대기 모드;최대 절전;최대 절전 모드;사용자 전환; -Keywords[lt]=Užrakinti;Uzrakinti;Atsijungti;Pristabdyti;Pristabdyti į RAM;Miegoti;Miegas;Miego veiksena;Miego režimas;Pristabdyti į diską;Sustabdyti;Užmigdyti;Uzmigdyti;Hibernuoti;Perjungti naudotoją; +Keywords[lt]=Užrakinti;Uzrakinti;Atsijungti;Pristabdyti;Pristabdyti į RAM;Miegoti;Miegas;Miego veiksena;Miego režimas;Miego rezimas;Pristabdyti i RAM;Pristabdyti i diska;Pristabdyti į diską;Sustabdyti;Užmigdyti;Uzmigdyti;Hibernuoti;Perjungti naudotoją;Perjungti naudotoja Keywords[mr]=कुलूप; बाहेर पडा; झोप; हायबरनेट; वापरकर्ता बदला; Keywords[nb]=Lås; Logg ut; Hvile; Dvale; Bytt bruker; Keywords[nds]=Slott,afsluten,afmellen,slapen,infreren,Bruker wesseln;Brukerwessel