Commit 7c10314a authored by Script Kiddy's avatar Script Kiddy

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 d124586d
Pipeline #45698 skipped
......@@ -12,6 +12,7 @@ Name[eu]=KNotes inprimatzeko gaia
Name[fr]=Thème d'impression KNotes
Name[gl]=Tema de impresión de KNotes
Name[hu]=KNotes nyomtatási téma
Name[ia]=Thema de imprimer de knotes
Name[it]=Tema di stampa predefinito di KNotes
Name[ko]=KNotes 인쇄 테마
......@@ -167,6 +167,7 @@ Name[eu]=Ohar berria
Name[fi]=Uusi muistiinpano
Name[fr]=Nouvelle note
Name[gl]=Nova nota
Name[hu]=Új jegyzet
Name[ia]=Nove notas:
Name[it]=Nuova nota
Name[ko]=새 노트
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