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
1ae4f66952
commit
4efca614f6
@ -8,6 +8,7 @@ Name[cs]=Kasts
|
||||
Name[de]=Kasts
|
||||
Name[en_GB]=Kasts
|
||||
Name[es]=Kasts
|
||||
Name[fi]=Kasts
|
||||
Name[fr]=Kasts
|
||||
Name[ko]=Kasts
|
||||
Name[nl]=Kasts
|
||||
@ -26,6 +27,7 @@ Comment[ca@valencia]=Aplicació mòbil per a podcast
|
||||
Comment[de]= Podcast-Anwendung für Mobilgeräte
|
||||
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[ko]=모바일 팟캐스트 프로그램
|
||||
Comment[nl]=Podcastprogramma voor mobiel
|
||||
@ -44,6 +46,7 @@ GenericName[ca@valencia]=Aplicació de podcast
|
||||
GenericName[de]=Podcast-Anwendung
|
||||
GenericName[en_GB]=Podcast Application
|
||||
GenericName[es]=Aplicación de pódcast
|
||||
GenericName[fi]=Podcast-sovellus
|
||||
GenericName[fr]=Application pour podcasts
|
||||
GenericName[ko]=팟캐스트 프로그램
|
||||
GenericName[nl]=Podcastprogramma
|
||||
|
Loading…
x
Reference in New Issue
Block a user