Commit 82d155d0 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 97e4c684
......@@ -92,6 +92,7 @@ X-KDE-Keywords[et]=kde aadressiraamat, seadistamine, seadistused, pluginad
X-KDE-Keywords[fi]=kaddressbook, asetukset, liitännäiset
X-KDE-Keywords[fr]=KAddressBook, configuration, paramètres, modules externes
X-KDE-Keywords[gl]=kaddressbook,configurar,opcións,complementos
X-KDE-Keywords[ia]=kaddressbook, configure, settings, plugins
X-KDE-Keywords[it]=kaddressbook, configurazione, impostazioni, estensioni
X-KDE-Keywords[ko]=kaddressbook, configure, settings, plugins, 설정, 플러그인, 주소록
X-KDE-Keywords[lt]=kaddressbook, konfigūruoti, nustatymai, priedai
......
......@@ -50,6 +50,7 @@ Comment[et]=KDE aadressiraamat faili importimise režiimis
Comment[fi]=KAddressBook on käynnissä tiedostontuontitilassa
Comment[fr]=KAddressbook fonctionnant en mode import de fichier
Comment[gl]=KAddressBook executándose no modo de importación de ficheiros.
Comment[ia]=KAddressbook executante in modo de importation de file
Comment[it]=KAddressBook in esecuzione in modalità importazione di file
Comment[ko]=파일 가져오기 모드로 KAddressBook 실행 중
Comment[lt]=KAddressBook veikianti failų importavimo veiksenoje
......
......@@ -10,6 +10,7 @@ Name[et]=KDE aadressiraamatu teema
Name[fi]=KAddressBook-teema
Name[fr]=Thème KAddressbook
Name[gl]=Tema de KAddressbook
Name[ia]=Them de KAddressBook
Name[it]=Tema di KAddressBook
Name[ko]=KAddressbook 테마
Name[lt]=KAddressbook apipavidalinimas
......
......@@ -143,6 +143,7 @@ Name[et]=Uus kontakt ...
Name[fi]=Uusi yhteystieto…
Name[fr]=Nouveau contacts
Name[gl]=Novo contacto…
Name[ia]=Nove contacto...
Name[it]=Nuovo contatto...
Name[ko]=새 연락처...
Name[lt]=Naujas adresatas...
......
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