Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 17:52:10 +02: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 2018-03-04 05:19:42 +01:00
parent fff386c3d7
commit 1acade4133
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/adblock/metadata.desktop
View File

@ -1,6 +1,7 @@
[Desktop Entry]
Name=AdBlock
Name[ca]=AdBlock
Name[en_GB]=AdBlock
Name[nl]=AdBlock
Name[pt]=AdBlock
Name[pt_BR]=AdBlock
@ -9,6 +10,7 @@ Name[uk]=Блокування реклами
Name[x-test]=xxAdBlockxx
Comment=Blocks unwanted web content
Comment[ca]=Bloqueja el contingut web no desitjat
Comment[en_GB]=Blocks unwanted web content
Comment[nl]=Blokkeert niet-gewilde webinhoud
Comment[pt]=Bloqueia o conteúdo Web indesejado
Comment[sv]=Blockerar oönskat webbinnehåll

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

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Hello Python
Name[ca]=Hola Python
Name[en_GB]=Hello Python
Name[nl]=Hallo Python
Name[pt]=Olá em Python
Name[sv]=Hej Python
@ -8,6 +9,7 @@ Name[uk]=Привіт, Python
Name[x-test]=xxHello Pythonxx
Comment=Example Python extension
Comment[ca]=Exemple d'una extensió en Python
Comment[en_GB]=Example Python extension
Comment[nl]=Voorbeeld Python-extensie
Comment[pt]=Extensão de exemplo em Python
Comment[sv]=Exempel på Python-utökning