From 4207c6762543db35ee79dbfbeb11a411c4a11cee Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 26 Aug 2015 10:23:31 +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" --- applets/systemmonitor/cpu/metadata.desktop | 1 + kioslave/desktop/Home.desktop | 2 ++ kioslave/desktop/desktopnotifier.desktop | 2 ++ kioslave/desktop/directory.trash | 1 + lookandfeel/metadata.desktop | 3 ++- runners/powerdevil/plasma-runner-powerdevil.desktop | 1 + 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/applets/systemmonitor/cpu/metadata.desktop b/applets/systemmonitor/cpu/metadata.desktop index 58239b4d3..aed8b0b46 100644 --- a/applets/systemmonitor/cpu/metadata.desktop +++ b/applets/systemmonitor/cpu/metadata.desktop @@ -46,6 +46,7 @@ Comment[gl]=Vixiar a carga das CPU. Comment[hu]=A processzorterhelés monitorozása Comment[it]=Indica il carico dei processori Comment[ko]=CPU 사용량 모니터 +Comment[lt]=Stebėti CPU apkrovą Comment[nl]=Het gebruik van de CPU's monitoren Comment[pl]=Monitoruje obciążenie procesora Comment[pt]=Vigia a carga dos CPU's diff --git a/kioslave/desktop/Home.desktop b/kioslave/desktop/Home.desktop index 16ddb0237..abc78add2 100644 --- a/kioslave/desktop/Home.desktop +++ b/kioslave/desktop/Home.desktop @@ -9,6 +9,7 @@ Name[fi]=Koti Name[gl]=Cartafol persoal Name[it]=Home Name[ko]=홈 +Name[lt]=Pradžia Name[nl]=Home Name[nn]=Heim Name[pl]=Katalog domowy @@ -35,6 +36,7 @@ GenericName[fi]=Omat tiedostot GenericName[gl]=Ficheiros persoais GenericName[it]=File personali GenericName[ko]=개인적인 파일 +GenericName[lt]=Asmeniniai failai GenericName[nl]=Persoonlijke bestanden GenericName[nn]=Personlege filer GenericName[pl]=Pliki osobiste diff --git a/kioslave/desktop/desktopnotifier.desktop b/kioslave/desktop/desktopnotifier.desktop index 93f472f57..cf15436ae 100644 --- a/kioslave/desktop/desktopnotifier.desktop +++ b/kioslave/desktop/desktopnotifier.desktop @@ -9,6 +9,7 @@ Name[fi]=Kansion tarkkailija Name[gl]=Vixilante de cartafoles Name[it]=Guardia delle cartelle Name[ko]=디렉터리 감시기 +Name[lt]=Aplanko stebėtojas Name[nl]=Mappenbewaker Name[nn]=Mappeovervaking Name[pl]=Monitorowanie katalogów @@ -42,6 +43,7 @@ Comment[fi]=Tarkkailee muutoksia kansioissa Comment[gl]=Vixía os cambios nos cartafoles. Comment[it]=Sorveglia i cambiamenti nelle cartelle Comment[ko]=디렉터리 변경 사항을 감시합니다 +Comment[lt]=Stebi aplanko pakeitimus Comment[nl]=Mappen monitoren op wijzigingen Comment[nn]=Overvakar mapper for endringar Comment[pl]=Monitoruje katalogi w poszukiwaniu zmian diff --git a/kioslave/desktop/directory.trash b/kioslave/desktop/directory.trash index 6e054fb94..d47ed80f7 100644 --- a/kioslave/desktop/directory.trash +++ b/kioslave/desktop/directory.trash @@ -36,6 +36,7 @@ Comment[fi]=Sisältää poistetut tiedostot Comment[gl]=Contén ficheiros eliminados. Comment[it]=Contiene i file rimossi Comment[ko]=삭제된 파일 및 폴더가 있습니다 +Comment[lt]=Čia yra ištrinti failai Comment[nl]=Bevat de verwijderde bestanden Comment[nn]=Inneheld sletta filer Comment[pl]=Zawiera usunięte pliki diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop index 3bf21dcbb..5252dfbcc 100644 --- a/lookandfeel/metadata.desktop +++ b/lookandfeel/metadata.desktop @@ -21,7 +21,7 @@ Comment[nds]=De Schriefdisch-Utleggspraak Breeze vun de KDE-VDG Comment[nl]=Breeze ontwerptaal van het bureaublad door KDE VDG Comment[pl]=Język projektowania pulpitu Bryza stworzony przez KDE VDG Comment[pt]=Linguagem de Desenho do Ecrã Brisa da VDG do KDE -Comment[pt_BR]=Linguagem de desenho da área de trabalho por KDE VDG +Comment[pt_BR]=Linguagem de desenho da área de trabalho Breeze por KDE VDG Comment[ru]=Оформление рабочей среды Breeze от KDE VDG Comment[sk]=Jazyk dizajnu plochy vánok od KDE VDG Comment[sl]=Sapica, oblikovalni jezik namizja avtorjev KDE VDG @@ -50,6 +50,7 @@ Keywords[hu]=Asztal;Munkaterület;Megjelenés;Kinézet;Kijelentkezés;Zárolás; Keywords[id]=Desktop;Ruang Kerja;Tampilan;Tampilan dan Rasa;Keluar;Kunci;Suspensi;Matikan;Hibernasi; Keywords[it]=desktop;spazio di lavoro;aspetto;uscita;blocco;sospensione;spegnimento;ibernazione; Keywords[ko]=Desktop;Workspace;Appearance;Look and Feel;Logout;Lock;Suspend;Shutdown;Hibernate;데스크톱;작업공간;모양;로그아웃;잠금;대기모드;종료;끄기;최대절전모드 +Keywords[lt]=Darbastalis;Erdvė;Išvaizda;Look and Feel;Atsijungti;užrakinti;sulaikyti;Išjungti;Hibernuoti; Keywords[nl]=Bureaublad;Werkruimte;Uiterlijk;Uiterlijk en gedrag;Afmelden;Vergrendelen;Onderbreken;Afsluiten;Slapen naar schijf; Keywords[pl]=Pulpit;Przestrzeń robocza;Wygląd;Wygląd i Odczucia;Wylogowanie;Zablokowanie ;Wstrzymanie;Zamknięcie;Hibernowanie;Wrażenia; Keywords[pt]=Ecrã;Área de Trabalho;Aparência;Aparência e Comportamento;Encerrar;Bloquear;Suspender;Desligar;Hibernar; diff --git a/runners/powerdevil/plasma-runner-powerdevil.desktop b/runners/powerdevil/plasma-runner-powerdevil.desktop index 1ab237f46..5bf1945c0 100644 --- a/runners/powerdevil/plasma-runner-powerdevil.desktop +++ b/runners/powerdevil/plasma-runner-powerdevil.desktop @@ -85,6 +85,7 @@ Name[gl]=Enerxía Name[hu]=Teljesítmény Name[it]=Alimentazione Name[ko]=전원 +Name[lt]=Maitinimas Name[nl]=Energie Name[pl]=Zasilanie Name[pt]=Energia