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
4340e83b20
commit
508f353104
@ -4,22 +4,25 @@ Name[ca]=Kasts
|
|||||||
Name[de]=Kasts
|
Name[de]=Kasts
|
||||||
Name[es]=Kasts
|
Name[es]=Kasts
|
||||||
Name[nl]=Kasts
|
Name[nl]=Kasts
|
||||||
|
Name[pt]=Kasts
|
||||||
Name[sv]=Kasts
|
Name[sv]=Kasts
|
||||||
Name[uk]=Kasts
|
Name[uk]=Kasts
|
||||||
Name[x-test]=xxKastsxx
|
Name[x-test]=xxKastsxx
|
||||||
Comment=Mobile Podcast Application
|
Comment=Mobile Podcast Application
|
||||||
Comment[ca]=Aplicació mòbil per a podcast
|
Comment[ca]=Aplicació mòbil per a podcast
|
||||||
Comment[de]= Podcast-App für Mobilgeräte
|
Comment[de]= Podcast-Anwendung für Mobilgeräte
|
||||||
Comment[es]=Aplicación de podcast para móviles
|
Comment[es]=Aplicación de pódcast para móviles
|
||||||
Comment[nl]=Podcastprogramma voor mobiel
|
Comment[nl]=Podcastprogramma voor mobiel
|
||||||
|
Comment[pt]=Aplicação Móvel de 'Podcasts'
|
||||||
Comment[sv]=Mobilt poddradioprogram
|
Comment[sv]=Mobilt poddradioprogram
|
||||||
Comment[uk]=Мобільна програма для подкастів
|
Comment[uk]=Мобільна програма для подкастів
|
||||||
Comment[x-test]=xxMobile Podcast Applicationxx
|
Comment[x-test]=xxMobile Podcast Applicationxx
|
||||||
GenericName=Podcast Application
|
GenericName=Podcast Application
|
||||||
GenericName[ca]=Aplicació de podcast
|
GenericName[ca]=Aplicació de podcast
|
||||||
GenericName[de]=Podcast-App
|
GenericName[de]=Podcast-Anwendung
|
||||||
GenericName[es]=Aplicación de podcast
|
GenericName[es]=Aplicación de pódcast
|
||||||
GenericName[nl]=Podcastprogramma
|
GenericName[nl]=Podcastprogramma
|
||||||
|
GenericName[pt]=Aplicação de 'Podcasts'
|
||||||
GenericName[sv]=Poddradioprogram
|
GenericName[sv]=Poddradioprogram
|
||||||
GenericName[uk]=Програма для подкастів
|
GenericName[uk]=Програма для подкастів
|
||||||
GenericName[x-test]=xxPodcast Applicationxx
|
GenericName[x-test]=xxPodcast Applicationxx
|
||||||
|
Loading…
x
Reference in New Issue
Block a user