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 2020-11-02 06:13:45 +01:00
parent dbbc0429a8
commit e002589da1
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/applets/notes/metadata.desktop
View File

@ -37,6 +37,7 @@ Comment[sv]=Exempel på hur Släpp data hanteras
Comment[tg]=Мисоли тарзи идоракунии гузоштани иттилоот Comment[tg]=Мисоли тарзи идоракунии гузоштани иттилоот
Comment[tr]=Drop verisinin nasıl yönetileceği örneği Comment[tr]=Drop verisinin nasıl yönetileceği örneği
Comment[uk]=Приклад керування скинутими даними Comment[uk]=Приклад керування скинутими даними
Comment[vi]=Ví dụ về cách quản lí dữ liệu thả
Comment[x-test]=xxExample on how to manage Drop dataxx Comment[x-test]=xxExample on how to manage Drop dataxx
Comment[zh_CN]=如何管理拖放数据的例子 Comment[zh_CN]=如何管理拖放数据的例子
Comment[zh_TW]=如何管理 Drop 資料的範例 Comment[zh_TW]=如何管理 Drop 資料的範例