andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

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-12 10:26:58 +00:00
parent c37059f062
commit ce3faee105
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/dummy/pmdummybackendplugin.desktop
View File

@ -71,7 +71,7 @@ Comment[nds]=En Platzholler-Hülpprogramm för KDE-Partitschonenpleger, testwies
Comment[nl]=Dummy backend van KDE-partitiebeheerder voor testdoeleinden
Comment[pa]=ਟੈਸਟ ਕਰਨ ਲਈ KDE ਪਾਰਟੀਸ਼ਨ ਮੈਨੇਜਰ ਫ਼ਰਜ਼ੀ ਬੈਕਐਂਡ
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]=Uma infra-estrutura de testes do Gestor de Partições do KDE.
Comment[pt_BR]=Uma infraestrutura de testes do gerenciador de partições do KDE.
Comment[ro]=Machetă de platformă pentru Gestionarul de partiții KDE, destinată testelor.
Comment[ru]=Проверочный механизм для диспетчера разделов для KDE.

4
src/plugins/libparted/pmlibpartedbackendplugin.desktop
View File

@ -27,7 +27,7 @@ Name[nds]=LibParted-Hülpprogramm för KDE-Partitschonenpleger
Name[nl]=KDE-partitiebeheerder LibParted-backend
Name[pa]=ਕੇਡੀਈ ਪਾਰਟੀਸ਼ਨ ਮੈਨੇਜਰ LibParted ਬੈਕਐਂਡ
Name[pl]=Silnik LibParted zarządzania partycjami
Name[pt]=Infra-Estrutura da LibParted do Gestor de Partições do KDE
Name[pt]=Infra-Estrutura da LibParted para o Gestor de Partições do KDE
Name[pt_BR]=Infraestrutura LibParted do gerenciador de partições do KDE
Name[ro]=Platformă LibParted pentru Gestionarul de partiții KDE
Name[ru]=Механизм LibParted
@ -71,7 +71,7 @@ Comment[nds]=Dat LibParted-Hülpprogramm för KDE-Partitschonenpleger
Comment[nl]=De LibParted-backend voor de KDE-partitiebeheerder
Comment[pa]=ਕੇਡੀਈ ਪਾਰਟੀਸ਼ਨ ਮੈਨੇਜਰ ਲਈ LibParted ਬੈਕਐਂਡ
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]=A infra-estrutura da LibParted para o Gestor de Partições do KDE
Comment[pt_BR]=Uma infraestrutura LibParted para o gerenciador de partições do KDE
Comment[ro]=Platforma LibParted pentru Gestionarul de partiții KDE
Comment[ru]=Механизм LibParted для диспетчера разделов для KDE