Commit 0e9a8335 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 73bd68ef
......@@ -10,6 +10,7 @@ Name[en_GB]=ownCloud (> 5.0 and < 9.0)
Name[es]=ownCloud (> 5.0 y < 9.0)
Name[et]=ownCloud (> 5.0 ja < 9.0)
Name[fi]=ownCloud (> 5.0 ja < 9.0)
Name[fr]=ownCloud (> 5.0 et < 9.0)
Name[gl]=ownCloud (> 5.0 e < 9.0)
Name[it]=ownCloud (> 5.0 e < 9.0)
Name[ko]=ownCloud (> 5.0 및 < 9.0)
......
......@@ -9,6 +9,7 @@ Name[en_GB]=Akonadi TomboyNotes Resource
Name[es]=Recurso de notas de Tomboy de Akonadi
Name[et]=Akonadi Tomboy sedelite ressurss
Name[fi]=Akonadin TomboyNotes-resurssi
Name[fr]=Ressource Akonadi TomboyNotes
Name[gl]=Recurso de notas de Tomboy para Akonadi
Name[it]=Risorsa note di Tomboy per Akonadi
Name[ko]=Akonadi TomboyNotes 자원
......@@ -35,6 +36,7 @@ Comment[en_GB]=Resource for Tomboy compatible notes server
Comment[es]=Recurso para un servidor de notas compatible con Tomboy
Comment[et]=Tomboyga ühilduvate sedelite serveri ressurss
Comment[fi]=Tomboy-yhteensopivan muistiinpanopalvelimen resurssi
Comment[fr]=Ressource pour serveur de notes compatible avec Tomboy
Comment[gl]=Recurso para servidores de notas compatíbeis con Tomboy.
Comment[it]=Risorsa per un server di note compatibile con Tomboy
Comment[ko]=Tomboy 호환 메모 서버 자원
......
......@@ -51,6 +51,7 @@ Comment[en_GB]=Loads contact from vCard Directory
Comment[es]=Carga contactos desde un directorio vCard
Comment[et]=Kontakti laadimine vCardide kataloogist
Comment[fi]=Lataa yhteystiedon VCard-kansiosta
Comment[fr]=Charge des données depuis un dossier « vCard »
Comment[gl]=Carga contactos dun directorio vCard.
Comment[it]=Carica contatti da una cartella vCard
Comment[ko]=vCard 디렉터리에서 연락처를 가져옵니다
......
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