Commit 74159e13 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 b84c1cad
......@@ -42,6 +42,7 @@ Name[zh_TW]=語言
Comment=Change workspace and application languages
Comment[ca]=Canvi dels idiomes de l'espai de treball i les aplicacions
Comment[cs]=Změnit pracovní prostředí a jazyk aplikace
Comment[da]=Skift sprog for skrivebordet og programmer
Comment[de]=Sprache für den Arbeitsbereich und die Anwendungen ändern
Comment[en_GB]=Change workspace and application languages
Comment[es]=Cambiar los idiomas del espacio de trabajo y de las aplicaciones
......
......@@ -59,6 +59,7 @@ Name=Run command on clipboard contents
Name[ca]=Executa una ordre al contingut del porta-retalls
Name[ca@valencia]=Executa una ordre en el contingut del porta-retalls
Name[cs]=Spustit příkaz nad obsahem schránky
Name[da]=Kør kommando på udklipsholderindholdet
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
......
......@@ -4,6 +4,7 @@ DesktopNames=KDE
Name=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[ca]=Plasma (Desenvolupament ${CMAKE_INSTALL_FULL_BINDIR})
Name[ca@valencia]=Plasma (Desenvolupament ${CMAKE_INSTALL_FULL_BINDIR})
Name[da]=Plasma (Development ${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})
......
......@@ -5,6 +5,7 @@ DesktopNames=KDE
Name=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[ca]=Plasma (Desenvolupament ${CMAKE_INSTALL_FULL_BINDIR})
Name[ca@valencia]=Plasma (Desenvolupament ${CMAKE_INSTALL_FULL_BINDIR})
Name[da]=Plasma (Development ${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})
......
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