mirror of
https://github.com/KDE/kasts.git
synced 2024-12-25 16:02:54 +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
319c579ba0
commit
27cabf042d
@ -10,6 +10,7 @@ Name[en_GB]=Kasts
|
||||
Name[es]=Kasts
|
||||
Name[fi]=Kasts
|
||||
Name[fr]=Kasts
|
||||
Name[gl]=Kasts
|
||||
Name[ia]=Kasts
|
||||
Name[it]=Kasts
|
||||
Name[ka]=Kasts
|
||||
@ -35,6 +36,7 @@ Comment[en_GB]=Mobile Podcast Application
|
||||
Comment[es]=Aplicación de pódcast para móviles
|
||||
Comment[fi]=Podcast-mobiilisovellus
|
||||
Comment[fr]=Application mobile pour podcasts
|
||||
Comment[gl]=Aplicación de podcasts para móbiles.
|
||||
Comment[it]=Applicazione mobile per podcast
|
||||
Comment[ka]=მობილური პოდკასტის აპლიკაცია
|
||||
Comment[ko]=모바일 팟캐스트 프로그램
|
||||
@ -59,6 +61,7 @@ GenericName[en_GB]=Podcast Application
|
||||
GenericName[es]=Aplicación de pódcast
|
||||
GenericName[fi]=Podcast-sovellus
|
||||
GenericName[fr]=Application pour podcasts
|
||||
GenericName[gl]=Aplicación de podcasts
|
||||
GenericName[it]=Applicazione podcast
|
||||
GenericName[ka]=პოდკასტის აპლიკაცია
|
||||
GenericName[ko]=팟캐스트 프로그램
|
||||
@ -83,6 +86,7 @@ Keywords[en_GB]=podcast
|
||||
Keywords[es]=pódcast
|
||||
Keywords[fi]=podcast
|
||||
Keywords[fr]=podcast
|
||||
Keywords[gl]=podcast
|
||||
Keywords[ia]=podcast
|
||||
Keywords[it]=podcast
|
||||
Keywords[ka]=პოდკასტი
|
||||
|
Loading…
Reference in New Issue
Block a user