tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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 2020-03-02 05:46:53 +01:00
parent a39a2d562d
commit 7eee223dfc
5 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/org.kde.kdeconnect.app.desktop
View file

@ -23,6 +23,7 @@ Name[id]=KDE Connect
Name[it]=KDE Connect Name[it]=KDE Connect
Name[ko]=KDE Connect Name[ko]=KDE Connect
Name[lt]=KDE Connect Name[lt]=KDE Connect
Name[ml]=കെ.ഡി.ഇ കണക്റ്റ്
Name[nl]=KDE Connect Name[nl]=KDE Connect
Name[nn]=KDE Connect Name[nn]=KDE Connect
Name[pl]=KDE Connect Name[pl]=KDE Connect

1
daemon/org.kde.kdeconnect.daemon.desktop.cmake
View file

@ -33,6 +33,7 @@ Name[id]=KDE Connect
Name[it]=KDE Connect Name[it]=KDE Connect
Name[ko]=KDE Connect Name[ko]=KDE Connect
Name[lt]=KDE Connect Name[lt]=KDE Connect
Name[ml]=കെ.ഡി.ഇ കണക്റ്റ്
Name[nl]=KDE Connect Name[nl]=KDE Connect
Name[nn]=KDE Connect Name[nn]=KDE Connect
Name[pl]=KDE Connect Name[pl]=KDE Connect

1
kcm/kcm_kdeconnect.desktop
View file

@ -34,6 +34,7 @@ Name[id]=KDE Connect
Name[it]=KDE Connect Name[it]=KDE Connect
Name[ko]=KDE Connect Name[ko]=KDE Connect
Name[lt]=KDE Connect Name[lt]=KDE Connect
Name[ml]=കെ.ഡി.ഇ കണക്റ്റ്
Name[nl]=KDE Connect Name[nl]=KDE Connect
Name[nn]=KDE Connect Name[nn]=KDE Connect
Name[pl]=KDE Connect Name[pl]=KDE Connect

1
plasmoid/package/metadata.desktop
View file

@ -23,6 +23,7 @@ Name[id]=KDE Connect
Name[it]=KDE Connect Name[it]=KDE Connect
Name[ko]=KDE Connect Name[ko]=KDE Connect
Name[lt]=KDE Connect Name[lt]=KDE Connect
Name[ml]=കെ.ഡി.ഇ കണക്റ്റ്
Name[nl]=KDE Connect Name[nl]=KDE Connect
Name[nn]=KDE Connect Name[nn]=KDE Connect
Name[pl]=KDE Connect Name[pl]=KDE Connect

1
plugins/kdeconnect.notifyrc
View file

@ -24,6 +24,7 @@ Name[id]=KDE Connect
Name[it]=KDE Connect Name[it]=KDE Connect
Name[ko]=KDE Connect Name[ko]=KDE Connect
Name[lt]=KDE Connect Name[lt]=KDE Connect
Name[ml]=കെ.ഡി.ഇ കണക്റ്റ്
Name[nl]=KDE Connect Name[nl]=KDE Connect
Name[nn]=KDE Connect Name[nn]=KDE Connect
Name[pl]=KDE Connect Name[pl]=KDE Connect