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
e62e124713
commit
66ff1337be
@ -6,6 +6,7 @@ Name[cs]=Kasts
|
|||||||
Name[de]=Kasts
|
Name[de]=Kasts
|
||||||
Name[es]=Kasts
|
Name[es]=Kasts
|
||||||
Name[fr]=Kasts
|
Name[fr]=Kasts
|
||||||
|
Name[ko]=Kasts
|
||||||
Name[nl]=Kasts
|
Name[nl]=Kasts
|
||||||
Name[pl]=Kasts
|
Name[pl]=Kasts
|
||||||
Name[pt]=Kasts
|
Name[pt]=Kasts
|
||||||
@ -20,6 +21,7 @@ Comment[ca@valencia]=Aplicació mòbil per a podcast
|
|||||||
Comment[de]= Podcast-Anwendung für Mobilgeräte
|
Comment[de]= Podcast-Anwendung für Mobilgeräte
|
||||||
Comment[es]=Aplicación de pódcast para móviles
|
Comment[es]=Aplicación de pódcast para móviles
|
||||||
Comment[fr]=Application mobile pour podcasts
|
Comment[fr]=Application mobile pour podcasts
|
||||||
|
Comment[ko]=모바일 팟캐스트 프로그램
|
||||||
Comment[nl]=Podcastprogramma voor mobiel
|
Comment[nl]=Podcastprogramma voor mobiel
|
||||||
Comment[pl]=Przenośna aplikacja do podkastów
|
Comment[pl]=Przenośna aplikacja do podkastów
|
||||||
Comment[pt]=Aplicação Móvel de 'Podcasts'
|
Comment[pt]=Aplicação Móvel de 'Podcasts'
|
||||||
@ -34,6 +36,7 @@ GenericName[ca@valencia]=Aplicació de podcast
|
|||||||
GenericName[de]=Podcast-Anwendung
|
GenericName[de]=Podcast-Anwendung
|
||||||
GenericName[es]=Aplicación de pódcast
|
GenericName[es]=Aplicación de pódcast
|
||||||
GenericName[fr]=Application pour podcasts
|
GenericName[fr]=Application pour podcasts
|
||||||
|
GenericName[ko]=팟캐스트 프로그램
|
||||||
GenericName[nl]=Podcastprogramma
|
GenericName[nl]=Podcastprogramma
|
||||||
GenericName[pl]=Aplikacja do podkastów
|
GenericName[pl]=Aplikacja do podkastów
|
||||||
GenericName[pt]=Aplicação de 'Podcasts'
|
GenericName[pt]=Aplicação de 'Podcasts'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user