Commit 13a52fcc 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 03eae9c3
......@@ -13,6 +13,7 @@ Name=User Feedback
Name[ca]=Comentaris de l'usuari
Name[ca@valencia]=Comentaris de l'usuari
Name[cs]=Zpětná vazba uživatele
Name[de]=Benutzer-Feedback
Name[en_GB]=User Feedback
Name[es]=Comentarios del usuario
Name[et]=Kasutaja tagasiside
......@@ -27,6 +28,7 @@ Name[x-test]=xxUser Feedbackxx
X-KDE-Keywords=akregator, configure, settings, userfeedback
X-KDE-Keywords[ca]=akregator, configura, arranjament, comentaris de l'usuari
X-KDE-Keywords[ca@valencia]=akregator, configura, arranjament, comentaris de l'usuari
X-KDE-Keywords[de]=Akregator,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen,Benutzer-Feedback
X-KDE-Keywords[en_GB]=akregator, configure, settings, userfeedback
X-KDE-Keywords[es]=akregator, configurar, preferencias, comentarios del usuario
X-KDE-Keywords[et]=akregator, seadistamine, seadistused, kasutaja tagasiside
......
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