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"
This commit is contained in:
l10n daemon script 2015-06-07 04:13:54 +00:00
parent 55c21cf142
commit fd7a7bd947
3 changed files with 5 additions and 0 deletions

View File

@ -2,6 +2,7 @@
Encoding=UTF-8
Name=KDE Partition Manager Dummy Backend
Name[nl]=Dummy backend van KDE-partitiebeheerder
Name[pl]=Fikcyjny silnik zarządzania partycjami
Name[pt]=Infra-Estrutura de Testes do Gestor de Partições do KDE
Name[pt_BR]=Infraestrutura de testes do gerenciador de partições do KDE
Name[sv]=KDE:s partitionshanterare testbakgrundsprogram
@ -9,6 +10,7 @@ Name[uk]=Тестовий додаток сервера Керування ро
Name[x-test]=xxKDE Partition Manager Dummy Backendxx
Comment=A KDE Partition Manager dummy backend for testing purposes.
Comment[nl]=Dummy backend van KDE-partitiebeheerder voor testdoeleinden
Comment[pl]=Fikcyjny silnik zarządzania partycjami do prób.
Comment[pt]=Uma infra-estrutura de exemplo do Gestor de Partições do KDE para fins de testes.
Comment[pt_BR]=Uma infraestrutura de testes do gerenciador de partições do KDE.
Comment[sv]=Ett bakgrundsprogram för KDE:s partitionshanterare i testsyfte.

View File

@ -2,6 +2,7 @@
Encoding=UTF-8
Name=KDE Partition Manager LibParted Backend
Name[nl]=KDE-partitiebeheerder LibParted-backend
Name[pl]=Silnik LibParted zarządzania partycjami
Name[pt]=Infra-Estrutura da LibParted do Gestor de Partições do KDE
Name[pt_BR]=Infraestrutura LibParted do gerenciador de partições do KDE
Name[sv]=KDE:s partitionshanterare LibParted bakgrundsprogram
@ -9,6 +10,7 @@ Name[uk]=Сервер LibParted Керування розділами KDE
Name[x-test]=xxKDE Partition Manager LibParted Backendxx
Comment=The LibParted backend for KDE Partition Manager
Comment[nl]=De LibParted-backend voor de KDE-partitiebeheerder
Comment[pl]=Silnik LibParted dla zarządzania partycjami
Comment[pt]=A infra-estrutura com a LibParted para o Gestor de Partições do KDE
Comment[pt_BR]=Uma infraestrutura LibParted para o gerenciador de partições do KDE
Comment[sv]=LibParted bakgrundsprogram för KDE:s partitionshanterare

View File

@ -3,6 +3,7 @@ Type=ServiceType
X-KDE-ServiceType=PartitionManager/Plugin
Name=KDE Partition Manager Plugin
Name[nl]=Plugin voor KDE-partitiebeheerder
Name[pl]=Wtyczka zarządzania partycjami
Name[pt]='Plugin' do Gestor de Partições do KDE
Name[pt_BR]=Plugin do gerenciador de partições do KDE
Name[sv]=KDE:s partitionshanterare insticksprogram