mirror of
https://github.com/KDE/kasts.git
synced 2025-02-01 18:07:10 +01:00
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"
This commit is contained in:
parent
9237854927
commit
6ff67ea19a
@ -43,6 +43,7 @@ Comment[eu]=Mugikorreko podcast aplikazioa
|
||||
Comment[fi]=Podcast-mobiilisovellus
|
||||
Comment[fr]=Application mobile pour podcasts
|
||||
Comment[gl]=Aplicación de podcasts para móbiles.
|
||||
Comment[ia]=Application de Podcast Mobile
|
||||
Comment[it]=Applicazione mobile per podcast
|
||||
Comment[ka]=მობილური პოდკასტის აპლიკაცია
|
||||
Comment[ko]=모바일 팟캐스트 앱
|
||||
@ -71,6 +72,7 @@ GenericName[eu]=Podcast aplikazioa
|
||||
GenericName[fi]=Podcast-sovellus
|
||||
GenericName[fr]=Application pour podcasts
|
||||
GenericName[gl]=Aplicación de podcasts
|
||||
GenericName[ia]=Application de Podcast
|
||||
GenericName[it]=Applicazione podcast
|
||||
GenericName[ka]=პოდკასტის აპლიკაცია
|
||||
GenericName[ko]=팟캐스트 앱
|
||||
|
Loading…
x
Reference in New Issue
Block a user