Commit 5d8865a8 authored by Script Kiddy's avatar Script Kiddy

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"
parent 5ea5a6f0
Pipeline #24270 skipped
......@@ -16,6 +16,7 @@ Name[sk]=Alligator
Name[sl]=Alligator
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@valencia]=Lector de fonts per a mòbil
......@@ -31,6 +32,7 @@ Comment[ru]=Чтение лент новостей для мобильных у
Comment[sl]=Mobilni bralnik novic
Comment[sv]=Mobil kanalläsare
Comment[uk]=Програма для читання подач на мобільному
Comment[x-test]=xxMobile Feed Readerxx
GenericName=Feed Reader
GenericName[ca]=Lector de fonts
GenericName[ca@valencia]=Lector de fonts
......@@ -47,6 +49,7 @@ GenericName[sk]=Čítačka RSS kanálov
GenericName[sl]=Bralnik novic
GenericName[sv]=Kanalläsare
GenericName[uk]=Читання подач
GenericName[x-test]=xxFeed Readerxx
Encoding=UTF-8
Icon=alligator
Exec=alligator
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment