alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 2018-04-22 05:39:03 +02:00
parent 5791bee19f
commit cf462de7b1
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/plasma/data/servicetypes/plasma-lookandfeel.desktop
View File

@ -57,7 +57,7 @@ Comment[eu]=Plasma oskolentzako ikus-hizkuntza definitzen du
Comment[fi]=Määrittää Plasma-kuorien visuaalisen kielen Comment[fi]=Määrittää Plasma-kuorien visuaalisen kielen
Comment[fr]=Définit le langage visuel pour les terminaux de Plasma Comment[fr]=Définit le langage visuel pour les terminaux de Plasma
Comment[gd]=Mìnichidh seo cànan lèirsinneach nam Plasma shells Comment[gd]=Mìnichidh seo cànan lèirsinneach nam Plasma shells
Comment[gl]=Define a linguaxe visual das shells de Plasma Comment[gl]=Define a linguaxe visual dos intérpretes de ordes de Plasma.
Comment[hu]=A Plasma felület vizuális nyelvének leírása Comment[hu]=A Plasma felület vizuális nyelvének leírása
Comment[ia]=Ildefine le linguage visual per Shells de Plasma Comment[ia]=Ildefine le linguage visual per Shells de Plasma
Comment[id]=Tentukan Visual Language untuk Plasma Shells Comment[id]=Tentukan Visual Language untuk Plasma Shells

4
src/plasma/data/servicetypes/plasma-shell.desktop
View File

@ -17,7 +17,7 @@ Name[eu]=Plasmaren oskola
Name[fi]=Plasma-kuori Name[fi]=Plasma-kuori
Name[fr]=Terminal de Plasma Name[fr]=Terminal de Plasma
Name[gd]=Plasma Shell Name[gd]=Plasma Shell
Name[gl]=Shell de Plasma Name[gl]=Intérprete de ordes de Plasma
Name[hu]=Plasma felület Name[hu]=Plasma felület
Name[ia]=Plasma Shell (Shell de Plasma) Name[ia]=Plasma Shell (Shell de Plasma)
Name[id]=Shell Plasma Name[id]=Shell Plasma
@ -60,7 +60,7 @@ Comment[eu]=Plasma oskolaren osagaiak
Comment[fi]=Plasma-kuoren komponentit Comment[fi]=Plasma-kuoren komponentit
Comment[fr]=Composant des terminaux de Plasma Comment[fr]=Composant des terminaux de Plasma
Comment[gd]=Cò-phàirtean Plasma Shell Comment[gd]=Cò-phàirtean Plasma Shell
Comment[gl]=Compoñentes da shell de Plasma Comment[gl]=Compoñentes do intérprete de ordes de Plasma
Comment[hu]=Plasma felület elemei Comment[hu]=Plasma felület elemei
Comment[ia]=Componentes de Plasma Shell Comment[ia]=Componentes de Plasma Shell
Comment[id]=Komponen Shell Plasma Comment[id]=Komponen Shell Plasma