mirror of https://github.com/KDE/kasts.git
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
329ab5e448
commit
4a6c67f315
|
@ -15,6 +15,7 @@ Name[eu]=Kasts
|
||||||
Name[fi]=Kasts
|
Name[fi]=Kasts
|
||||||
Name[fr]=Kasts
|
Name[fr]=Kasts
|
||||||
Name[gl]=Kasts
|
Name[gl]=Kasts
|
||||||
|
Name[he]=Kasts
|
||||||
Name[ia]=Kasts
|
Name[ia]=Kasts
|
||||||
Name[it]=Kasts
|
Name[it]=Kasts
|
||||||
Name[ka]=Kasts
|
Name[ka]=Kasts
|
||||||
|
@ -46,6 +47,7 @@ Comment[eu]=Mugikorreko podcast aplikazioa
|
||||||
Comment[fi]=Podcast-mobiilisovellus
|
Comment[fi]=Podcast-mobiilisovellus
|
||||||
Comment[fr]=Application mobile pour podcasts
|
Comment[fr]=Application mobile pour podcasts
|
||||||
Comment[gl]=Aplicación de podcasts para móbiles.
|
Comment[gl]=Aplicación de podcasts para móbiles.
|
||||||
|
Comment[he]=יישומון הסכתים לניידים
|
||||||
Comment[ia]=Application de Podcast Mobile
|
Comment[ia]=Application de Podcast Mobile
|
||||||
Comment[it]=Applicazione mobile per podcast
|
Comment[it]=Applicazione mobile per podcast
|
||||||
Comment[ka]=მობილური პოდკასტის აპლიკაცია
|
Comment[ka]=მობილური პოდკასტის აპლიკაცია
|
||||||
|
@ -77,6 +79,7 @@ GenericName[eu]=Podcast aplikazioa
|
||||||
GenericName[fi]=Podcast-sovellus
|
GenericName[fi]=Podcast-sovellus
|
||||||
GenericName[fr]=Application pour podcasts
|
GenericName[fr]=Application pour podcasts
|
||||||
GenericName[gl]=Aplicación de podcasts
|
GenericName[gl]=Aplicación de podcasts
|
||||||
|
GenericName[he]=יישום הסכתים
|
||||||
GenericName[ia]=Application de Podcast
|
GenericName[ia]=Application de Podcast
|
||||||
GenericName[it]=Applicazione podcast
|
GenericName[it]=Applicazione podcast
|
||||||
GenericName[ka]=პოდკასტის აპლიკაცია
|
GenericName[ka]=პოდკასტის აპლიკაცია
|
||||||
|
@ -108,6 +111,7 @@ Keywords[eu]=podcast
|
||||||
Keywords[fi]=podcast
|
Keywords[fi]=podcast
|
||||||
Keywords[fr]=podcast
|
Keywords[fr]=podcast
|
||||||
Keywords[gl]=podcast
|
Keywords[gl]=podcast
|
||||||
|
Keywords[he]=הסכת;פודקאסט
|
||||||
Keywords[ia]=podcast
|
Keywords[ia]=podcast
|
||||||
Keywords[it]=podcast
|
Keywords[it]=podcast
|
||||||
Keywords[ka]=პოდკასტი
|
Keywords[ka]=პოდკასტი
|
||||||
|
|
Loading…
Reference in New Issue