Commit e20dc3b2 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 9021c592
......@@ -62,6 +62,7 @@ Comment[fr]=Surveille la charge des processeurs
Comment[gl]=Vixiar a carga das CPU.
Comment[he]=צג שימוש במעבד
Comment[hu]=A processzorterhelés monitorozása
Comment[ia]=Monitora le carga del CPUs
Comment[id]=Pemantau muatan CPU
Comment[is]=Fylgjast með álagi á örgjörva
Comment[it]=Indica il carico dei processori
......
......@@ -14,6 +14,7 @@ Name[fi]=Taustakuvaliitännäiset
Name[fr]=Modules externes de fonds d'écran
Name[gl]=Complementos de fondo de escritorio
Name[hu]=Háttérképmodulok
Name[ia]=Plugind de tapete de papiro
Name[id]=Plugin-plugin Wallpaper
Name[it]=Estensioni per lo sfondo
Name[ko]=배경 그림 플러그인
......
......@@ -22,6 +22,7 @@ Name[fi]=Käyttäjäpalaute
Name[fr]=Retours des utilisateurs
Name[gl]=Achegas de usuario
Name[hu]=Felhasználói visszajelzés
Name[ia]=Responsa del usator
Name[id]=Tanggapan Pengguna
Name[it]=Segnalazioni dell'utente
Name[ja]=ユーザ フィードバック
......
Supports Markdown
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