From b09a3b2a86dc408abe71d663abada9503cb98cd8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 27 Apr 2015 10:24:27 +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 | 2 ++ ksmserver/screenlocker/kcm/screenlocker.desktop | 2 ++ runners/powerdevil/plasma-runner-powerdevil.desktop | 1 + 3 files changed, 5 insertions(+) diff --git a/applets/systemmonitor/cpu/metadata.desktop b/applets/systemmonitor/cpu/metadata.desktop index 1400fe987..87949f3e0 100644 --- a/applets/systemmonitor/cpu/metadata.desktop +++ b/applets/systemmonitor/cpu/metadata.desktop @@ -11,6 +11,7 @@ Name[fi]=Suoritinkäyttö Name[gl]=Vixilante da carga da CPU Name[hu]=Processzorfigyelő Name[it]=Monitor del carico del processore +Name[ko]=CPU 사용량 모니터 Name[nl]=Monitor voor CPU-gebruik Name[pl]=Monitor obciążenia procesora Name[pt]=Monitor de Carga do CPU @@ -39,6 +40,7 @@ Comment[fi]=Seuraa suoritinten kuormaa 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[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/ksmserver/screenlocker/kcm/screenlocker.desktop b/ksmserver/screenlocker/kcm/screenlocker.desktop index 23fa51667..8359c3519 100644 --- a/ksmserver/screenlocker/kcm/screenlocker.desktop +++ b/ksmserver/screenlocker/kcm/screenlocker.desktop @@ -84,10 +84,12 @@ Comment[zh_CN]=锁屏时间 Comment[zh_TW]=螢幕鎖定逾時 X-KDE-Keywords=lock,resume, screensaver, screenlock X-KDE-Keywords[ca]=bloqueig,reprendre,estalvi de pantalla,bloqueig de pantalla +X-KDE-Keywords[en_GB]=lock,resume, screensaver, screenlock X-KDE-Keywords[es]=bloquear,reanudar,salvapantallas,bloquear pantalla X-KDE-Keywords[fi]=lock,resume, screensaver, screenlock, lukko, lukitseminen, herääminen, näytönsäästäjä, näyttölukko, lukitusnäyttö X-KDE-Keywords[gl]=bloquear,desbloquear,salvapantallas,bloqueo de pantalla X-KDE-Keywords[it]=blocca, riprendi, salvaschermo, blocco dello schermo +X-KDE-Keywords[ko]=lock,resume, screensaver, screenlock,잠금,다시 시작,화면 보호기,화면 잠금 X-KDE-Keywords[nl]=grendel,hervatten, schermbeveiliging, schermbeveiliging X-KDE-Keywords[pl]=blokada, wznowienie, wygaszacz ekranu, blokada ekranu X-KDE-Keywords[pt]=bloquear,retomar,protector de ecrã,bloqueio do ecrã diff --git a/runners/powerdevil/plasma-runner-powerdevil.desktop b/runners/powerdevil/plasma-runner-powerdevil.desktop index 40b7a6e3e..6600422a7 100644 --- a/runners/powerdevil/plasma-runner-powerdevil.desktop +++ b/runners/powerdevil/plasma-runner-powerdevil.desktop @@ -82,6 +82,7 @@ Name[fi]=Virta Name[gl]=Enerxía Name[hu]=Teljesítmény Name[it]=Alimentazione +Name[ko]=전원 Name[nl]=Energie Name[pl]=Zasilanie Name[pt]=Energia