Commit b98b86af authored by Script Kiddy's avatar Script Kiddy
Browse files

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 c023fc0b
......@@ -11,6 +11,18 @@ X-KDE-ParentApp=kcontrol
X-KDE-System-Settings-Parent-Category=personalization
Name=User Feedback
Name[ca]=Comentaris de l'usuari
Name[nl]=Terugkoppeling van gebruiker
Name[pt]=Reacções do Utilizador
Name[pt_BR]=Comentários dos usuários
Name[uk]=Відгуки користувача
Name[x-test]=xxUser Feedbackxx
Comment=Configure user feedback settings
Comment[ca]=Configura els ajustaments dels comentaris de l'usuari
Comment[nl]=Instellingen voor terugkoppeling van gebruikers configureren
Comment[pt]=Configurar as opções das reacções do utilizador
Comment[pt_BR]=Configure as definições dos comentários dos usuários
Comment[uk]=Налаштовування системи відгуків користувача
Comment[x-test]=xxConfigure user feedback settingsxx
Categories=Qt;KDE;
[Desktop Entry]
Name=Feedback
Name[ca]=Comentaris
Name[nl]=Terugkoppeling
Name[pt]=Reacções
Name[pt_BR]=Comentários
Name[uk]=Відгуки
Name[x-test]=xxFeedbackxx
Icon=preferences-desktop-locale
Type=Service
......
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