mirror of
https://github.com/KDE/kasts.git
synced 2025-01-11 16:13:56 +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
7a45486df5
commit
ae62f70871
@ -18,7 +18,7 @@ Name[sv]=Alligator
|
||||
Name[uk]=Alligator
|
||||
Name[x-test]=xxAlligatorxx
|
||||
Comment=Mobile Feed Reader
|
||||
Comment[ca]=Lector de fonts per a mòbil
|
||||
Comment[ca]=Lector de fonts per al mòbil
|
||||
Comment[ca@valencia]=Lector de fonts per a mòbil
|
||||
Comment[cs]=Mobilní čtečka kanálů
|
||||
Comment[et]=Mobiili uudistelugeja
|
||||
|
Loading…
Reference in New Issue
Block a user