Commit 8fd4d574 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 e919775b
......@@ -22,7 +22,6 @@ Name[ru]=RKWard
Name[sk]=RKWard
Name[sv]=RKWard
Name[uk]=RKWard
Name[x-test]=xxRKWardxx
Name[zh_CN]=RKWard
GenericName=GUI for R
GenericName[ca]=IGU pel R
......@@ -43,7 +42,6 @@ GenericName[pt_BR]=Interface gráfica para R
GenericName[sk]=GUI pre R
GenericName[sv]=Grafiskt användargränssnitt för R
GenericName[uk]=Графічний інтерфейс до R
GenericName[x-test]=xxGUI for Rxx
Comment=GUI for the R-project
Comment[bs]=GUI za R-projekct
Comment[ca]=IGU pel projecte R
......@@ -65,7 +63,6 @@ Comment[pt_BR]=Interface gráfica para o R-project
Comment[sk]=GUI pre R-project
Comment[sv]=Grafiskt användargränssnitt för R-projektet
Comment[uk]=Графічний інтерфейс проєкту R
Comment[x-test]=xxGUI for the R-projectxx
Icon=rkward
X-DBUS-ServiceName=org.kde.rkward
Exec=rkward --autoreuse %F
......@@ -91,5 +88,4 @@ Keywords[pt]=estatísticas;dados;r;
Keywords[pt_BR]=estatística;dados;r;
Keywords[sv]=statistik;data;r;
Keywords[uk]=statistics;data;r;статистика;дані;р;
Keywords[x-test]=xxstatisticsxx;xxdataxx;xxrxx;
Keywords[zh_CN]=statistics;data;r;统计;数据
......@@ -20,7 +20,6 @@ Description[pt_BR]=Protocolo para as ligações 'executar novamente' do RKWard
Description[sk]=Protokol pre bez proti odkazom RKWard
Description[sv]=Ett protokoll för körning av RKWard mot länkar
Description[uk]=Протокол для запуску RKWard для обробки посилань
Description[x-test]=xxA protocol for RKWard's run again linksxx
input=none
output=none
copyToFile=false
......
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