mirror of https://github.com/KDE/kasts.git
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
da921e4ad4
commit
9c506c5338
|
@ -5,6 +5,7 @@ Name[et]=Alligator
|
||||||
Name[ko]=Alligator
|
Name[ko]=Alligator
|
||||||
Name[nl]=Alligator
|
Name[nl]=Alligator
|
||||||
Name[pt]=Alligator
|
Name[pt]=Alligator
|
||||||
|
Name[sk]=Alligator
|
||||||
Name[sv]=Alligator
|
Name[sv]=Alligator
|
||||||
Name[uk]=Alligator
|
Name[uk]=Alligator
|
||||||
Name[x-test]=xxAlligatorxx
|
Name[x-test]=xxAlligatorxx
|
||||||
|
@ -23,6 +24,7 @@ GenericName[et]=Uudistelugeja
|
||||||
GenericName[ko]=피드 리더
|
GenericName[ko]=피드 리더
|
||||||
GenericName[nl]=Feedlezer
|
GenericName[nl]=Feedlezer
|
||||||
GenericName[pt]=Leitor de Fontes
|
GenericName[pt]=Leitor de Fontes
|
||||||
|
GenericName[sk]=Čítačka RSS kanálov
|
||||||
GenericName[sv]=Kanalläsare
|
GenericName[sv]=Kanalläsare
|
||||||
GenericName[uk]=Читання подач
|
GenericName[uk]=Читання подач
|
||||||
GenericName[x-test]=xxFeed Readerxx
|
GenericName[x-test]=xxFeed Readerxx
|
||||||
|
|
Loading…
Reference in New Issue