Commit fff5c048 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 04e60d7e
[Desktop Entry]
Name=Empty Panel
Name[ar]=لوحة فارغة
Name[ast]=Panel baleru
Name[bs]=Prazan panel
Name[ca]=Plafó buit
Name[ca@valencia]=Plafó buit
......
......@@ -60,6 +60,7 @@ Name[zh_TW]=背景服務
Comment=Configure background services
Comment[ast]=Configura los servicios en segundu planu
Comment[ca]=Configura els serveis en segon pla
Comment[cs]=Nastavit služby na pozadí
Comment[de]=Hintergrunddienste einrichten
Comment[es]=Configurar los servicios en segundo plano
Comment[et]=Taustateenuste seadistamine
......
......@@ -48,6 +48,7 @@ Name[zh_TW]=背景服務
Comment=Configure background services
Comment[ast]=Configura los servicios en segundu planu
Comment[ca]=Configura els serveis en segon pla
Comment[cs]=Nastavit služby na pozadí
Comment[de]=Hintergrunddienste einrichten
Comment[es]=Configurar los servicios en segundo plano
Comment[et]=Taustateenuste seadistamine
......
[Desktop Entry]
Name=Application Menu Bar
Name[ast]=Barra del menú d'aplicaciones
Name[ca]=Barra de menús de l'aplicació
Name[ca@valencia]=Barra de menús de l'aplicació
Name[cs]=Pruh s nabídkou aplikace
......
[Desktop Entry]
Name=Empty Panel
Name[ar]=لوحة فارغة
Name[ast]=Panel baleru
Name[bs]=Prazan panel
Name[ca]=Plafó buit
Name[ca@valencia]=Plafó buit
......
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