Commit 50421cd1 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 0c4ec1c4
......@@ -30,6 +30,7 @@ Comment=XML Data from the British Broadcasting Corporation
Comment[ca]=Dades XML de la British Broadcasting Corporation
Comment[ca@valencia]=Dades XML de la British Broadcasting Corporation
Comment[da]=XML-data fra British Broadcasting Corporation
Comment[de]=XML-Daten von der BBC
Comment[en_GB]=XML Data from the British Broadcasting Corporation
Comment[es]=Datos XML de la British Broadcasting Corporation
Comment[eu]=British Broadcasting Corporation-en XML datuak
......
......@@ -58,6 +58,7 @@ Exec=krunner -c
Name=Run command on clipboard contents
Name[ca]=Executa una ordre al contingut del porta-retalls
Name[ca@valencia]=Executa una ordre al contingut del porta-retalls
Name[de]=Befehl mit dem Inhalt der Zwischenablage ausführen
Name[en_GB]=Run command on clipboard contents
Name[es]=Ejecutar orden sobre el contenido del portapapeles
Name[eu]=Exekutatu komandoa arbelaren edukiaren gain
......
......@@ -3,6 +3,7 @@ Exec=dbus-run-session @CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma-dev.sh -waylan
DesktopNames=KDE
Name=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[ca]=Plasma (Desenvolupament ${CMAKE_INSTALL_FULL_BINDIR})
Name[de]=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[en_GB]=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[es]=Plasma (Desarrollo ${CMAKE_INSTALL_FULL_BINDIR})
Name[eu]=Plasma (Garapena ${CMAKE_INSTALL_FULL_BINDIR})
......
......@@ -4,6 +4,7 @@ Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma-dev.sh -x11
DesktopNames=KDE
Name=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[ca]=Plasma (Desenvolupament ${CMAKE_INSTALL_FULL_BINDIR})
Name[de]=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[en_GB]=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[es]=Plasma (Desarrollo ${CMAKE_INSTALL_FULL_BINDIR})
Name[eu]=Plasma (Garapena ${CMAKE_INSTALL_FULL_BINDIR})
......
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