mirror of
https://github.com/KDE/kasts.git
synced 2024-12-22 05:36:17 +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
3a13e0ec9d
commit
75bfdb616d
@ -28,7 +28,7 @@ Comment=Mobile Podcast Application
|
||||
Comment[ca]=Aplicació mòbil per a podcast
|
||||
Comment[ca@valencia]=Aplicació mòbil per a podcast
|
||||
Comment[cs]=Mobilní aplikace pro přehrávání podcastů
|
||||
Comment[de]= Podcast-Anwendung für Mobilgeräte
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user