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
7e3da33c38
commit
cfb18072fc
@ -5,6 +5,7 @@ Name[et]=Alligator
|
||||
Name[ko]=Alligator
|
||||
Name[nl]=Alligator
|
||||
Name[pt]=Alligator
|
||||
Name[sv]=Alligator
|
||||
Name[uk]=Alligator
|
||||
Name[x-test]=xxAlligatorxx
|
||||
Comment=Mobile Feed Reader
|
||||
@ -13,6 +14,7 @@ Comment[et]=Mobiili uudistelugeja
|
||||
Comment[ko]=모바일 피드 리더
|
||||
Comment[nl]=Mobiele feedlezer
|
||||
Comment[pt]=Leitor Móvel de Fontes
|
||||
Comment[sv]=Mobil kanalläsare
|
||||
Comment[uk]=Програма для читання подач на мобільному
|
||||
Comment[x-test]=xxMobile Feed Readerxx
|
||||
GenericName=Feed Reader
|
||||
@ -21,6 +23,7 @@ GenericName[et]=Uudistelugeja
|
||||
GenericName[ko]=피드 리더
|
||||
GenericName[nl]=Feedlezer
|
||||
GenericName[pt]=Leitor de Fontes
|
||||
GenericName[sv]=Kanalläsare
|
||||
GenericName[uk]=Читання подач
|
||||
GenericName[x-test]=xxFeed Readerxx
|
||||
Encoding=UTF-8
|
||||
|
Loading…
Reference in New Issue
Block a user