kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-24 18:50:38 +03:00
Code Issues 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 2019-03-28 05:47:29 +01:00
parent f9289dc558
commit c65b520c1e
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indicators/default/metadata.desktop
View File

@ -25,6 +25,7 @@ Name[zh_CN]=Latte
Name[zh_TW]=Latte
Comment=Latte default indicator
Comment[ca]=Indicador predeterminat del Latte
Comment[ca@valencia]=Indicador predeterminat del Latte
Comment[gl]=Indicador predeterminado de Latte
Comment[nl]=Standaard indicator van Latte
Comment[uk]=Типовий індикатор Латте

2
indicators/org.kde.latte.plasma/metadata.desktop
View File

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Plasma
Name[ca]=Plasma
Name[ca@valencia]=Plasma
Name[gl]=Plasma
Name[nl]=Plasma
Name[pt]=Plasma
@ -8,6 +9,7 @@ Name[uk]=Плазма
Name[x-test]=xxPlasmaxx
Comment=Latte Plasma style indicator
Comment[ca]=Indicador a l'estil Plasma del Latte
Comment[ca@valencia]=Indicador a l'estil Plasma del Latte
Comment[gl]=Indicador de estilo Plasma de Latte
Comment[nl]=Plasma stijlindicator van Latte
Comment[uk]=Індикатор стилю Плазми Латте

2
indicators/org.kde.latte.unity/metadata.desktop
View File

@ -1,12 +1,14 @@
[Desktop Entry]
Name=Unity
Name[ca]=Unity
Name[ca@valencia]=Unity
Name[gl]=Unity
Name[nl]=Unity
Name[uk]=Unity
Name[x-test]=xxUnityxx
Comment=Latte Unity style indicator
Comment[ca]=Indicador a l'estil Unity del Latte
Comment[ca@valencia]=Indicador a l'estil Unity del Latte
Comment[gl]=Indicador de estilo Unity de Latte
Comment[nl]=Unity stijlindicator van Latte
Comment[uk]=Індикатор стилю Unity Латте