Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00
Code Releases 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-01-06 05:29:16 +01:00
parent 51323c62e3
commit 2528ed2163
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/FlashCookieManager/metadata.desktop
View File

@ -42,7 +42,7 @@ Comment[pt_BR]=Você pode facilmente ver/excluir cookies flash armazenados em se
Comment[sv]=Det går enkelt att titta på eller ta bort Flash kakor lagrade på datorn. Det är en lösning på integritetsproblem.
Comment[uk]=Спрощує перегляд і вилучення кук flash, які зберігаються на вашому комп'ютері. Це засіб для поліпшення захисту системи.
Comment[x-test]=xxYou can easily view/delete flash cookies stored on your computer. This is a solution for having more privacy.xx
Comment[zh_CN]=您可以轻松地查看/删除存储在您的计算机上的 Flash Cookie。这是一个更注重隐私的解决方案。
Comment[zh_CN]=您可以轻松地查看/删除存储在您的计算机上的 Flash cookie。这是一个更注重隐私的解决方案。
Icon=:flashcookiemanager/data/flash-cookie-manager.png
Type=Service

2
src/scripts/helloqml/metadata.desktop
View File

@ -14,6 +14,7 @@ Name[pt]=Olá em QML
Name[sv]=Hallå QML
Name[uk]=Привіт, Qml
Name[x-test]=xxHello Qmlxx
Name[zh_CN]=Hello Qml
Comment=Sample Qml Plugin
Comment[ca]=Connector Qml d'exemple
Comment[ca@valencia]=Connector Qml d'exemple
@ -30,6 +31,7 @@ Comment[pt_BR]=Plug-in QML de exemplo
Comment[sv]=QML-exempelinsticksprogram
Comment[uk]=Зразок додатка Qml
Comment[x-test]=xxSample Qml Pluginxx
Comment[zh_CN]=示例 Qml 插件
Icon=
Type=Service
X-Falkon-Author=Anmol Gautam