wilderjds
/
falkon
1
0
Fork 0
Code Issues Pull Requests Packages 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"
remotes/origin/Falkon/3.0
l10n daemon script 8 years ago
parent b4eaa10c10
commit fd9af37dc5
1 changed files with 1 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      themes/mac/metadata.desktop

1
themes/mac/metadata.desktop
Unescape View File

@ -9,6 +9,7 @@ Name[pt]=Mac
Name[sv]=Mac
Name[uk]=Mac
Name[x-test]=xxMacxx
Name[zh_CN]=Mac
Comment=Mac like theme for Falkon based on Firefox Mac OS X theme
Comment[ca]=Tema semblant al Mac pel Falkon basat en el tema Mac OS X del Firefox
Comment[ca@valencia]=Tema paregut al Mac pel Falkon basat en el tema Mac OS X del Firefox

Write Preview
Loading…
Cancel
Save