Castopod/kasts
1
0
Fork 0
mirror of https://github.com/KDE/kasts.git synced 2024-12-27 08:52:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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:
l10n daemon script 2020-04-26 06:16:07 +02:00
parent 7e3da33c38
commit cfb18072fc
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.kde.mobile.alligator.desktop
View File

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