Commit ea2b320a authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent cfc51325
......@@ -21,6 +21,7 @@ X-KDE-Keywords[fr]=à propos,info,information,distribution,distro,system,kernel,
X-KDE-Keywords[gl]=sobre,info,información,distribución,sistema,information,distribution,distro,system,kernel,qt,kde
X-KDE-Keywords[id]=tentang,informasi,distribusi,distro,sistem,kernel,qt,kde
X-KDE-Keywords[it]=informazioni,info,distribuzione,distro,sistema,kernel,qt,kde
X-KDE-Keywords[ja]=情報,ディストリビューション,ディストリ,システム,カーネル
X-KDE-Keywords[ko]=about,info,information,distribution,distro,system,kernel,qt,kde,정보,배포판,시스템,커널
X-KDE-Keywords[lt]=apie,informacija,distribucija,platinimas,platinamasis paketas,distro,sistema,branduolys,qt,kde
X-KDE-Keywords[nl]=over,info,informatie,distributie,distro,systeem,kernel,qt,kde
......@@ -84,6 +85,7 @@ Comment[hu]=Információk erről a rendszerről
Comment[ia]=Information re iste systema
Comment[id]=Informasi Tentang Sistem Ini
Comment[it]=Informazioni su questo sistema
Comment[ja]=このシステムに関する情報
Comment[ko]=이 시스템 정보
Comment[lt]=Informacija apie šią sistemą
Comment[nb]=Informasjon om dette systemet
......
......@@ -149,6 +149,7 @@ X-KDE-Keywords[fr]=périphérique,périphériques,disque,lecteur,processeur,cpu
X-KDE-Keywords[gl]=dispositivo,dispositivos,disco,unidade,procesador,cpu
X-KDE-Keywords[id]=perangkat,device,disk,cakram,prosesor,cpu
X-KDE-Keywords[it]=dispositivo,dispositivi,disco,lettore,processore,cpu
X-KDE-Keywords[ja]=デバイス,ディスク,ドライブ,プロセッサ
X-KDE-Keywords[ko]=device,devices,disk,drive,processor,cpu,장치,디스크,드라이브,프로세서
X-KDE-Keywords[lt]=įrenginys,įtaisas,diskas,procesorius,cpu
X-KDE-Keywords[nl]=apparaat,apparaten,schijf,station,processor,cpu
......
......@@ -26,6 +26,7 @@ Name[hu]=Energiakezelési jellemzők
Name[ia]=Information de energia
Name[id]=Informasi Energi
Name[it]=Informazioni energetiche
Name[ja]=エネルギー情報
Name[ko]=에너지 정보
Name[lt]=Energijos informacija
Name[nb]=Energiinformasjon
......@@ -66,6 +67,7 @@ Comment[he]=סטטיסטיקת צריכת אנרגיה
Comment[hu]=Energiafogyasztási statisztikák
Comment[id]=Statistik Konsumsi Energi
Comment[it]=Statistiche del consumo di energia
Comment[ja]=エネルギー消費の統計
Comment[ko]=에너지 소모 통계
Comment[lt]=Energijos sunaudojimo statistika
Comment[nb]=Statistikk over energibruk
......@@ -107,6 +109,7 @@ X-KDE-Keywords[he]=Battery,Energy,Statistics,History,Power,סוללה,אנרגי
X-KDE-Keywords[hu]=Telep,Energia,Statisztika,Előzmény,Energiakezelés
X-KDE-Keywords[id]=Baterai,Energi,Statistik,Histori,Daya
X-KDE-Keywords[it]=Batteria,Energia,Statistiche,Storico,Alimentazione
X-KDE-Keywords[ja]=バッテリ,エネルギー,統計,履歴,電源
X-KDE-Keywords[ko]=Battery,Energy,Statistics,History,Power,배터리,에너지,통계,전원,전력
X-KDE-Keywords[lt]=Akumuliatorius,Energija,Statistika,Istorija,Maitinimas,Baterija,Žurnalas
X-KDE-Keywords[nb]=Batteri,Energi,Statistikk,Historie,Effekt
......
......@@ -19,6 +19,7 @@ Name[hu]=Energiakezelési jellemzők
Name[ia]=Information de energia
Name[id]=Informasi Energi
Name[it]=Informazioni energetiche
Name[ja]=エネルギー情報
Name[ko]=에너지 정보
Name[lt]=Energijos informacija
Name[nb]=Energiinformasjon
......@@ -59,6 +60,7 @@ Comment[he]=סטטיסטיקה על צריכת האנרגיה במערכת
Comment[hu]=Statisztikák az energiafogyasztásról
Comment[id]=Statistik tentang konsumsi energi
Comment[it]=Statistiche sul consumo energetico
Comment[ja]=エネルギー消費に関するの統計
Comment[ko]=에너지 소모 통계
Comment[lt]=Statistika apie energijos sunaudojimą
Comment[nb]=Statistikk om energiforbruk
......
......@@ -21,6 +21,7 @@ Name[hu]=Információk
Name[ia]=Information
Name[id]=Informasi
Name[it]=Informazioni
Name[ja]=情報
Name[ko]=정보
Name[lt]=Informacija
Name[nb]=Informasjon
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment