kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-27 14:50:21 +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 2018-01-03 08:31:52 +01:00
parent 0a51f202be
commit ffba08fce3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/package/contents/controls/latte-separator.desktop
View File

@ -14,6 +14,7 @@ Name[pt]=Separador do Latte
Name[sv]=Latte avskiljare
Name[uk]=Роздільник Латте
Name[x-test]=xxLatte Separatorxx
Name[zh_CN]=拿铁分隔符
Name[zh_TW]=Latte 分隔器
Comment=Latte Ghost Separator (Ghost file)
Comment[ca]=Separador del Latte Ghost (fitxer Ghost)
@ -29,6 +30,7 @@ Comment[pt]=Separador Ghost do Latte (ficheiro Ghost)
Comment[sv]=Latte spökavskiljare (spökfil)
Comment[uk]=Роздільник-привид Латте (файл-привид)
Comment[x-test]=xxLatte Ghost Separator (Ghost file)xx
Comment[zh_CN]=拿铁幽灵分隔符 (幽灵文件)
Comment[zh_TW]=Latte 鬼分隔器（鬼檔案）
GenericName=Dock
GenericName[ca]=Acobla