mirror of
https://github.com/KDE/kasts.git
synced 2025-01-03 12:10:20 +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
d3a6417938
commit
26a5095792
@ -17,6 +17,7 @@ Name[fi]=Kasts
|
|||||||
Name[fr]=Kasts
|
Name[fr]=Kasts
|
||||||
Name[gl]=Kasts
|
Name[gl]=Kasts
|
||||||
Name[he]=Kasts
|
Name[he]=Kasts
|
||||||
|
Name[hi]=डिब्बा
|
||||||
Name[ia]=Kasts
|
Name[ia]=Kasts
|
||||||
Name[it]=Kasts
|
Name[it]=Kasts
|
||||||
Name[ka]=Kasts
|
Name[ka]=Kasts
|
||||||
@ -51,6 +52,7 @@ 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[he]=יישומון הסכתים לניידים
|
||||||
|
Comment[hi]=मोबाइल पॉडकास्ट एप्लीकेशन
|
||||||
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]=მობილური პოდკასტის აპლიკაცია
|
||||||
@ -85,6 +87,7 @@ 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[he]=יישום הסכתים
|
||||||
|
GenericName[hi]=पॉडकास्ट एप्लीकेशन
|
||||||
GenericName[ia]=Application de Podcast
|
GenericName[ia]=Application de Podcast
|
||||||
GenericName[it]=Applicazione podcast
|
GenericName[it]=Applicazione podcast
|
||||||
GenericName[ka]=პოდკასტის აპლიკაცია
|
GenericName[ka]=პოდკასტის აპლიკაცია
|
||||||
@ -119,6 +122,7 @@ Keywords[fi]=podcast
|
|||||||
Keywords[fr]=podcast
|
Keywords[fr]=podcast
|
||||||
Keywords[gl]=podcast
|
Keywords[gl]=podcast
|
||||||
Keywords[he]=הסכת;פודקאסט
|
Keywords[he]=הסכת;פודקאסט
|
||||||
|
Keywords[hi]=पॉडकास्ट
|
||||||
Keywords[ia]=podcast
|
Keywords[ia]=podcast
|
||||||
Keywords[it]=podcast
|
Keywords[it]=podcast
|
||||||
Keywords[ka]=პოდკასტი
|
Keywords[ka]=პოდკასტი
|
||||||
|
Loading…
Reference in New Issue
Block a user