Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +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 2018-04-23 07:16:55 +02:00
parent ad2466f2fa
commit 5043a7675d
5 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
linux/applications/org.kde.falkon.desktop
View File

@ -11,6 +11,7 @@ Name[en_GB]=Falkon
Name[es]=Falkon
Name[fi]=Falkon
Name[fr]=Falkon
Name[gl]=Falkon
Name[id]=Falkon
Name[it]=Falkon
Name[nl]=Falkon

1
src/lib/data/breeze-fallback/index.theme
View File

@ -11,6 +11,7 @@ Name[en_GB]=Breeze
Name[es]=Brisa
Name[fi]=Breeze
Name[fr]=Breeze
Name[gl]=Breeze
Name[id]=Breeze
Name[it]=Brezza
Name[nl]=Breeze

1
src/plugins/PIM/metadata.desktop
View File

@ -9,6 +9,7 @@ Name[en_GB]=PIM
Name[es]=PIM
Name[fi]=Henkilökohtainen ajanhallinta
Name[fr]=PIM
Name[gl]=PIM
Name[id]=PIM
Name[it]=PIM
Name[nl]=PIM

1
themes/linux/metadata.desktop
View File

@ -8,6 +8,7 @@ Name[de]=Linux
Name[en_GB]=Linux
Name[es]=Linux
Name[fi]=Linux
Name[gl]=Linux
Name[id]=Linux
Name[it]=Linux
Name[nl]=Linux

1
themes/windows/metadata.desktop
View File

@ -8,6 +8,7 @@ Name[de]=Windows
Name[en_GB]=Windows
Name[es]=Windows
Name[fi]=Windows
Name[gl]=Xanelas
Name[id]=Windows
Name[it]=Windows
Name[nl]=Windows