Commit dc0e7185 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 f67d61b3
......@@ -63,6 +63,7 @@ Name[id]=Jalankan perintah pada konten-konten papan-klip
Name[it]=Esegui comando sui contenuti degli appunti
Name[ko]=클립보드 내용에서 명령 실행하기
Name[nl]=Commando uitvoeren op klembordinhoud
Name[nn]=Køyr kommando på innhaldet på utklippstavla
Name[pl]=Wykonaj polecenie na zawartości schowka
Name[pt]=Executar o comando no conteúdo da área de transferência
Name[pt_BR]=Executar comando no conteúdo da área de transferência
......
......@@ -4,7 +4,10 @@ DesktopNames=KDE
Name=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[ca]=Plasma (Desenvolupament ${CMAKE_INSTALL_FULL_BINDIR})
Name[es]=Plasma (Desarrollo ${CMAKE_INSTALL_FULL_BINDIR})
Name[eu]=Plasma (Garapena ${CMAKE_INSTALL_FULL_BINDIR})
Name[it]=Plasma (Sviluppo ${CMAKE_INSTALL_FULL_BINDIR})
Name[nl]=Plasma (Ontwikkeling ${CMAKE_INSTALL_FULL_BINDIR})
Name[nn]=Plasma (utvikling ${CMAKE_INSTALL_FULL_BINDIR})
Name[pt]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR})
Name[pt_BR]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR})
Name[sv]=Plasma (utveckling ${CMAKE_INSTALL_FULL_BINDIR})
......
......@@ -5,7 +5,10 @@ DesktopNames=KDE
Name=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[ca]=Plasma (Desenvolupament ${CMAKE_INSTALL_FULL_BINDIR})
Name[es]=Plasma (Desarrollo ${CMAKE_INSTALL_FULL_BINDIR})
Name[eu]=Plasma (Garapena ${CMAKE_INSTALL_FULL_BINDIR})
Name[it]=Plasma (Sviluppo ${CMAKE_INSTALL_FULL_BINDIR})
Name[nl]=Plasma (Ontwikkeling ${CMAKE_INSTALL_FULL_BINDIR})
Name[nn]=Plasma (utvikling ${CMAKE_INSTALL_FULL_BINDIR})
Name[pt]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR})
Name[pt_BR]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR})
Name[sv]=Plasma (utveckling ${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