mirror of
https://github.com/KDE/kasts.git
synced 2024-12-25 16:02:54 +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
ae62c5bdfe
commit
3977aa7e41
@ -2,6 +2,7 @@
|
||||
Name=Alligator
|
||||
Name[ca]=Alligator
|
||||
Name[et]=Alligator
|
||||
Name[ko]=Alligator
|
||||
Name[nl]=Alligator
|
||||
Name[pt]=Alligator
|
||||
Name[uk]=Alligator
|
||||
@ -9,6 +10,7 @@ Name[x-test]=xxAlligatorxx
|
||||
Comment=Mobile Feed Reader
|
||||
Comment[ca]=Lector de fonts per a mòbil
|
||||
Comment[et]=Mobiili uudistelugeja
|
||||
Comment[ko]=모바일 피드 리더
|
||||
Comment[nl]=Mobiele feedlezer
|
||||
Comment[pt]=Leitor Móvel de Fontes
|
||||
Comment[uk]=Програма для читання подач на мобільному
|
||||
@ -16,6 +18,7 @@ Comment[x-test]=xxMobile Feed Readerxx
|
||||
GenericName=Feed Reader
|
||||
GenericName[ca]=Lector de fonts
|
||||
GenericName[et]=Uudistelugeja
|
||||
GenericName[ko]=피드 리더
|
||||
GenericName[nl]=Feedlezer
|
||||
GenericName[pt]=Leitor de Fontes
|
||||
GenericName[uk]=Читання подач
|
||||
|
Loading…
Reference in New Issue
Block a user